Changeset 5325 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests

Timestamp:

01/18/11 15:51:14 (13 years ago)

Author:

ascheibe

Message:

#1233

• allow different versions of the same plugin in PluginCache
• fixes for the SlaveTests

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs (modified) (6 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.ServiceModel;
 using HeuristicLab.Clients.Common;
 using HeuristicLab.Services.Hive.Common;
@@ -33 +32 @@
   [TestClass]
   public class SlaveTest {
-
-    private static ServiceHost slaveComm;
     private static SlaveCommListener listener;
 
@@ -42 +39 @@
       PluginLoader.pluginAssemblies.Any();
       ServiceLocator.Instance = new MockServiceLocator();
-      slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
-      slaveComm.Open();
-      listener = new SlaveCommListener();
-      listener.Open();
+      /* listener = new SlaveCommListener();
+       listener.Open();*/
     }
 
     [ClassCleanup]
     public static void MyClassCleanup() {
-      listener.Close();
-      slaveComm.Close();
+      //listener.Close();
     }
 
@@ -97 +91 @@
         Assert.AreEqual<int>(1, ms.ResultJobs.Count);
         Assert.AreEqual<Guid>(testJob.Id, ms.ResultJobs[0].Id);
+        core.Shutdown();
       }
     }
@@ -131 +126 @@
         HeuristicLab.Clients.Hive.Slave.Core core = new Slave.Core();
         core.Start();
-
       }
     }
@@ -195 +189 @@
         core.Start();
         Assert.AreEqual<int>(2, ms.ResultJobs.Count);
-
+        core.Shutdown();
       }
     }
-
-
-
-
-
-
-
-
-
   }
 }