Skip to content
Snippets Groups Projects
Commit 58e5fff9 authored by Nikolaus Huber's avatar Nikolaus Huber
Browse files

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10163 9e42b895-fcda-4063-8a3b-11be15eb1bbd
parent 0dae4df5
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,7 @@ import edu.kit.ipd.descartes.mm.resourceconfiguration.ProcessingResourceSpecific ...@@ -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.resourceconfiguration.ResourceconfigurationFactory;
import edu.kit.ipd.descartes.mm.resourcelandscape.Container; import edu.kit.ipd.descartes.mm.resourcelandscape.Container;
import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapeFactory; import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapeFactory;
import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapePackage;
import edu.kit.ipd.descartes.mm.resourcelandscape.RuntimeEnvironment; import edu.kit.ipd.descartes.mm.resourcelandscape.RuntimeEnvironment;
public class DmmModelChangerTest extends AbstractTest { public class DmmModelChangerTest extends AbstractTest {
...@@ -40,11 +41,13 @@ public class DmmModelChangerTest extends AbstractTest { ...@@ -40,11 +41,13 @@ public class DmmModelChangerTest extends AbstractTest {
ActiveResourceSpecification spec = null; ActiveResourceSpecification spec = null;
Container container = null; Container container = null;
ContainerTemplate template = null; ContainerTemplate template = null;
Container parent = null;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
container = ResourcelandscapeFactory.eINSTANCE.createRuntimeEnvironment(); parent = ResourcelandscapeFactory.eINSTANCE.createComputingInfrastructure();
container = ResourcelandscapeFactory.eINSTANCE.createRuntimeEnvironment();
template = ContainerrepositoryFactory.eINSTANCE.createContainerTemplate(); template = ContainerrepositoryFactory.eINSTANCE.createContainerTemplate();
original = ResourcelandscapeFactory.eINSTANCE.createRuntimeEnvironment(); original = ResourcelandscapeFactory.eINSTANCE.createRuntimeEnvironment();
adaptableNumberOfCores = ResourceconfigurationFactory.eINSTANCE.createNumberOfParallelProcessingUnits(); adaptableNumberOfCores = ResourceconfigurationFactory.eINSTANCE.createNumberOfParallelProcessingUnits();
...@@ -64,12 +67,16 @@ public class DmmModelChangerTest extends AbstractTest { ...@@ -64,12 +67,16 @@ public class DmmModelChangerTest extends AbstractTest {
original.getConfigSpec().add(spec); original.getConfigSpec().add(spec);
original.setName(TEST_RUNTIME_ENV); original.setName(TEST_RUNTIME_ENV);
original.setTemplate(ContainerrepositoryFactory.eINSTANCE.createContainerTemplate());
point.setMinValue(MIN); point.setMinValue(MIN);
point.setMaxValue(MAX); point.setMaxValue(MAX);
point.setAdaptableEntity(adaptableNumberOfCores); point.setAdaptableEntity(adaptableNumberOfCores);
point.setName(EMPTY); point.setName(EMPTY);
parent.setName(PARENT_CONTAINER);
parent.getContains().add(original);
template.getTemplateConfig().add(spec); template.getTemplateConfig().add(spec);
template.setName(EMPTY); template.setName(EMPTY);
container.setTemplate(template); container.setTemplate(template);
...@@ -107,10 +114,6 @@ public class DmmModelChangerTest extends AbstractTest { ...@@ -107,10 +114,6 @@ public class DmmModelChangerTest extends AbstractTest {
@Test @Test
public void testScaleInRuntimeEnvironmentInstance() { public void testScaleInRuntimeEnvironmentInstance() {
Container parent = ResourcelandscapeFactory.eINSTANCE.createComputingInfrastructure();
parent.setName(PARENT_CONTAINER);
parent.getContains().add(original);
RuntimeEnvironment copy = DmmModelChanger.scaleOutRuntimeEnvironmentInstance(original); RuntimeEnvironment copy = DmmModelChanger.scaleOutRuntimeEnvironmentInstance(original);
assertFalse(original.getId().equals(copy.getId())); assertFalse(original.getId().equals(copy.getId()));
...@@ -129,11 +132,6 @@ public class DmmModelChangerTest extends AbstractTest { ...@@ -129,11 +132,6 @@ public class DmmModelChangerTest extends AbstractTest {
@Test @Test
public void testScaleOutRuntimeEnvironmentInstance() { 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); RuntimeEnvironment copy = DmmModelChanger.scaleOutRuntimeEnvironmentInstance(original);
assertFalse(original.getId().equals(copy.getId())); assertFalse(original.getId().equals(copy.getId()));
...@@ -142,6 +140,8 @@ public class DmmModelChangerTest extends AbstractTest { ...@@ -142,6 +140,8 @@ public class DmmModelChangerTest extends AbstractTest {
assertEquals(original.getTemplate(), copy.getTemplate()); assertEquals(original.getTemplate(), copy.getTemplate());
assertTrue(copy.getConfigSpec().isEmpty()); assertTrue(copy.getConfigSpec().isEmpty());
assertTrue(original.getTemplate().getReferringContainers().contains(copy));
assertTrue(parent.getContains().size() == 2); assertTrue(parent.getContains().size() == 2);
assertEquals(original, parent.getContains().get(0)); assertEquals(original, parent.getContains().get(0));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment