From 5bfbc615d4cb42fe9b0351bf00b0b6c2b3bd5ab9 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Mon, 4 Feb 2013 14:22:42 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10125
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 ff21eca1..62c00424 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
@@ -10,7 +10,7 @@ import org.junit.Test;
import edu.kit.ipd.descartes.adaptation.AbstractTest;
import edu.kit.ipd.descartes.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.mm.adaptation.AdaptationOperation;
+import edu.kit.ipd.descartes.mm.adaptation.AdaptationDirection;
import edu.kit.ipd.descartes.mm.adaptationpoints.AdaptationpointsFactory;
import edu.kit.ipd.descartes.mm.adaptationpoints.ModelVariableConfigurationRange;
import edu.kit.ipd.descartes.mm.resourceconfiguration.ActiveResourceSpecification;
@@ -59,26 +59,26 @@ public class DmmModelChangerTest extends AbstractTest {
@Test(expected=OperationNotPerformedException.class)
public void testScaleModelVariableException() throws OperationNotPerformedException {
assertTrue(adaptableNumberOfCores.getNumber() == DEFAULT);
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_UP);
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_UP);
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_UP);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.INCREASE);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.INCREASE);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.INCREASE);
}
@Test
public void testScaleModelVariable() throws OperationNotPerformedException {
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_OUT);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.NOT_SET);
assertTrue(adaptableNumberOfCores.getNumber() == DEFAULT);
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_UP);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.INCREASE);
assertTrue(adaptableNumberOfCores.getNumber() == DEFAULT + 1);
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_UP);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.INCREASE);
assertTrue(adaptableNumberOfCores.getNumber() == DEFAULT + 2);
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_DOWN);
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_DOWN);
- DmmModelChanger.scaleModelVariable(point, AdaptationOperation.SCALE_DOWN);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.DECREASE);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.DECREASE);
+ DmmModelChanger.scaleModelVariable(point, AdaptationDirection.DECREASE);
assertTrue(adaptableNumberOfCores.getNumber() == DEFAULT - 1);
--
GitLab