From af97159d17ba176c00f95b84143741fde34ef33e Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Thu, 10 Jun 2021 11:27:22 +0200 Subject: [qemu] Add configuration validation for transformations in unit tests --- .../plugin/qemu/configuration/TransformationGenericCpuTest.java | 3 +++ .../configuration/TransformationGenericDiskCdromDevicesTest.java | 5 +++++ .../configuration/TransformationGenericDiskFloppyDevicesTest.java | 5 +++++ .../configuration/TransformationGenericDiskStorageDevicesTest.java | 5 +++++ .../configuration/TransformationGenericFileSystemDevicesTest.java | 5 +++++ .../configuration/TransformationGenericInterfaceDevicesTest.java | 5 +++++ .../plugin/qemu/configuration/TransformationGenericMemoryTest.java | 3 +++ .../plugin/qemu/configuration/TransformationGenericNameTest.java | 3 +++ .../qemu/configuration/TransformationGenericParallelDevicesTest.java | 5 +++++ .../plugin/qemu/configuration/TransformationGenericUuidTest.java | 3 +++ .../configuration/TransformationSpecificQemuArchitectureTest.java | 3 +++ .../TransformationSpecificQemuGpuPassthroughNvidiaTest.java | 5 +++++ .../configuration/TransformationSpecificQemuSerialDevicesTest.java | 5 +++++ 13 files changed, 55 insertions(+) diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericCpuTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericCpuTest.java index 7e93513b..d88857a6 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericCpuTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericCpuTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -31,6 +32,8 @@ public class TransformationGenericCpuTest assertEquals( Integer.parseInt( TransformationTestUtils.DEFAULT_VM_NCPUS ), config.getVCpu() ); assertEquals( CpuMode.HOST_PASSTHROUGH, config.getCpuMode() ); assertEquals( CpuCheck.PARTIAL, config.getCpuCheck() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevicesTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevicesTest.java index 842e30e6..73b37c36 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevicesTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevicesTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -39,6 +40,8 @@ public class TransformationGenericDiskCdromDevicesTest assertEquals( TransformationTestUtils.DEFAULT_VM_CDROM0, cdromDevice1AfterTransformation.getStorageSource() ); assertEquals( StorageType.FILE, cdromDevice2AfterTransformation.getStorageType() ); assertEquals( TransformationTestUtils.DEFAULT_VM_CDROM1, cdromDevice2AfterTransformation.getStorageSource() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test @@ -56,5 +59,7 @@ public class TransformationGenericDiskCdromDevicesTest final ArrayList devicesAfterTransformation = config.getDiskCdromDevices(); assertEquals( 0, devicesAfterTransformation.size() ); + + assertDoesNotThrow( () -> config.validateXml() ); } } diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevicesTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevicesTest.java index d4678f4f..3969e168 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevicesTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevicesTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -40,6 +41,8 @@ public class TransformationGenericDiskFloppyDevicesTest assertEquals( TransformationTestUtils.DEFAULT_VM_FLOPPY0, floppyDevice1AfterTransformation.getStorageSource() ); assertEquals( StorageType.FILE, floppyDevice2AfterTransformation.getStorageType() ); assertEquals( TransformationTestUtils.DEFAULT_VM_FLOPPY1, floppyDevice2AfterTransformation.getStorageSource() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test @@ -57,5 +60,7 @@ public class TransformationGenericDiskFloppyDevicesTest final ArrayList devicesAfterTransformation = config.getDiskFloppyDevices(); assertEquals( 0, devicesAfterTransformation.size() ); + + assertDoesNotThrow( () -> config.validateXml() ); } } diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevicesTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevicesTest.java index f7ba6f07..8b52b90b 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevicesTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevicesTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -36,6 +37,8 @@ public class TransformationGenericDiskStorageDevicesTest final DiskStorage diskDeviceAfterTransformation = devicesAfterTransformation.get( 0 ); assertEquals( StorageType.FILE, diskDeviceAfterTransformation.getStorageType() ); assertEquals( TransformationTestUtils.DEFAULT_VM_HDD0, diskDeviceAfterTransformation.getStorageSource() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test @@ -53,5 +56,7 @@ public class TransformationGenericDiskStorageDevicesTest final ArrayList devicesAfterTransformation = config.getDiskStorageDevices(); assertEquals( 0, devicesAfterTransformation.size() ); + + assertDoesNotThrow( () -> config.validateXml() ); } } diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevicesTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevicesTest.java index 38a07e38..7605f778 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevicesTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevicesTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; @@ -40,6 +41,8 @@ public class TransformationGenericFileSystemDevicesTest assertEquals( AccessMode.MAPPED, fs2AfterTransformation.getAccessMode() ); assertEquals( TransformationTestUtils.DEFAULT_VM_FSSRC1, fs2AfterTransformation.getSource() ); assertEquals( TransformationTestUtils.DEFAULT_VM_FSTGT1, fs2AfterTransformation.getTarget() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test @@ -57,5 +60,7 @@ public class TransformationGenericFileSystemDevicesTest final ArrayList devicesAfterTransformation = config.getFileSystemDevices(); assertEquals( 0, devicesAfterTransformation.size() ); + + assertDoesNotThrow( () -> config.validateXml() ); } } diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericInterfaceDevicesTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericInterfaceDevicesTest.java index 6257e98f..e4632784 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericInterfaceDevicesTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericInterfaceDevicesTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; @@ -37,6 +38,8 @@ public class TransformationGenericInterfaceDevicesTest assertEquals( TransformationTestUtils.DEFAULT_VM_MAC0, interfaceAfterTransformation.getMacAddress() ); assertEquals( VirtualizationConfigurationQemu.NETWORK_BRIDGE_NAT_DEFAULT, interfaceAfterTransformation.getSource() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test @@ -54,5 +57,7 @@ public class TransformationGenericInterfaceDevicesTest final ArrayList devicesAfterTransformation = config.getInterfaceDevices(); assertEquals( 0, devicesAfterTransformation.size() ); + + assertDoesNotThrow( () -> config.validateXml() ); } } diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericMemoryTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericMemoryTest.java index 76f53e40..a93e26a5 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericMemoryTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericMemoryTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -32,6 +33,8 @@ public class TransformationGenericMemoryTest assertEquals( defaultMemory.toString(), config.getMemory().toString() ); assertEquals( defaultMemory.toString(), config.getCurrentMemory().toString() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericNameTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericNameTest.java index b52162d7..ca272801 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericNameTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericNameTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -27,6 +28,8 @@ public class TransformationGenericNameTest assertEquals( TransformationTestUtils.DEFAULT_VM_NAME, config.getName() ); assertEquals( TransformationTestUtils.DEFAULT_VM_DSPLNAME, config.getTitle() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericParallelDevicesTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericParallelDevicesTest.java index 63fb134c..9402b59a 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericParallelDevicesTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericParallelDevicesTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; @@ -32,6 +33,8 @@ public class TransformationGenericParallelDevicesTest final Parallel parallelDeviceAfterTransformation = devicesAfterTransformation.get( 0 ); assertEquals( Type.DEV, parallelDeviceAfterTransformation.getType() ); assertEquals( TransformationTestUtils.DEFAULT_VM_PARALLEL0, parallelDeviceAfterTransformation.getSource() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test @@ -49,5 +52,7 @@ public class TransformationGenericParallelDevicesTest final ArrayList devicesAfterTransformation = config.getParallelDevices(); assertEquals( 0, devicesAfterTransformation.size() ); + + assertDoesNotThrow( () -> config.validateXml() ); } } diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericUuidTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericUuidTest.java index 8fe20886..03534d8e 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericUuidTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericUuidTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -25,6 +26,8 @@ public class TransformationGenericUuidTest transformation.transform( config, args ); assertEquals( TransformationTestUtils.DEFAULT_VM_UUID, config.getUuid() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuArchitectureTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuArchitectureTest.java index 50689c4e..86186247 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuArchitectureTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuArchitectureTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; @@ -66,6 +67,8 @@ public class TransformationSpecificQemuArchitectureTest assertEquals( "x86_64", config.getOsArch() ); assertEquals( "pc-q35-5.1", config.getOsMachine() ); assertEquals( OsType.HVM, config.getOsType() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java index 3a9624b3..8f50b7df 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.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.assertNotEquals; @@ -94,6 +95,8 @@ public class TransformationSpecificQemuGpuPassthroughNvidiaTest for ( final Video videoDevice : videoDevices ) { assertEquals( Video.Model.NONE, videoDevice.getModel() ); } + + assertDoesNotThrow( () -> config.validateXml() ); } @Test @@ -125,5 +128,7 @@ public class TransformationSpecificQemuGpuPassthroughNvidiaTest for ( final Video videoDevice : videoDevices ) { assertNotEquals( Video.Model.NONE, videoDevice.getModel() ); } + + assertDoesNotThrow( () -> config.validateXml() ); } } diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuSerialDevicesTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuSerialDevicesTest.java index 270bfff9..6beada8d 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuSerialDevicesTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuSerialDevicesTest.java @@ -1,5 +1,6 @@ package org.openslx.runvirt.plugin.qemu.configuration; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; @@ -44,6 +45,8 @@ public class TransformationSpecificQemuSerialDevicesTest final Serial serialDevice2AfterTransformation = devicesAfterTransformation.get( 1 ); assertEquals( Type.DEV, serialDevice2AfterTransformation.getType() ); assertEquals( TransformationTestUtils.DEFAULT_VM_SERIAL0, serialDevice2AfterTransformation.getSource() ); + + assertDoesNotThrow( () -> config.validateXml() ); } @Test @@ -65,5 +68,7 @@ public class TransformationSpecificQemuSerialDevicesTest assertEquals( 1, devicesAfterTransformation.size() ); final Serial serialDeviceAfterTransformation = devicesBeforeTransformation.get( 0 ); assertEquals( Type.PTY, serialDeviceAfterTransformation.getType() ); + + assertDoesNotThrow( () -> config.validateXml() ); } } -- cgit v1.2.3-55-g7522