- Timestamp:
- 02/21/11 17:35:42 (14 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockServiceLocator.cs
r5405 r5526 20 20 #endregion 21 21 22 using HeuristicLab.Clients.Common;22 using System; 23 23 using HeuristicLab.Services.Hive.Common.ServiceContracts; 24 24 25 25 namespace HeuristicLab.Clients.Hive.Slave.Tests { 26 26 public class MockServiceLocator : IServiceLocator { 27 28 27 private MockHiveService service; 29 28 30 public Disposable<IHiveService> GetService() { 29 private string username; 30 public string Username { 31 get { return username; } 32 set { username = value; } 33 } 34 35 private string password; 36 public string Password { 37 get { return password; } 38 set { password = value; } 39 } 40 41 public IHiveService GetService() { 31 42 if (service == null) 32 43 service = new MockHiveService(); 33 34 return new Disposable<IHiveService>(service); 44 return service; 35 45 } 36 46 37 public Disposable<IHiveService> GetService(string username, string password) { 38 return GetService(); 47 public void CallHiveService(Action<IHiveService> call) { 48 call(GetService()); 49 } 50 51 public T CallHiveService<T>(Func<IHiveService, T> call) { 52 return call(GetService()); 39 53 } 40 54 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs
r5511 r5526 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HeuristicLab.Clients.Common;26 25 using HeuristicLab.Services.Hive.Common; 27 26 using HeuristicLab.Services.Hive.Common.DataTransfer; 28 using HeuristicLab.Services.Hive.Common.ServiceContracts;29 27 using Microsoft.VisualStudio.TestTools.UnitTesting; 30 28 … … 82 80 MockJob job = new MockJob(300, false); 83 81 84 using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()){85 MockHiveService ms = (MockHiveService)service .Obj;86 ((MockHiveService)service .Obj).Messages = CreateMsgsForSingleJob();87 ((MockHiveService)service .Obj).updateJobs(jobList, job);82 ServiceLocator.Instance.CallHiveService(service => { 83 MockHiveService ms = (MockHiveService)service; 84 ((MockHiveService)service).Messages = CreateMsgsForSingleJob(); 85 ((MockHiveService)service).updateJobs(jobList, job); 88 86 89 87 HeuristicLab.Clients.Hive.Slave.Core core = new Slave.Core(); … … 93 91 Assert.AreEqual<Guid>(testJob.Id, ms.ResultJobs[0].Id); 94 92 core.Shutdown(); 95 } 93 }); 96 94 } 97 95 … … 120 118 MockJob job = new MockJob(10000, false); 121 119 122 using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()){123 MockHiveService ms = (MockHiveService)service .Obj;124 ((MockHiveService)service .Obj).Messages = CreateMsgsForShutdownSlaveWhileJobRunning();125 ((MockHiveService)service .Obj).updateJobs(jobList, job);120 ServiceLocator.Instance.CallHiveService(service => { 121 MockHiveService ms = (MockHiveService)service; 122 ((MockHiveService)service).Messages = CreateMsgsForShutdownSlaveWhileJobRunning(); 123 ((MockHiveService)service).updateJobs(jobList, job); 126 124 127 125 128 126 HeuristicLab.Clients.Hive.Slave.Core core = new Slave.Core(); 129 127 core.Start(); 130 } 128 }); 131 129 } 132 130 … … 184 182 MockJob job = new MockJob(2000, false); 185 183 186 using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()){187 MockHiveService ms = (MockHiveService)service .Obj;188 ((MockHiveService)service .Obj).Messages = CreateMsgsForTwoJobs();189 ((MockHiveService)service .Obj).updateJobs(jobList, job);184 ServiceLocator.Instance.CallHiveService(service => { 185 MockHiveService ms = (MockHiveService)service; 186 ((MockHiveService)service).Messages = CreateMsgsForTwoJobs(); 187 ((MockHiveService)service).updateJobs(jobList, job); 190 188 191 189 … … 194 192 Assert.AreEqual<int>(2, ms.ResultJobs.Count); 195 193 core.Shutdown(); 196 } 194 }); 197 195 } 198 196 }
Note: See TracChangeset
for help on using the changeset viewer.