Minor change in error message for invalid compatibility version

ndsev · Mar 29, 2022 · b3df453 · b3df453
1 parent 5c170bf
commit b3df453
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/compiler/core/src/zserio/ast/CompatibilityVersion.java b/compiler/core/src/zserio/ast/CompatibilityVersion.java
@@ -33,14 +33,14 @@ public CompatibilityVersion(AstLocation location, String versionStringLiteral, L
         if (version.compareTo(CURRENT_ZSERIO_VERSION) > 0)
         {
             throw new ParserException(location,
-                    "Root package specifies compatibility version '" + version + "' " +
+                    "Package specifies compatibility version '" + version + "' " +
                     "which is higher than current zserio version '" + CURRENT_ZSERIO_VERSION + "'!");
         }
 
         if (version.compareTo(MINIMUM_SUPPORTED_VERSION) < 0)
         {
             throw new ParserException(location,
-                    "Root package specifies unsupported compatibility version '" + version +
+                    "Package specifies unsupported compatibility version '" + version +
                     "', minimum supported version is '" + MINIMUM_SUPPORTED_VERSION + "'!");
         }
     }

diff --git a/compiler/core/src/zserio/extension/common/CompatibilityChecker.java b/compiler/core/src/zserio/extension/common/CompatibilityChecker.java
@@ -31,8 +31,6 @@ public boolean traverseTemplateInstantiations()
     public void beginRoot(Root root) throws ZserioExtensionException
     {
         compatibilityVersion = root.getRootPackage().getCompatibilityVersion();
-        if (compatibilityVersion == null)
-            return;
     }
 
     @Override

diff --git a/compiler/core/test/zserio/ast/CompatibilityVersionTest.java b/compiler/core/test/zserio/ast/CompatibilityVersionTest.java
@@ -18,7 +18,7 @@ public void versionLessThanMinimiumSupported()
         final ParserException exception = assertThrows(ParserException.class, () ->
                 new CompatibilityVersion(new AstLocation(null), "\"2.3.0\"", new ArrayList<DocComment>()));
         assertThat(exception.getMessage(), containsString(
-                "Root package specifies unsupported compatibility version '2.3.0', minimum supported "));
+                "Package specifies unsupported compatibility version '2.3.0', minimum supported "));
     }
 
     @Test
@@ -31,7 +31,7 @@ public void versionHigherThanCurrentVersion()
                 new CompatibilityVersion(
                         new AstLocation(null), "\"" + higherVersion + "\"", new ArrayList<DocComment>()));
         assertThat(exception.getMessage(), containsString(
-                "Root package specifies compatibility version '" + higherVersion + "' " +
+                "Package specifies compatibility version '" + higherVersion + "' " +
                 "which is higher than current zserio version '" + ZserioVersion.VERSION_STRING + "'!"));
     }
 }
diff --git a/test/errors/compatibility_error/cpp/CompatibilityErrorTest.cpp b/test/errors/compatibility_error/cpp/CompatibilityErrorTest.cpp
@@ -56,7 +56,7 @@ TEST_F(CompatibilityErrorTest, versionLessThanMinSupported)
 {
     ASSERT_TRUE(zserioErrors.isPresent(
             "version_less_than_min_supported_error.zs:1:30: "
-                    "Root package specifies unsupported compatibility version '2.3.2', "
+                    "Package specifies unsupported compatibility version '2.3.2', "
                     "minimum supported version is '2.4.0'!"));
 }
 

diff --git a/test/errors/compatibility_error/java/compatibility_error/CompatibilityErrorTest.java b/test/errors/compatibility_error/java/compatibility_error/CompatibilityErrorTest.java
@@ -61,7 +61,7 @@ public void packedUInt32Array241()
     public void versionLessThanMinSupported()
     {
         final String error = "version_less_than_min_supported_error.zs:1:30: " +
-                "Root package specifies unsupported compatibility version '2.3.2', " +
+                "Package specifies unsupported compatibility version '2.3.2', " +
                 "minimum supported version is '2.4.0'!";
         assertTrue(zserioErrors.isPresent(error));
     }

diff --git a/test/errors/compatibility_error/python/CompatibilityErrorTest.py b/test/errors/compatibility_error/python/CompatibilityErrorTest.py
@@ -47,7 +47,7 @@ def testVersionLessThanMinSupported(self):
         assertErrorsPresent(self,
             "version_less_than_min_supported_error.zs",
             [
-                ":1:30: Root package specifies unsupported compatibility version '2.3.2', " +
+                ":1:30: Package specifies unsupported compatibility version '2.3.2', " +
                 "minimum supported version is '2.4.0'!"
             ]
         )