diff options
Diffstat (limited to 'src/test/java/org/openslx/virtualization/configuration/logic')
4 files changed, 11 insertions, 11 deletions
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 01408f0..7493fec 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java @@ -32,7 +32,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest final String expectedConfigFileName = "qemu-kvm_default-ubuntu-20-04-vm_transform-privacy.xml"; final File inputConfig = LibvirtXmlTestResources.getLibvirtXmlFile( inputConfigFileName ); final File expectedConfig = LibvirtXmlTestResources.getLibvirtXmlFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); final ConfigurationLogicDozModClientToDozModServer logic = new ConfigurationLogicDozModClientToDozModServer(); @@ -53,7 +53,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest final String expectedConfigFileName = "virtualbox_default-ubuntu_transform-privacy.vbox"; final File inputConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( inputConfigFileName ); final File expectedConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); final ConfigurationLogicDozModClientToDozModServer logic = new ConfigurationLogicDozModClientToDozModServer(); @@ -77,7 +77,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest final String expectedConfigFileName = "vmware-player_default-ubuntu_transform-privacy.vmx"; final File inputConfig = ConfigurationLogicTestResources.getVmwareVmxFile( inputConfigFileName ); final File expectedConfig = ConfigurationLogicTestResources.getVmwareVmxFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); assertTrue( config.getHdds().size() == 1 ); final ConfigurationLogicDozModClientToDozModServer logic = new ConfigurationLogicDozModClientToDozModServer(); 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 844e5ec..5a1098a 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java @@ -47,7 +47,7 @@ public class ConfigurationLogicDozModServerToDozModClientTest final String expectedConfigFileName = "qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml"; final File inputConfig = LibvirtXmlTestResources.getLibvirtXmlFile( inputConfigFileName ); final File expectedConfig = LibvirtXmlTestResources.getLibvirtXmlFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); final ConfigurationLogicDozModServerToDozModClient logic = new ConfigurationLogicDozModServerToDozModClient(); @@ -68,7 +68,7 @@ public class ConfigurationLogicDozModServerToDozModClientTest final String expectedConfigFileName = "virtualbox_default-ubuntu_transform-editable.vbox"; final File inputConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( inputConfigFileName ); final File expectedConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); final ConfigurationLogicDozModServerToDozModClient logic = new ConfigurationLogicDozModServerToDozModClient(); @@ -93,7 +93,7 @@ public class ConfigurationLogicDozModServerToDozModClientTest final String expectedConfigFileName = "vmware-player_default-ubuntu_transform-editable.vmx"; final File inputConfig = ConfigurationLogicTestResources.getVmwareVmxFile( inputConfigFileName ); final File expectedConfig = ConfigurationLogicTestResources.getVmwareVmxFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); assertTrue( config.getHdds().size() == 1 ); final ConfigurationLogicDozModServerToDozModClient logic = new ConfigurationLogicDozModServerToDozModClient(); diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java index 47d8a45..f6d56c3 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java @@ -41,7 +41,7 @@ public class ConfigurationLogicDozModServerToStatelessClientTest final String expectedConfigFileName = "qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent.xml"; final File inputConfig = LibvirtXmlTestResources.getLibvirtXmlFile( inputConfigFileName ); final File expectedConfig = LibvirtXmlTestResources.getLibvirtXmlFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); final ConfigurationLogicDozModServerToStatelessClient logic = new ConfigurationLogicDozModServerToStatelessClient(); @@ -62,7 +62,7 @@ public class ConfigurationLogicDozModServerToStatelessClientTest final String expectedConfigFileName = "virtualbox_default-ubuntu_transform-non-persistent.vbox"; final File inputConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( inputConfigFileName ); final File expectedConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); final ConfigurationLogicDozModServerToStatelessClient logic = new ConfigurationLogicDozModServerToStatelessClient(); @@ -87,7 +87,7 @@ public class ConfigurationLogicDozModServerToStatelessClientTest final String expectedConfigFileName = "vmware-player_default-ubuntu_transform-non-persistent.vmx"; final File inputConfig = ConfigurationLogicTestResources.getVmwareVmxFile( inputConfigFileName ); final File expectedConfig = ConfigurationLogicTestResources.getVmwareVmxFile( expectedConfigFileName ); - final VirtualizationConfiguration<?, ?, ?, ?> config; + final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); assertTrue( config.getHdds().size() == 1 ); final ConfigurationLogicDozModServerToStatelessClient logic = new ConfigurationLogicDozModServerToStatelessClient(); 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 11f8ee6..1159d74 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java @@ -38,9 +38,9 @@ public class ConfigurationLogicTestUtils 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 ) + public static VirtualizationConfiguration newVirtualizationConfigurationInstance( File configFile ) { - VirtualizationConfiguration<?, ?, ?, ?> config = null; + VirtualizationConfiguration config = null; try { config = VirtualizationConfiguration.getInstance( ConfigurationLogicTestUtils.STUB_OS_LIST, configFile ); |