From 255c829b598a7a3151489e7121c56b219e530777 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Fri, 4 Feb 2022 12:19:44 +0100 Subject: Force Unix line endings for Libvirt XML files (even on Windows platforms) --- .../logic/ConfigurationLogicDozModClientToDozModServerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java') diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java index 0c164c6..09de9f5 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java @@ -41,7 +41,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest final String transformedConfig = config.getConfigurationAsString(); final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig ); - assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) ); + ConfigurationLogicTestUtils.assertXmlEqual( expectedTransformedConfig, transformedConfig ); assertDoesNotThrow( () -> config.validate() ); } @@ -62,7 +62,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest final String transformedConfig = config.getConfigurationAsString(); final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig ); - assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) ); + ConfigurationLogicTestUtils.assertXmlEqual( expectedTransformedConfig, transformedConfig ); // do not validate the VirtualBox configuration afterwards, since the inserted // place holders do not match valid primitive values from the XML schema @@ -87,7 +87,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest final String transformedConfig = config.getConfigurationAsString(); final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig ); - assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) ); + ConfigurationLogicTestUtils.assertVmxVmwareEqual( expectedTransformedConfig, transformedConfig ); assertDoesNotThrow( () -> config.validate() ); } } -- cgit v1.2.3-55-g7522