From 2c28533c2f8648bde9f8c0c3e94a5dd164f5a7e3 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 11 May 2023 15:12:51 +0200 Subject: vbox: Update testing, UUID replacement hack is not needed anymore --- ...tualizationConfigurationVirtualboxFileFormat.java | 2 +- .../logic/ConfigurationLogicTestUtils.java | 20 +++----------------- ...virtualbox_default-ubuntu_transform-editable.vbox | 8 ++++---- ...lbox_default-ubuntu_transform-non-persistent.vbox | 8 ++++---- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java index 570b597..5446ddb 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java @@ -342,7 +342,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat NodeList hwNodes = findNodes( "/VirtualBox/Machine/Hardware" ); int count = hwNodes.getLength(); if ( count != 1 ) { - throw new VirtualizationConfigurationException( "Zero or more '/VirtualBox/Machine/Hardware' node were found, should never happen!" ); + throw new VirtualizationConfigurationException( "Zero or > 1 '/VirtualBox/Machine/Hardware' node were found, should never happen!" ); } Element hw = (Element)hwNodes.item( 0 ); String hwUuid = hw.getAttribute( "uuid" ); 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 4f82097..466a1d6 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java @@ -38,7 +38,6 @@ public class ConfigurationLogicTestUtils new OperatingSystem( 11, "Windows 2000 Professional", null, "x86", 4096, 4 ) ) ); // @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 = "()"; public static VirtualizationConfiguration newVirtualizationConfigurationInstance( File configFile ) @@ -73,10 +72,10 @@ public class ConfigurationLogicTestUtils public static void assertXmlEqual( String expectedXml, String actualXml ) throws AssertionError { - XmlAssert.assertThat( expectedXml ).and( actualXml ).ignoreComments().areIdentical(); + XmlAssert.assertThat( actualXml ).and( expectedXml ).ignoreComments().areIdentical(); } - public static String removeSourceFilePaths( String content ) + private static String removeSourceFilePaths( String content ) { final Pattern patternSourceFilePaths = Pattern.compile( ConfigurationLogicTestUtils.REGEX_SOURCE_FILE_PATHS ); final Matcher matcherSourceFilePathsContent = patternSourceFilePaths.matcher( content ); @@ -85,15 +84,6 @@ public class ConfigurationLogicTestUtils return matcherSourceFilePathsContent.replaceAll( "$1$3" ); } - public static String removeUuid( String content ) - { - final Pattern patternUuid = Pattern.compile( ConfigurationLogicTestUtils.REGEX_UUID ); - final Matcher matcherUuidContent = patternUuid.matcher( content ); - - // replace all UUIDs with the empty String - return matcherUuidContent.replaceAll( "" ); - } - public static void assertXmlLibvirtEqual( String expectedXml, String actualXml ) throws AssertionError { // replace all source file paths with the empty String @@ -105,11 +95,7 @@ public class ConfigurationLogicTestUtils public static void assertXmlVirtualBoxEqual( String expectedXml, String actualXml ) throws AssertionError { - // replace all UUIDs with the empty String - final String filteredXml1 = ConfigurationLogicTestUtils.removeUuid( expectedXml ); - final String filteredXml2 = ConfigurationLogicTestUtils.removeUuid( actualXml ); - - ConfigurationLogicTestUtils.assertXmlEqual( filteredXml1, filteredXml2 ); + ConfigurationLogicTestUtils.assertXmlEqual( expectedXml, actualXml ); } public static void assertVmxVmwareEqual( String expectedVmx, String actualVmx ) throws AssertionError diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox index f00c72e..572f389 100644 --- a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox +++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox @@ -1,11 +1,11 @@ - + - + - + @@ -36,7 +36,7 @@ - + diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox index 2717246..d046b82 100644 --- a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox +++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox @@ -1,11 +1,11 @@ - + - + - + @@ -36,7 +36,7 @@ - + -- cgit v1.2.3-55-g7522