Changeset 11287

Timestamp:

08/19/14 15:52:56 (10 years ago)

Author:

pfleck

Message:

#2225
Fixed unit test for VRP instances.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/IVRPInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs (modified) (3 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.VehicleRouting-3.4/VRPInstancesTest.cs (modified) (4 diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs

@@ -37 +37 @@
 
     protected override void importButton_Click(object sender, EventArgs e) {
-      var provider = Content as IVRPInstanceProvider<T>;
+      var provider = Content as IVRPInstanceProvider;
       if (provider != null) {
         using (var dialog = new VRPImportDialog(Content.Name)) {
@@ -43 +43 @@
             var instance = provider.Import(dialog.VRPFileName, dialog.TourFileName);
             try {
-              GenericConsumer.Load(instance);
+              GenericConsumer.Load(instance as T);
               instancesComboBox.SelectedIndex = -1;
             } catch (Exception ex) {
@@ -54 +54 @@
 
     protected override void exportButton_Click(object sender, EventArgs e) {
-      var provider = Content as IVRPInstanceProvider<T>;
+      var provider = Content as IVRPInstanceProvider;
       if (provider != null) {
         if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/IVRPInstanceProvider.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public interface IVRPInstanceProvider<T> where T : IVRPData {
+  public interface IVRPInstanceProvider {
     bool CanImportData { get; }
-    T Import(string vrpFile, string tourFile);
+    IVRPData Import(string vrpFile, string tourFile);
 
     bool CanExportData { get; }
-    void Export(T instance, string path);
+    void Export(IVRPData instance, string path);
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T>, IVRPInstanceProvider<T> where T : IVRPData {
+  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T>, IVRPInstanceProvider where T : IVRPData {
     protected abstract string FileName { get; }
 
@@ -107 +107 @@
     protected abstract T LoadData(Stream stream);
 
-    public T Import(string vrpFile, string tourFile) {
+    public IVRPData Import(string vrpFile, string tourFile) {
       var data = ImportData(vrpFile);
       if (!String.IsNullOrEmpty(tourFile)) {
@@ -115 +115 @@
     }
 
-    public void Export(T instance, string path) {
-      ExportData(instance, path);
+    public void Export(IVRPData instance, string path) {
+      ExportData((T)instance, path);
     }
 

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.VehicleRouting-3.4/VRPInstancesTest.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Problems.Instances.VehicleRouting;
+using HeuristicLab.Problems.Instances;
+using HeuristicLab.Tests;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -30 +31 @@
   [TestClass]
   public class VRPInstancesTest {
+    [ClassInitialize]
+    public static void MyClassInitialize(TestContext testContext) {
+      PluginLoader.Assemblies.Any();
+    }
+
     [TestMethod]
     [TestCategory("Problems.VehicleRouting")]
     [TestProperty("Time", "long")]
     public void TestVRPInstances() {
-      var providers = ApplicationManager.Manager.GetInstances<VRPInstanceProvider>();
       var vrp = new VehicleRoutingProblem();
+      var providers = ProblemInstanceManager.GetProviders(vrp);
       var failedInstances = new StringBuilder();
 
@@ -41 +47 @@
 
       foreach (var provider in providers) {
-        var instances = provider.GetDataDescriptors();
+        IEnumerable<IDataDescriptor> instances = ((dynamic)provider).GetDataDescriptors();
         Assert.IsTrue(instances.Any(), "No instances could be found.");
 
@@ -47 +53 @@
           try {
             // throws InvalidOperationException if zero or more than one interpreter is found
-            vrp.Load(provider.LoadData(instance));
+            ((dynamic)vrp).Load(((dynamic)provider).LoadData(instance));
           } catch (Exception exc) {
             failedInstances.AppendLine(instance + ": " + exc.Message);

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -330 +330 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <Private>false</Private>