diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelperTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightingFunctionHelperTest.java similarity index 97% rename from edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelperTest.java rename to edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightingFunctionHelperTest.java index 2f99604f33a6a7e94383de86a59fb5226b0e53a9..25cbf237610035ec68e5fbf2b44fa2282d219078 100644 --- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelperTest.java +++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightingFunctionHelperTest.java @@ -1,4 +1,4 @@ -package edu.kit.ipd.descartes.adaptation.model.dmm.util; +package edu.kit.ipd.descartes.adaptation.evaluation.weightingfunction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -12,7 +12,7 @@ import org.eclipse.emf.common.util.URI; import org.junit.Before; import org.junit.Test; -import edu.kit.ipd.descartes.adaptation.model.dmm.util.WeightingFunctionHelper; +import edu.kit.ipd.descartes.adaptation.evaluation.weightingfunction.WeightingFunctionHelper; import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerfDataRepoConverter; import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryModelLoader; import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory; diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/ObjectivesHelperTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/ObjectivesHelperTest.java new file mode 100644 index 0000000000000000000000000000000000000000..8fe0c8937e77b27b98b7bd90799d48aec08ced6c --- /dev/null +++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/ObjectivesHelperTest.java @@ -0,0 +1,30 @@ +package edu.kit.ipd.descartes.adaptation.model.dmm.util; + +import static org.junit.Assert.*; + +import org.junit.Before; +import org.junit.Test; + +import edu.kit.ipd.descartes.adaptation.AbstractTest; +import edu.kit.ipd.descartes.mm.adaptation.RelationalOperator; + +public class ObjectivesHelperTest extends AbstractTest { + + @Before + public void setUp() throws Exception { + super.setUp(); + } + + @Test + public void testCompare() { + Double one = 1.0d; + Double two = 2.0d; + assertTrue(ObjectivesHelper.compare(one, one, RelationalOperator.EQUAL)); + assertTrue(ObjectivesHelper.compare(one, two, RelationalOperator.NOT_EQUAL)); + assertTrue(ObjectivesHelper.compare(one, two, RelationalOperator.LESS)); + assertTrue(ObjectivesHelper.compare(two, two, RelationalOperator.LESS_EQUAL)); + assertTrue(ObjectivesHelper.compare(two, one, RelationalOperator.GREATER)); + assertTrue(ObjectivesHelper.compare(two, two, RelationalOperator.GREATER_EQUAL)); + } + +}