From bfe1288a15560d6a64a53d372cde5854c97819b3 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Tue, 25 May 2021 09:41:55 +0200 Subject: [qemu] Rename term 'filter' in test classes to match 'transformation' --- .../TransformationGenericCpuTest.java | 8 ++--- ...ransformationGenericDiskStorageDevicesTest.java | 42 +++++++++++----------- .../TransformationGenericMemoryTest.java | 8 ++--- .../TransformationGenericNameTest.java | 8 ++--- .../TransformationGenericUuidTest.java | 8 ++--- 5 files changed, 38 insertions(+), 36 deletions(-) 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 9553db08..260adcc1 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 @@ -14,10 +14,10 @@ import org.openslx.virtualization.configuration.transformation.TransformationExc public class TransformationGenericCpuTest { @Test - @DisplayName( "Test filtering of VM CPU configuration" ) - public void testFilterGenericCpu() throws TransformationException + @DisplayName( "Test transformation of VM CPU configuration" ) + public void testTransformationGenericCpu() throws TransformationException { - final TransformationGenericCpu filter = new TransformationGenericCpu(); + final TransformationGenericCpu transformation = new TransformationGenericCpu(); final Domain config = TransformationTestUtils.getDefaultDomain(); final CommandLineArgs args = TransformationTestUtils.getDefaultCmdLnArgs(); @@ -25,7 +25,7 @@ public class TransformationGenericCpuTest assertNotEquals( CpuMode.HOST_PASSTHROUGH, config.getCpuMode() ); assertEquals( CpuCheck.PARTIAL, config.getCpuCheck() ); - filter.transform( config, args ); + transformation.transform( config, args ); assertEquals( Integer.parseInt( TransformationTestUtils.DEFAULT_VM_NCPUS ), config.getVCpu() ); assertEquals( CpuMode.HOST_PASSTHROUGH, config.getCpuMode() ); 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 20fd2fb6..f7ba6f07 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 @@ -16,40 +16,42 @@ import org.openslx.virtualization.configuration.transformation.TransformationExc public class TransformationGenericDiskStorageDevicesTest { @Test - @DisplayName( "Test filtering of VM disk storage devices configuration with specified input data" ) - public void testFilterGenericDiskStorageDevices() throws TransformationException + @DisplayName( "Test transformation of VM disk storage devices configuration with specified input data" ) + public void testTransformationGenericDiskStorageDevices() throws TransformationException { - final TransformationGenericDiskStorageDevices filter = new TransformationGenericDiskStorageDevices(); + final TransformationGenericDiskStorageDevices transformation = new TransformationGenericDiskStorageDevices(); final Domain config = TransformationTestUtils.getDefaultDomain(); final CommandLineArgs args = TransformationTestUtils.getDefaultCmdLnArgs(); - final ArrayList devicesBeforeFiltering = config.getDiskStorageDevices(); - assertEquals( 1, devicesBeforeFiltering.size() ); - assertNotEquals( StorageType.FILE, devicesBeforeFiltering.get( 0 ).getStorageType() ); - assertNotEquals( TransformationTestUtils.DEFAULT_VM_HDD0, devicesBeforeFiltering.get( 0 ).getStorageSource() ); + final ArrayList devicesBeforeTransformation = config.getDiskStorageDevices(); + assertEquals( 1, devicesBeforeTransformation.size() ); + final DiskStorage diskDeviceBeforeTransformation = devicesBeforeTransformation.get( 0 ); + assertNotEquals( StorageType.FILE, diskDeviceBeforeTransformation.getStorageType() ); + assertNotEquals( TransformationTestUtils.DEFAULT_VM_HDD0, diskDeviceBeforeTransformation.getStorageSource() ); - filter.transform( config, args ); + transformation.transform( config, args ); - final ArrayList devicesAfterFiltering = config.getDiskStorageDevices(); - assertEquals( 1, devicesAfterFiltering.size() ); - assertEquals( StorageType.FILE, devicesAfterFiltering.get( 0 ).getStorageType() ); - assertEquals( TransformationTestUtils.DEFAULT_VM_HDD0, devicesAfterFiltering.get( 0 ).getStorageSource() ); + final ArrayList devicesAfterTransformation = config.getDiskStorageDevices(); + assertEquals( 1, devicesAfterTransformation.size() ); + final DiskStorage diskDeviceAfterTransformation = devicesAfterTransformation.get( 0 ); + assertEquals( StorageType.FILE, diskDeviceAfterTransformation.getStorageType() ); + assertEquals( TransformationTestUtils.DEFAULT_VM_HDD0, diskDeviceAfterTransformation.getStorageSource() ); } @Test - @DisplayName( "Test filtering of VM disk storage devices configuration with unspecified input data" ) - public void testFilterGenericDiskStorageDevicesNoData() throws TransformationException + @DisplayName( "Test transformation of VM disk storage devices configuration with unspecified input data" ) + public void testTransformationGenericDiskStorageDevicesNoData() throws TransformationException { - final TransformationGenericDiskStorageDevices filter = new TransformationGenericDiskStorageDevices(); + final TransformationGenericDiskStorageDevices transformation = new TransformationGenericDiskStorageDevices(); final Domain config = TransformationTestUtils.getDefaultDomain(); final CommandLineArgs args = TransformationTestUtils.getEmptyCmdLnArgs(); - final ArrayList devicesBeforeFiltering = config.getDiskStorageDevices(); - assertEquals( 1, devicesBeforeFiltering.size() ); + final ArrayList devicesBeforeTransformation = config.getDiskStorageDevices(); + assertEquals( 1, devicesBeforeTransformation.size() ); - filter.transform( config, args ); + transformation.transform( config, args ); - final ArrayList devicesAfterFiltering = config.getDiskStorageDevices(); - assertEquals( 0, devicesAfterFiltering.size() ); + final ArrayList devicesAfterTransformation = config.getDiskStorageDevices(); + assertEquals( 0, devicesAfterTransformation.size() ); } } 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 9ef1f1d2..812982ee 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 @@ -15,10 +15,10 @@ import org.openslx.virtualization.configuration.transformation.TransformationExc public class TransformationGenericMemoryTest { @Test - @DisplayName( "Test filtering of VM memory configuration" ) - public void testFilterGenericMemory() throws TransformationException + @DisplayName( "Test transformation of VM memory configuration" ) + public void testTransformationGenericMemory() throws TransformationException { - final TransformationGenericMemory filter = new TransformationGenericMemory(); + final TransformationGenericMemory transformation = new TransformationGenericMemory(); final Domain config = TransformationTestUtils.getDefaultDomain(); final CommandLineArgs args = TransformationTestUtils.getDefaultCmdLnArgs(); @@ -27,7 +27,7 @@ public class TransformationGenericMemoryTest assertNotEquals( defaultMemory.toString(), config.getMemory().toString() ); assertNotEquals( defaultMemory.toString(), config.getCurrentMemory().toString() ); - filter.transform( config, args ); + transformation.transform( config, args ); assertEquals( defaultMemory.toString(), config.getMemory().toString() ); assertEquals( defaultMemory.toString(), config.getCurrentMemory().toString() ); 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 f85af001..2403b83f 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 @@ -12,17 +12,17 @@ import org.openslx.virtualization.configuration.transformation.TransformationExc public class TransformationGenericNameTest { @Test - @DisplayName( "Test filtering of VM (display) name configuration" ) - public void testFilterGenericName() throws TransformationException + @DisplayName( "Test transformation of VM (display) name configuration" ) + public void testTransformationGenericName() throws TransformationException { - final TransformationGenericName filter = new TransformationGenericName(); + final TransformationGenericName transformation = new TransformationGenericName(); final Domain config = TransformationTestUtils.getDefaultDomain(); final CommandLineArgs args = TransformationTestUtils.getDefaultCmdLnArgs(); assertNotEquals( TransformationTestUtils.DEFAULT_VM_NAME, config.getName() ); assertNotEquals( TransformationTestUtils.DEFAULT_VM_DSPLNAME, config.getTitle() ); - filter.transform( config, args ); + transformation.transform( config, args ); assertEquals( TransformationTestUtils.DEFAULT_VM_NAME, config.getName() ); assertEquals( TransformationTestUtils.DEFAULT_VM_DSPLNAME, config.getTitle() ); 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 8b2dc69b..d42a84eb 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 @@ -12,16 +12,16 @@ import org.openslx.virtualization.configuration.transformation.TransformationExc public class TransformationGenericUuidTest { @Test - @DisplayName( "Test filtering of VM UUID configuration" ) - public void testFilterGenericUuid() throws TransformationException + @DisplayName( "Test transformation of VM UUID configuration" ) + public void testTransformationGenericUuid() throws TransformationException { - final TransformationGenericUuid filter = new TransformationGenericUuid(); + final TransformationGenericUuid transformation = new TransformationGenericUuid(); final Domain config = TransformationTestUtils.getDefaultDomain(); final CommandLineArgs args = TransformationTestUtils.getDefaultCmdLnArgs(); assertNotEquals( TransformationTestUtils.DEFAULT_VM_UUID, config.getUuid() ); - filter.transform( config, args ); + transformation.transform( config, args ); assertEquals( TransformationTestUtils.DEFAULT_VM_UUID, config.getUuid() ); } -- cgit v1.2.3-55-g7522