Changeset 5158

Timestamp:

12/21/10 19:28:29 (13 years ago)

Author:

ascheibe

Message:

Adapt test cases to slave - client communication. #1233

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/SlaveCommListener.cs (deleted)
• HeuristicLab.Clients.Hive.Slave.Tests/HeuristicLab.Clients.Hive.Slave.Tests-3.4.csproj (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.Tests/SlaveCommListener.cs (added)
• HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Slave.Tests/app.config (added)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj

@@ -58 +58 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SlaveCommListener.cs" />
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/HeuristicLab.Clients.Hive.Slave.Tests-3.4.csproj

@@ -298 +298 @@
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\WeifenLuo.WinFormsUI.Docking-2.3.1.dll</HintPath>
@@ -313 +314 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Mocks\MockServiceLocator.cs" />
+    <Compile Include="SlaveCommListener.cs" />
     <Compile Include="SlaveTest.cs" />
   </ItemGroup>
@@ -333 +335 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

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 +34 @@
   public class SlaveTest {
 
+    private static ServiceHost slaveComm;
+    private static SlaveCommListener listener;
+
     // Use ClassInitialize to run code before running the first test in the class
     [ClassInitialize]
@@ -38 +42 @@
       PluginLoader.pluginAssemblies.Any();
       ServiceLocator.Instance = new MockServiceLocator();
-    }
+      slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
+      slaveComm.Open();
+      listener = new SlaveCommListener();
+      listener.Open();
+    }
+
+    [ClassCleanup]
+    public static void MyClassCleanup() {
+      listener.Close();
+      slaveComm.Close();
+    }
+
 
     private List<List<MessageContainer>> CreateMsgsForSingleJob() {
@@ -48 +63 @@
 
       //do nothing
+      msg = new List<MessageContainer>();
+      allMsgs.Add(msg);
       msg = new List<MessageContainer>();
       allMsgs.Add(msg);
@@ -68 +85 @@
       List<Job> jobList = new List<Job>();
       jobList.Add(testJob);
-      MockJob job = new MockJob(400, false);
+      MockJob job = new MockJob(300, false);
 
       using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
@@ -74 +91 @@
         ((MockHiveService)service.Obj).Messages = CreateMsgsForSingleJob();
         ((MockHiveService)service.Obj).updateJobs(jobList, job);
-
 
         HeuristicLab.Clients.Hive.Salve.Core core = new Salve.Core();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -82 +82 @@
 
       DeRegisterServiceEvents();
-
-      ClientCom.LogMessage("Program shutdown");
     }