From d88708e05a9eeb9dfe0889699e72093226344e18 Mon Sep 17 00:00:00 2001
From: Miki Rozloznik <mikulas.rozloznik@eccam.com>
Date: Thu, 3 Mar 2022 14:22:05 +0100
Subject: [PATCH] [#375] Rename compatibility_warning test to work for Windows
 as well

---
 test/warnings/compatibility_warning/CMakeLists.txt          | 6 +++---
 test/warnings/compatibility_warning/build.xml               | 2 +-
 .../compatibility_warning/cpp/CompatibilityWarningTest.cpp  | 2 +-
 .../compatibility_warning/CompatibilityWarningTest.java     | 2 +-
 .../python/CompatibilityWarningTest.py                      | 6 +++---
 ...y_warning.zs => root_with_diff_compatibility_warning.zs} | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename test/warnings/compatibility_warning/zs/compatibility_warning/{root_with_different_compatibility_warning.zs => root_with_diff_compatibility_warning.zs} (53%)

diff --git a/test/warnings/compatibility_warning/CMakeLists.txt b/test/warnings/compatibility_warning/CMakeLists.txt
index ced3e1ec2..311d51ba5 100644
--- a/test/warnings/compatibility_warning/CMakeLists.txt
+++ b/test/warnings/compatibility_warning/CMakeLists.txt
@@ -4,9 +4,9 @@ set(LOG_FILENAME zserio_log.txt)
 # clean old log file
 file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${LOG_FILENAME})
 
-zserio_add_library(TARGET root_with_different_compatibility_warning_zs
+zserio_add_library(TARGET root_with_diff_compatibility_warning_zs
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zs
-    MAIN_SOURCE compatibility_warning/root_with_different_compatibility_warning.zs
+    MAIN_SOURCE compatibility_warning/root_with_diff_compatibility_warning.zs
     OUT_DIR ${ZSERIO_GEN_DIR}
     OUT_FILES EMPTY
     ZSERIO_CORE_DIR ${ZSERIO_JAR_DIR}
@@ -28,7 +28,7 @@ zserio_add_library(TARGET root_without_compatibility_warning_zs
     EXPECTED_WARNINGS 1
 )
 
-add_test_dependencies(root_with_different_compatibility_warning_zs)
+add_test_dependencies(root_with_diff_compatibility_warning_zs)
 add_test_dependencies(root_without_compatibility_warning_zs)
 
 add_test_sources(
diff --git a/test/warnings/compatibility_warning/build.xml b/test/warnings/compatibility_warning/build.xml
index 16adfb53d..bb1df868a 100644
--- a/test/warnings/compatibility_warning/build.xml
+++ b/test/warnings/compatibility_warning/build.xml
@@ -12,7 +12,7 @@
     <target name="gen" depends="gen.check" unless="compatibility_warning.zs.gen_is_uptodate">
         <testGenClean testName="compatibility_warning"/>
         <testGen testName="compatibility_warning"
-            zsFile="compatibility_warning/root_with_different_compatibility_warning.zs">
+            zsFile="compatibility_warning/root_with_diff_compatibility_warning.zs">
             <arg name="withoutCrossExtensionCheck"/>
         </testGen>
         <testGen testName="compatibility_warning"
diff --git a/test/warnings/compatibility_warning/cpp/CompatibilityWarningTest.cpp b/test/warnings/compatibility_warning/cpp/CompatibilityWarningTest.cpp
index b224919b3..494580734 100644
--- a/test/warnings/compatibility_warning/cpp/CompatibilityWarningTest.cpp
+++ b/test/warnings/compatibility_warning/cpp/CompatibilityWarningTest.cpp
@@ -13,7 +13,7 @@ class CompatibilityWarningTest : public ::testing::Test
     const test_utils::ZserioErrorOutput zserioWarnings;
 };
 
-TEST_F(CompatibilityWarningTest, rootWithDifferentCompatibility)
+TEST_F(CompatibilityWarningTest, rootWithDiffCompatibility)
 {
     const std::string error = "subpackage.zs:1:30: "
             "Package compatibility version '2.4.2' doesn't match to '2.5.0' specified in root package!";
diff --git a/test/warnings/compatibility_warning/java/compatibility_warning/CompatibilityWarningTest.java b/test/warnings/compatibility_warning/java/compatibility_warning/CompatibilityWarningTest.java
index 2b1763644..fd2dca7d8 100644
--- a/test/warnings/compatibility_warning/java/compatibility_warning/CompatibilityWarningTest.java
+++ b/test/warnings/compatibility_warning/java/compatibility_warning/CompatibilityWarningTest.java
@@ -25,7 +25,7 @@ public void rootWithoutCompatibility()
     }
 
     @Test
-    public void rootWithDifferentCompatibility()
+    public void rootWithDiffCompatibility()
     {
         final String warning = "subpackage.zs:1:30: " +
                 "Package specifies compatibility version '2.4.2' while root package specifies nothing!";
diff --git a/test/warnings/compatibility_warning/python/CompatibilityWarningTest.py b/test/warnings/compatibility_warning/python/CompatibilityWarningTest.py
index e3ce06c2d..c08d38c8b 100644
--- a/test/warnings/compatibility_warning/python/CompatibilityWarningTest.py
+++ b/test/warnings/compatibility_warning/python/CompatibilityWarningTest.py
@@ -6,16 +6,16 @@ class CompatibilityWarningTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.warnings = {}
-        cls.api = getZserioApi(__file__, "compatibility_warning/root_with_different_compatibility_warning.zs",
+        cls.api = getZserioApi(__file__, "compatibility_warning/root_with_diff_compatibility_warning.zs",
                                expectedWarnings=1, errorOutputDict=cls.warnings,
                                extraArgs=["-withoutCrossExtensionCheck"])
         cls.api = getZserioApi(__file__, "compatibility_warning/root_without_compatibility_warning.zs",
                                expectedWarnings=1, errorOutputDict=cls.warnings,
                                extraArgs=["-withoutCrossExtensionCheck"])
 
-    def testRootWithDifferentCompatibility(self):
+    def testRootWithDiffCompatibility(self):
         assertWarningsPresent(self,
-            "compatibility_warning/root_with_different_compatibility_warning.zs",
+            "compatibility_warning/root_with_diff_compatibility_warning.zs",
             [
                 "subpackage.zs:1:30: "
                 "Package compatibility version '2.4.2' doesn't match to '2.5.0' specified in root package!"
diff --git a/test/warnings/compatibility_warning/zs/compatibility_warning/root_with_different_compatibility_warning.zs b/test/warnings/compatibility_warning/zs/compatibility_warning/root_with_diff_compatibility_warning.zs
similarity index 53%
rename from test/warnings/compatibility_warning/zs/compatibility_warning/root_with_different_compatibility_warning.zs
rename to test/warnings/compatibility_warning/zs/compatibility_warning/root_with_diff_compatibility_warning.zs
index fdf1f9274..3a4d7cf71 100644
--- a/test/warnings/compatibility_warning/zs/compatibility_warning/root_with_different_compatibility_warning.zs
+++ b/test/warnings/compatibility_warning/zs/compatibility_warning/root_with_diff_compatibility_warning.zs
@@ -1,5 +1,5 @@
 zserio_compatibility_version("2.5.0");
 
-package compatibility_warning.root_with_different_compatibility_warning;
+package compatibility_warning.root_with_diff_compatibility_warning;
 
 import compatibility_warning.subpackage.*;