diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChangerTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChangerTest.java index 21c3fff15e5546a57df27321b54b306e1162d542..58be3b23963c070a1ff4b78bed98fdf8c249f431 100644 --- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChangerTest.java +++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChangerTest.java @@ -21,6 +21,7 @@ import edu.kit.ipd.descartes.mm.resourceconfiguration.ProcessingResourceSpecific import edu.kit.ipd.descartes.mm.resourceconfiguration.ResourceconfigurationFactory; import edu.kit.ipd.descartes.mm.resourcelandscape.Container; import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapeFactory; +import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapePackage; import edu.kit.ipd.descartes.mm.resourcelandscape.RuntimeEnvironment; public class DmmModelChangerTest extends AbstractTest { @@ -40,11 +41,13 @@ public class DmmModelChangerTest extends AbstractTest { ActiveResourceSpecification spec = null; Container container = null; ContainerTemplate template = null; + Container parent = null; @Before public void setUp() throws Exception { super.setUp(); - container = ResourcelandscapeFactory.eINSTANCE.createRuntimeEnvironment(); + parent = ResourcelandscapeFactory.eINSTANCE.createComputingInfrastructure(); + container = ResourcelandscapeFactory.eINSTANCE.createRuntimeEnvironment(); template = ContainerrepositoryFactory.eINSTANCE.createContainerTemplate(); original = ResourcelandscapeFactory.eINSTANCE.createRuntimeEnvironment(); adaptableNumberOfCores = ResourceconfigurationFactory.eINSTANCE.createNumberOfParallelProcessingUnits(); @@ -64,12 +67,16 @@ public class DmmModelChangerTest extends AbstractTest { original.getConfigSpec().add(spec); original.setName(TEST_RUNTIME_ENV); + original.setTemplate(ContainerrepositoryFactory.eINSTANCE.createContainerTemplate()); point.setMinValue(MIN); point.setMaxValue(MAX); point.setAdaptableEntity(adaptableNumberOfCores); point.setName(EMPTY); + parent.setName(PARENT_CONTAINER); + parent.getContains().add(original); + template.getTemplateConfig().add(spec); template.setName(EMPTY); container.setTemplate(template); @@ -107,10 +114,6 @@ public class DmmModelChangerTest extends AbstractTest { @Test public void testScaleInRuntimeEnvironmentInstance() { - Container parent = ResourcelandscapeFactory.eINSTANCE.createComputingInfrastructure(); - parent.setName(PARENT_CONTAINER); - parent.getContains().add(original); - RuntimeEnvironment copy = DmmModelChanger.scaleOutRuntimeEnvironmentInstance(original); assertFalse(original.getId().equals(copy.getId())); @@ -129,11 +132,6 @@ public class DmmModelChangerTest extends AbstractTest { @Test public void testScaleOutRuntimeEnvironmentInstance() { - Container parent = ResourcelandscapeFactory.eINSTANCE.createComputingInfrastructure(); - parent.setName(PARENT_CONTAINER); - parent.getContains().add(original); - original.getConfigSpec().add(spec); - RuntimeEnvironment copy = DmmModelChanger.scaleOutRuntimeEnvironmentInstance(original); assertFalse(original.getId().equals(copy.getId())); @@ -142,6 +140,8 @@ public class DmmModelChangerTest extends AbstractTest { assertEquals(original.getTemplate(), copy.getTemplate()); assertTrue(copy.getConfigSpec().isEmpty()); + assertTrue(original.getTemplate().getReferringContainers().contains(copy)); + assertTrue(parent.getContains().size() == 2); assertEquals(original, parent.getContains().get(0));