From 36113a1419d534dd6933216ef4f6f4700dd6f379 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Wed, 6 Mar 2013 16:23:28 +0000
Subject: [PATCH] externalized test model string
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10632 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../default.properties | 1 +
.../descartes/adaptation/AbstractTest.java | 1 +
...=> AdaptationProcessModelManagerTest.java} | 2 +-
.../WeightedSumCalculatorTest.java | 23 +++++++++++++++----
4 files changed, 22 insertions(+), 5 deletions(-)
rename edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/{DmmModelManagerTest.java => AdaptationProcessModelManagerTest.java} (92%)
diff --git a/edu.kit.ipd.descartes.adaptation.test/default.properties b/edu.kit.ipd.descartes.adaptation.test/default.properties
index 67e156c6..687a0ae8 100644
--- a/edu.kit.ipd.descartes.adaptation.test/default.properties
+++ b/edu.kit.ipd.descartes.adaptation.test/default.properties
@@ -2,3 +2,4 @@ processName=MODELS_FOR_TESTING_PURPOSES
adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
maxIterations=2
+testModel.performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo
\ No newline at end of file
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/AbstractTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/AbstractTest.java
index 828858b8..9dc54d5f 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/AbstractTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/AbstractTest.java
@@ -6,6 +6,7 @@ import org.junit.Before;
public abstract class AbstractTest {
+ protected static final String propertiesFilePath = "./default.properties";
private Logger logger = Logger.getLogger(AbstractTest.class);
@Before
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/DmmModelManagerTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManagerTest.java
similarity index 92%
rename from edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/DmmModelManagerTest.java
rename to edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManagerTest.java
index dd146f4e..dd22f8d7 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/DmmModelManagerTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManagerTest.java
@@ -10,7 +10,7 @@ import edu.kit.ipd.descartes.adaptation.AdaptationControl;
import edu.kit.ipd.descartes.adaptation.model.dmm.AdaptationProcessModelManager;
import edu.kit.ipd.descartes.mm.resourcelandscape.DistributedDataCenter;
-public class DmmModelManagerTest extends AbstractTest {
+public class AdaptationProcessModelManagerTest extends AbstractTest {
@Before
public void setUp() throws Exception {
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java
index e50c3315..c270296f 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java
@@ -2,13 +2,17 @@ package edu.kit.ipd.descartes.adaptation.weightingfunction;
import static org.junit.Assert.assertEquals;
+import java.io.FileInputStream;
import java.util.List;
+import java.util.Properties;
import org.eclipse.emf.common.util.URI;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import edu.kit.ipd.descartes.adaptation.AbstractTest;
+import edu.kit.ipd.descartes.adaptation.AdaptationControl;
import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
import edu.kit.ipd.descartes.mm.adaptation.WeightedMetric;
@@ -23,17 +27,28 @@ import edu.kit.ipd.descartes.perfdatarepo.Result;
public class WeightedSumCalculatorTest extends AbstractTest {
- private String modelFile = "/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo";
-
+ private static final String PROP_PERF_DATA_REPO_XMI_FILE_PATH_NAME = "testModel.performanceDataRepositoryModel";
private static final double NEW_WEIGHT = 99.8;
IWeightingFunctionCalculator weightedSum;
WeightedTactic wt = null;
WeightingFunction fun = null;
+ AdaptationControl control = null;
+
+ private static String performanceDataRepoXmiFilePath;
+
+ @BeforeClass
+ public static void before() throws Exception {
+ Properties properties = new Properties();
+ FileInputStream propFile = new FileInputStream(propertiesFilePath);
+ properties.load(propFile);
+ performanceDataRepoXmiFilePath=properties.getProperty(PROP_PERF_DATA_REPO_XMI_FILE_PATH_NAME);
+ }
@Before
public void setUp() throws Exception {
super.setUp();
+
MetricType respTime = PerfdatarepoFactory.eINSTANCE.createMetricType();
respTime.setName("Response Time");
MetricType util = PerfdatarepoFactory.eINSTANCE.createMetricType();
@@ -125,13 +140,13 @@ public class WeightedSumCalculatorTest extends AbstractTest {
}
private List<MetricType> getMetricTypesFromModel() {
- PerformanceDataRepository repo = PerformanceDataRepositoryModelManager.getInstance().load(URI.createFileURI(modelFile));
+ PerformanceDataRepository repo = PerformanceDataRepositoryModelManager.getInstance().load(URI.createFileURI(performanceDataRepoXmiFilePath));
return repo.getMetricTypes();
}
private Impact loadImpactFromModel() {
- PerformanceDataRepository repo = PerformanceDataRepositoryModelManager.getInstance().load(URI.createFileURI(modelFile));
+ PerformanceDataRepository repo = PerformanceDataRepositoryModelManager.getInstance().load(URI.createFileURI(performanceDataRepoXmiFilePath));
return repo.getImpactHistory().get(0);
}
--
GitLab