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

Timestamp:

02/21/11 17:35:42 (13 years ago)

Author:

cneumuel

Message:

#1233

• fixed handling of StateLog in DataLayer
• extended unit tests
• changed style of service calls to OKB-like style (using delegates)
• added possibility that parent jobs can be finished immediately when child jobs are finished

Location:

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

Files:

• Mocks/MockServiceLocator.cs (modified) (1 diff)
• SlaveTest.cs (modified) (6 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Common;
+using System;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
 
 namespace HeuristicLab.Clients.Hive.Slave.Tests {
   public class MockServiceLocator : IServiceLocator {
-
     private MockHiveService service;
 
-    public Disposable<IHiveService> GetService() {
+    private string username;
+    public string Username {
+      get { return username; }
+      set { username = value; }
+    }
+
+    private string password;
+    public string Password {
+      get { return password; }
+      set { password = value; }
+    }
+    
+    public IHiveService GetService() {
       if (service == null)
         service = new MockHiveService();
-
-      return new Disposable<IHiveService>(service);
+      return service;
     }
 
-    public Disposable<IHiveService> GetService(string username, string password) {
-      return GetService();
+    public void CallHiveService(Action<IHiveService> call) {
+      call(GetService());
+    }
+
+    public T CallHiveService<T>(Func<IHiveService, T> call) {
+      return call(GetService());
     }
   }

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Clients.Common;
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -82 +80 @@
       MockJob job = new MockJob(300, false);
 
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
-        MockHiveService ms = (MockHiveService)service.Obj;
-        ((MockHiveService)service.Obj).Messages = CreateMsgsForSingleJob();
-        ((MockHiveService)service.Obj).updateJobs(jobList, job);
+      ServiceLocator.Instance.CallHiveService(service => {
+        MockHiveService ms = (MockHiveService)service;
+        ((MockHiveService)service).Messages = CreateMsgsForSingleJob();
+        ((MockHiveService)service).updateJobs(jobList, job);
 
         HeuristicLab.Clients.Hive.Slave.Core core = new Slave.Core();
@@ -93 +91 @@
         Assert.AreEqual<Guid>(testJob.Id, ms.ResultJobs[0].Id);
         core.Shutdown();
-      }
+      });
     }
 
@@ -120 +118 @@
       MockJob job = new MockJob(10000, false);
 
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
-        MockHiveService ms = (MockHiveService)service.Obj;
-        ((MockHiveService)service.Obj).Messages = CreateMsgsForShutdownSlaveWhileJobRunning();
-        ((MockHiveService)service.Obj).updateJobs(jobList, job);
+      ServiceLocator.Instance.CallHiveService(service => {
+        MockHiveService ms = (MockHiveService)service;
+        ((MockHiveService)service).Messages = CreateMsgsForShutdownSlaveWhileJobRunning();
+        ((MockHiveService)service).updateJobs(jobList, job);
 
 
         HeuristicLab.Clients.Hive.Slave.Core core = new Slave.Core();
         core.Start();
-      }
+      });
     }
 
@@ -184 +182 @@
       MockJob job = new MockJob(2000, false);
 
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
-        MockHiveService ms = (MockHiveService)service.Obj;
-        ((MockHiveService)service.Obj).Messages = CreateMsgsForTwoJobs();
-        ((MockHiveService)service.Obj).updateJobs(jobList, job);
+      ServiceLocator.Instance.CallHiveService(service => {
+        MockHiveService ms = (MockHiveService)service;
+        ((MockHiveService)service).Messages = CreateMsgsForTwoJobs();
+        ((MockHiveService)service).updateJobs(jobList, job);
 
 
@@ -194 +192 @@
         Assert.AreEqual<int>(2, ms.ResultJobs.Count);
         core.Shutdown();
-      }
+      });
     }
   }