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 ff21eca11e4f9eae21ffb4eb5dbb29bae75ff3ef..62c00424db49f56ef136d79e2d5fd918e0325435 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);