From 58e5fff9340c8a57bc2d39374735c659aaf86b8f Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 5 Feb 2013 15:15:29 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10163
9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../model/util/DmmModelChangerTest.java | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
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 21c3fff1..58be3b23 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));
--
GitLab