diff options
Diffstat (limited to 'src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java')
| -rw-r--r-- | src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java index 496c080..597fffb 100644 --- a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java @@ -1,6 +1,5 @@ package org.openslx.virtualization.configuration; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -35,7 +34,7 @@ public class VirtualizationConfigurationVirtualBoxTest @ParameterizedTest @DisplayName( "Test version from VM configuration" ) @MethodSource( "configAndVersionProvider" ) - public void testVirtualizationConfigurationVirtualBoxGetConfigurationVersion( String configFileName, + public void testVirtualizationConfigurationVirtualBoxGetConfigurationVersion( String name, String configFileName, Version configVersion ) throws IOException, VirtualizationConfigurationException { @@ -44,14 +43,13 @@ public class VirtualizationConfigurationVirtualBoxTest configFile ); assertEquals( configVersion, vmConfig.getConfigurationVersion() ); - - assertDoesNotThrow( () -> vmConfig.validate() ); } @ParameterizedTest @DisplayName( "Test display name from VM configuration" ) @MethodSource( "configAndVersionProvider" ) - public void testVirtualizationConfigurationVirtualBoxGetDisplayName( String configFileName, Version configVersion ) + public void testVirtualizationConfigurationVirtualBoxGetDisplayName( String name, String configFileName, + Version configVersion ) throws IOException, VirtualizationConfigurationException { final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName ); @@ -60,15 +58,13 @@ public class VirtualizationConfigurationVirtualBoxTest final String displayName = vmConfig.getDisplayName(); - assertEquals( VirtualizationConfigurationVirtualBoxTest.getVmName( configVersion ), displayName ); - - assertDoesNotThrow( () -> vmConfig.validate() ); + assertEquals( VirtualizationConfigurationVirtualBoxTest.getVmName( name, configVersion ), displayName ); } @ParameterizedTest @DisplayName( "Test machine snapshot state from VM configuration" ) @MethodSource( "configAndVersionProvider" ) - public void testVirtualizationConfigurationVirtualBoxIsMachineSnapshot( String configFileName, + public void testVirtualizationConfigurationVirtualBoxIsMachineSnapshot( String name, String configFileName, Version configVersion ) throws IOException, VirtualizationConfigurationException { @@ -79,14 +75,12 @@ public class VirtualizationConfigurationVirtualBoxTest final boolean isVmSnapshot = vmConfig.isMachineSnapshot(); assertFalse( isVmSnapshot ); - - assertDoesNotThrow( () -> vmConfig.validate() ); } @ParameterizedTest @DisplayName( "Test supported image formats from VM configuration" ) @MethodSource( "configAndVersionProvider" ) - public void testVirtualizationConfigurationVirtualBoxGetSupportedImageFormats( String configFileName, + public void testVirtualizationConfigurationVirtualBoxGetSupportedImageFormats( String name, String configFileName, Version configVersion ) throws IOException, VirtualizationConfigurationException { @@ -99,14 +93,13 @@ public class VirtualizationConfigurationVirtualBoxTest assertNotNull( supportedImageFormats ); assertEquals( 1, supportedImageFormats.size() ); assertTrue( supportedImageFormats.containsAll( Arrays.asList( ImageFormat.VDI ) ) ); - - assertDoesNotThrow( () -> vmConfig.validate() ); } @ParameterizedTest @DisplayName( "Test output of HDDs from VM configuration" ) @MethodSource( "configAndVersionProvider" ) - public void testVirtualizationConfigurationVirtualBoxGetHdds( String configFileName, Version configVersion ) + public void testVirtualizationConfigurationVirtualBoxGetHdds( String name, String configFileName, + Version configVersion ) throws IOException, VirtualizationConfigurationException { final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName ); @@ -115,30 +108,36 @@ public class VirtualizationConfigurationVirtualBoxTest final List<VirtualizationConfiguration.HardDisk> hdds = vmConfig.getHdds(); - final String imageFileName = VirtualizationConfigurationVirtualBoxTest.getVmName( configVersion ) + ".vdi"; + final String imageFileName = VirtualizationConfigurationVirtualBoxTest.getVmName( name, configVersion ) + ".vdi"; assertNotNull( hdds ); assertEquals( 1, hdds.size() ); assertEquals( imageFileName, hdds.get( 0 ).diskImage ); - - assertDoesNotThrow( () -> vmConfig.validate() ); } - static String getVmName( Version version ) + static String getVmName( String name, Version version ) { - return "ubuntu_" + version.toString().replace( '.', '-' ); + return name + "_" + version.toString().replace( '.', '-' ); } static Stream<Arguments> configAndVersionProvider() { return Stream.of( - arguments( "virtualbox_default-ubuntu_v1-15.vbox", + arguments( "ubuntu", "virtualbox_default-ubuntu_v1-15.vbox", + new Version( Short.valueOf( "1" ), Short.valueOf( "15" ) ) ), + arguments( "ubuntu", "virtualbox_default-ubuntu_v1-16.vbox", + new Version( Short.valueOf( "1" ), Short.valueOf( "16" ) ) ), + arguments( "ubuntu", "virtualbox_default-ubuntu_v1-17.vbox", + new Version( Short.valueOf( "1" ), Short.valueOf( "17" ) ) ), + arguments( "ubuntu", "virtualbox_default-ubuntu_v1-18.vbox", + new Version( Short.valueOf( "1" ), Short.valueOf( "18" ) ) ), + arguments( "windows-7", "virtualbox_default-windows-7_v1-15.vbox", new Version( Short.valueOf( "1" ), Short.valueOf( "15" ) ) ), - arguments( "virtualbox_default-ubuntu_v1-16.vbox", + arguments( "windows-7", "virtualbox_default-windows-7_v1-16.vbox", new Version( Short.valueOf( "1" ), Short.valueOf( "16" ) ) ), - arguments( "virtualbox_default-ubuntu_v1-17.vbox", + arguments( "windows-7", "virtualbox_default-windows-7_v1-17.vbox", new Version( Short.valueOf( "1" ), Short.valueOf( "17" ) ) ), - arguments( "virtualbox_default-ubuntu_v1-18.vbox", + arguments( "windows-7", "virtualbox_default-windows-7_v1-18.vbox", new Version( Short.valueOf( "1" ), Short.valueOf( "18" ) ) ) ); } } |