Changeset 9955 for trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3

Timestamp:

09/13/13 11:59:36 (11 years ago)

Author:

mkommend

Message:

#2108: Added new resource folder for unit tests and removed run configuration.

Location:

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3

Files:

• CollectObjectGraphTest.cs (modified) (1 diff)
• DeepCloneableCloningTest.cs (modified) (1 diff)
• GeneticAlgorithmTest.cs (modified) (1 diff)
• Resources (deleted)
• SamplesTest.cs (modified) (19 diffs)

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/CollectObjectGraphTest.cs

@@ -47 +47 @@
     [TestCategory("Essential")]
     [TestProperty("Time", "medium")]
-    [DeploymentItem(@"HeuristicLab-3.3/Resources/GA_SymbReg.hl")]
     public void CollectGASample() {
-      GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize("GA_SymbReg.hl");
+      GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_SymbReg.hl");
 
       Stopwatch watch = new Stopwatch();

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

@@ -67 +67 @@
     [TestCategory("Essential")]
     [TestProperty("Time", "long")]
-    [DeploymentItem(@"HeuristicLab-3.3\Resources\SamplesExperimentFinished.hl")]
     public void TestCloningFinishedExperiment() {
-      Experiment experiment = (Experiment)XmlParser.Deserialize("SamplesExperimentFinished.hl");
+      Experiment experiment = (Experiment)XmlParser.Deserialize(@"Test Resources\SamplesExperimentFinished.hl");
 
       Experiment clone = (Experiment)experiment.Clone(new Cloner());

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/GeneticAlgorithmTest.cs

@@ -45 +45 @@
     [TestCategory("General")]
     [TestProperty("Time", "long")]
-    [DeploymentItem(@"HeuristicLab-3.3/Resources/GA_TSP.hl")]
     public void GeneticAlgorithmPerformanceTest() {
       ex = null;
-      GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize("GA_TSP.hl");
+      GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_TSP.hl");
       ga.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(ga_ExceptionOccurred);
       ga.Stopped += new EventHandler(ga_Stopped);

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

@@ -21 +21 @@
 
 using System;
+using System.IO;
 using System.Linq;
 using System.Threading;
@@ -65 +66 @@
 namespace HeuristicLab.Tests {
   [TestClass]
-  [DeploymentItem(@"HeuristicLab-3.3/Resources/C101.opt.txt")]
-  [DeploymentItem(@"HeuristicLab-3.3/Resources/C101.txt")]
   public class SamplesTest {
+    private const string samplesDirectory = @"Samples\";
+
+    [ClassInitialize]
+    public static void MyClassInitialize(TestContext testContext) {
+      if (!Directory.Exists(samplesDirectory))
+        Directory.CreateDirectory(samplesDirectory);
+    }
+
     #region GA
     #region TSP
@@ -75 +82 @@
     public void CreateGaTspSampleTest() {
       var ga = CreateGaTspSample();
-      XmlGenerator.Serialize(ga, "../../GA_TSP.hl");
+      XmlGenerator.Serialize(ga, @"Samples\GA_TSP.hl");
     }
     [TestMethod]
@@ -115 +122 @@
     public void CreateGaVrpSampleTest() {
       var ga = CreateGaVrpSample();
-      XmlGenerator.Serialize(ga, "../../GA_VRP.hl");
+      XmlGenerator.Serialize(ga, @"Samples\GA_VRP.hl");
     }
 
@@ -137 +144 @@
 
       SolomonFormatInstanceProvider instanceProvider = new SolomonInstanceProvider();
-      CVRPTWData data = instanceProvider.Import("C101.txt", "C101.opt.txt") as CVRPTWData;
+      CVRPTWData data = instanceProvider.Import(@"Test Resources\C101.txt", @"Test Resources\C101.opt.txt") as CVRPTWData;
       vrpProblem.Load(data);
       vrpProblem.Name = "C101 VRP (imported from Solomon)";
@@ -189 +196 @@
     public void CreateGpArtificialAntSampleTest() {
       var ga = CreateGpArtificialAntSample();
-      XmlGenerator.Serialize(ga, "../../SGP_SantaFe.hl");
+      XmlGenerator.Serialize(ga, @"Samples\SGP_SantaFe.hl");
     }
 
@@ -245 +252 @@
     public void CreateGpSymbolicRegressionSampleTest() {
       var ga = CreateGpSymbolicRegressionSample();
-      XmlGenerator.Serialize(ga, "../../SGP_SymbReg.hl");
+      XmlGenerator.Serialize(ga, @"Samples\SGP_SymbReg.hl");
     }
     [TestMethod]
@@ -353 +360 @@
     public void CreateGpSymbolicClassificationSampleTest() {
       var ga = CreateGpSymbolicClassificationSample();
-      XmlGenerator.Serialize(ga, "../../SGP_SymbClass.hl");
+      XmlGenerator.Serialize(ga, @"Samples\SGP_SymbClass.hl");
     }
 
@@ -496 +503 @@
     public void CreateEsGriewankSampleTest() {
       var es = CreateEsGriewankSample();
-      XmlGenerator.Serialize(es, "../../ES_Griewank.hl");
+      XmlGenerator.Serialize(es, @"Samples\ES_Griewank.hl");
     }
     [TestMethod]
@@ -554 +561 @@
     public void CreateIslandGaTspSampleTest() {
       var ga = CreateIslandGaTspSample();
-      XmlGenerator.Serialize(ga, "../../IslandGA_TSP.hl");
+      XmlGenerator.Serialize(ga, @"Samples\IslandGA_TSP.hl");
     }
     [TestMethod]
@@ -598 +605 @@
     public void CreateLocalSearchKnapsackSampleTest() {
       var ls = CreateLocalSearchKnapsackSample();
-      XmlGenerator.Serialize(ls, "../../LS_Knapsack.hl");
+      XmlGenerator.Serialize(ls, @"Samples\LS_Knapsack.hl");
     }
     [TestMethod]
@@ -663 +670 @@
     public void CreatePsoSchwefelSampleTest() {
       var pso = CreatePsoSchwefelSample();
-      XmlGenerator.Serialize(pso, "../../PSO_Schwefel.hl");
+      XmlGenerator.Serialize(pso, @"Samples\PSO_Schwefel.hl");
     }
     [TestMethod]
@@ -746 +753 @@
     public void CreateSimulatedAnnealingRastriginSampleTest() {
       var sa = CreateSimulatedAnnealingRastriginSample();
-      XmlGenerator.Serialize(sa, "../../SA_Rastrigin.hl");
+      XmlGenerator.Serialize(sa, @"Samples\SA_Rastrigin.hl");
     }
     [TestMethod]
@@ -816 +823 @@
     public void CreateTabuSearchTspSampleTest() {
       var ts = CreateTabuSearchTspSample();
-      XmlGenerator.Serialize(ts, "../../TS_TSP.hl");
+      XmlGenerator.Serialize(ts, @"Samples\TS_TSP.hl");
     }
     [TestMethod]
@@ -887 +894 @@
     public void CreateTabuSearchVRPSampleTest() {
       var vrp = CreateTabuSearchVrpSample();
-      XmlGenerator.Serialize(vrp, "../../TS_VRP.hl");
+      XmlGenerator.Serialize(vrp, @"Samples\TS_VRP.hl");
     }
     [TestMethod]
@@ -959 +966 @@
     public void CreateVnsTspSampleTest() {
       var vns = CreateVnsTspSample();
-      XmlGenerator.Serialize(vns, "../../VNS_TSP.hl");
+      XmlGenerator.Serialize(vns, @"Samples\VNS_TSP.hl");
     }
     [TestMethod]
@@ -1040 +1047 @@
     public void CreateGaussianProcessRegressionSampleTest() {
       var gpr = CreateGaussianProcessRegressionSample();
-      XmlGenerator.Serialize(gpr, "../../GPR.hl");
+      XmlGenerator.Serialize(gpr, @"Samples\GPR.hl");
     }
     [TestMethod]
@@ -1083 +1090 @@
     public void CreateScatterSearchVRPSampleTest() {
       var ss = CreateScatterSearchVRPSample();
-      XmlGenerator.Serialize(ss, "../../SS_VRP.hl");
+      XmlGenerator.Serialize(ss, @"Samples\SS_VRP.hl");
     }
 
@@ -1143 +1150 @@
     public void CreateRAPGASchedulingSampleTest() {
       var ss = CreateRAPGASchedulingSample();
-      XmlGenerator.Serialize(ss, "../../RAPGA_JSSP.hl");
+      XmlGenerator.Serialize(ss, @"Samples\RAPGA_JSSP.hl");
     }