Do not compare absolute non-static paths in Libvirt unit test

2 files changed, 20 insertions, 1 deletions

diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
index cb5cbb3..5ba5e18 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
@@ -56,7 +56,7 @@ public class ConfigurationLogicDozModServerToDozModClientTest
 		final String transformedConfig = config.getConfigurationAsString();
 		final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
 
-		assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+		assertTrue( ConfigurationLogicTestUtils.isLibvirtContentEqual( expectedTransformedConfig, transformedConfig ) );
 		assertDoesNotThrow( () -> config.validate() );
 	}
 
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java
index 07046b5..f162dc1 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java
@@ -36,6 +36,7 @@ public class ConfigurationLogicTestUtils
 	// @formatter:on
 
 	private static final String REGEX_UUID = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
+	private static final String REGEX_SOURCE_FILE_PATHS = "(<source.*file=\")(.*)(\".*>)";
 
 	public static VirtualizationConfiguration<?, ?, ?, ?> newVirtualizationConfigurationInstance( File configFile )
 	{
@@ -80,6 +81,15 @@ public class ConfigurationLogicTestUtils
 		return linesContent1.equals( linesContent2 );
 	}
 
+	public static String removeSourceFilePaths( String content )
+	{
+		final Pattern patternSourceFilePaths = Pattern.compile( ConfigurationLogicTestUtils.REGEX_SOURCE_FILE_PATHS );
+		final Matcher matcherSourceFilePathsContent = patternSourceFilePaths.matcher( content );
+
+		// replace all source file paths with the empty String
+		return matcherSourceFilePathsContent.replaceAll( "$1$3" );
+	}
+
 	public static String removeUuid( String content )
 	{
 		final Pattern patternUuid = Pattern.compile( ConfigurationLogicTestUtils.REGEX_UUID );
@@ -89,6 +99,15 @@ public class ConfigurationLogicTestUtils
 		return matcherUuidContent.replaceAll( "" );
 	}
 
+	public static boolean isLibvirtContentEqual( String content1, String content2 )
+	{
+		// replace all source file paths with the empty String
+		final String filteredContent1 = ConfigurationLogicTestUtils.removeSourceFilePaths( content1 );
+		final String filteredContent2 = ConfigurationLogicTestUtils.removeSourceFilePaths( content2 );
+
+		return ConfigurationLogicTestUtils.isContentEqual( filteredContent1, filteredContent2 );
+	}
+
 	public static boolean isVirtualBoxContentEqual( String content1, String content2 )
 	{
 		// replace all UUIDs with the empty String