From b3df45394089d688d6c0d403750e9874cd065322 Mon Sep 17 00:00:00 2001 From: Miki Rozloznik Date: Tue, 29 Mar 2022 14:53:14 +0200 Subject: [PATCH] Minor change in error message for invalid compatibility version --- compiler/core/src/zserio/ast/CompatibilityVersion.java | 4 ++-- .../src/zserio/extension/common/CompatibilityChecker.java | 2 -- compiler/core/test/zserio/ast/CompatibilityVersionTest.java | 4 ++-- .../errors/compatibility_error/cpp/CompatibilityErrorTest.cpp | 2 +- .../java/compatibility_error/CompatibilityErrorTest.java | 2 +- .../compatibility_error/python/CompatibilityErrorTest.py | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/compiler/core/src/zserio/ast/CompatibilityVersion.java b/compiler/core/src/zserio/ast/CompatibilityVersion.java index 51ddc3dac..a2ba794a8 100644 --- 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 index 2b4dc4a61..e74297937 100644 --- 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 index 51948a233..5150569aa 100644 --- 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())); 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())); 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 + "'!")); } } \ No newline at end of file diff --git a/test/errors/compatibility_error/cpp/CompatibilityErrorTest.cpp b/test/errors/compatibility_error/cpp/CompatibilityErrorTest.cpp index 057ada588..6d4d19683 100644 --- 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 index 828862d0b..d2fdd63d7 100644 --- 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 index afe96b827..db5b4c4ed 100644 --- 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'!" ] )