tests for PerfDataRepoFactory added

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11550 9e42b895-fcda-4063-8a3b-11be15eb1bbd

edu.kit.ipd.descartes.adaptation.test/META-INF/MANIFEST.MF

@@ -6,3 +6,4 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Descartes Research Group
 Fragment-Host: edu.kit.ipd.descartes.adaptation;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: edu.kit.ipd.descartes.ql.models.repository

edu.kit.ipd.descartes.adaptation.test/default.properties

 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
-eventType=SlaViolatedEvent
\ No newline at end of file
+eventType=SlaViolatedEvent
+
+adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+
+perfdatarepo.test=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo
+perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
+perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
\ No newline at end of file

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightedSumCalculatorTest.java

@@ -15,7 +15,7 @@ import edu.kit.ipd.descartes.adaptation.AbstractTest;
 import edu.kit.ipd.descartes.adaptation.AdaptationControl;
 import edu.kit.ipd.descartes.adaptation.evaluation.weightingfunction.IWeightingFunctionCalculator;
 import edu.kit.ipd.descartes.adaptation.evaluation.weightingfunction.WeightedSumCalculator;
-import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
+import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryModelLoader;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedMetric;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
@@ -29,7 +29,7 @@ import edu.kit.ipd.descartes.perfdatarepo.Result;
 
 public class WeightedSumCalculatorTest extends AbstractTest {
     
-    private static final String PROP_PERF_DATA_REPO_XMI_FILE_PATH_NAME = "testModel.performanceDataRepositoryModel";
+    private static final String PROP_TEST_PERF_DATA_REPO_XMI_FILE_PATH_NAME = "perfdatarepo.test";
 	private static final double NEW_WEIGHT = 99.8;
 	
 	IWeightingFunctionCalculator weightedSum;
@@ -44,7 +44,7 @@ public class WeightedSumCalculatorTest extends AbstractTest {
         Properties properties = new Properties();
         FileInputStream  propFile = new FileInputStream(propertiesFilePath);
         properties.load(propFile);
-        performanceDataRepoXmiFilePath=properties.getProperty(PROP_PERF_DATA_REPO_XMI_FILE_PATH_NAME);
+        performanceDataRepoXmiFilePath=properties.getProperty(PROP_TEST_PERF_DATA_REPO_XMI_FILE_PATH_NAME);
     }
 	
 	@Before
@@ -142,13 +142,13 @@ public class WeightedSumCalculatorTest extends AbstractTest {
 	}
 
     private List<MetricType> getMetricTypesFromModel() {
-        PerformanceDataRepository repo = PerformanceDataRepositoryModelManager.getInstance().load(URI.createFileURI(performanceDataRepoXmiFilePath));
+        PerformanceDataRepository repo = PerformanceDataRepositoryModelLoader.getInstance().load(URI.createFileURI(performanceDataRepoXmiFilePath));
         return repo.getMetricTypes();
     }
 
     private Impact loadImpactFromModel() {
         
-        PerformanceDataRepository repo = PerformanceDataRepositoryModelManager.getInstance().load(URI.createFileURI(performanceDataRepoXmiFilePath));
+        PerformanceDataRepository repo = PerformanceDataRepositoryModelLoader.getInstance().load(URI.createFileURI(performanceDataRepoXmiFilePath));
         return repo.getImpactHistory().get(0);
     }
 

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelManagerTest.java

@@ -7,7 +7,7 @@ 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.AdaptationProcessModelManager;
+import edu.kit.ipd.descartes.adaptation.model.dmm.AdaptationProcessModelLoader;
 import edu.kit.ipd.descartes.mm.resourcelandscape.DistributedDataCenter;
 
 public class AdaptationProcessModelManagerTest extends AbstractTest {
@@ -21,7 +21,7 @@ public class AdaptationProcessModelManagerTest extends AbstractTest {
 
     @Test
     public void testGetDistributedDataCenter() {
-        DistributedDataCenter ddc = AdaptationProcessModelManager.getDistributedDataCenter();
+        DistributedDataCenter ddc = AdaptationProcessModelLoader.getDistributedDataCenter();
         assertTrue(!ddc.equals(null));
         assertTrue(ddc.getConsistsOf().size() > 0);
     }

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelChangerTest.java

@@ -4,13 +4,11 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.junit.Before;
 import org.junit.Test;
 
 import edu.kit.ipd.descartes.adaptation.AbstractTest;
 import edu.kit.ipd.descartes.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.model.dmm.util.DmmModelChanger;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationDirection;
 import edu.kit.ipd.descartes.mm.adaptationpoints.AdaptationpointsFactory;
 import edu.kit.ipd.descartes.mm.adaptationpoints.ModelVariableConfigurationRange;

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/PerfDataRepoHelperTest.java

@@ -6,8 +6,8 @@ import org.eclipse.emf.common.util.URI;
 import org.junit.Before;
 import org.junit.Test;
 
-import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
-import edu.kit.ipd.descartes.adaptation.model.dmm.util.PerfDataRepoHelper;
+import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerfDataRepoHelper;
+import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryModelLoader;
 import edu.kit.ipd.descartes.perfdatarepo.Impact;
 import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository;
 
@@ -19,7 +19,7 @@ public class PerfDataRepoHelperTest {
 	@Before
 	public void setUp() throws Exception {
 		
-		PerformanceDataRepositoryModelManager repoManager = PerformanceDataRepositoryModelManager.getInstance();
+		PerformanceDataRepositoryModelLoader repoManager = PerformanceDataRepositoryModelLoader.getInstance();
 		perfDataRepo = (PerformanceDataRepository) repoManager.load(URI
 				.createFileURI(PERF_DATA_REPO_XMI_FILE));
 	}

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelperTest.java

@@ -7,8 +7,8 @@ import org.eclipse.emf.common.util.URI;
 import org.junit.Before;
 import org.junit.Test;
 
-import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.adaptation.model.dmm.util.WeightingFunctionHelper;
+import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryModelLoader;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedMetric;
 import edu.kit.ipd.descartes.mm.adaptation.WeightingFunction;
@@ -23,7 +23,7 @@ public class WeightingFunctionHelperTest {
     private static final String PERF_DATA_REPO_XMI_FILE = "./test_models/PerformanceDataRepositoryDummy.xmi";
     private static final double UTIL_WEIGHT = 2.0d;
 
-    private PerformanceDataRepositoryModelManager perfDataModelManager = PerformanceDataRepositoryModelManager.getInstance();
+    private PerformanceDataRepositoryModelLoader perfDataModelManager = PerformanceDataRepositoryModelLoader.getInstance();
     private PerformanceDataRepository perfDataRepo = null;
     private WeightingFunction function = null;
 

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryHandlerFactoryTest.java

+package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import edu.kit.ipd.descartes.adaptation.AbstractTest;
+
+public class PerformanceDataRepositoryHandlerFactoryTest extends AbstractTest {
+
+    private static final String PERFORMANCE_DATA_REPOSITORY_CLASSNAME = "edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository";
+    private static final String OBSERVATION_REPOSITORY_CLASSNAME = "edu.kit.ipd.descartes.ql.models.repository.ObservationRepository";
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+
+    @Test
+    public void testCreatePerformanceDataRepositoryHandler() {
+        IPerformanceDataRepositoryHandler handler;
+        
+        handler = PerformanceDataRepositoryHandlerFactory.createHandler(PERFORMANCE_DATA_REPOSITORY_CLASSNAME);
+        assertTrue(handler instanceof PerformanceDataRepositoryHandler);
+        
+        handler = PerformanceDataRepositoryHandlerFactory.createHandler(OBSERVATION_REPOSITORY_CLASSNAME);
+        assertTrue(handler instanceof ObservationRepositoryHandler);
+    }
+    
+    @Test
+    public void testCreatePerformanceDataRepositoryHandlerException() {
+        IPerformanceDataRepositoryHandler handler;
+        handler = PerformanceDataRepositoryHandlerFactory.createHandler("");
+        assertTrue(handler == null);
+        
+        handler = PerformanceDataRepositoryHandlerFactory.createHandler("xyz");
+        assertTrue(handler == null);
+    }
+
+}