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

Timestamp:

03/03/11 14:18:29 (14 years ago)

Author:

ascheibe

Message:

#1233

• rename 'Slave' namespace to 'SlaveCore' (and assemblies etc) to avoid problems with 'Slave' class
• use svcutil (OKB-style)

Location:

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

Files:

• MockHiveService.cs (modified) (13 diffs)
• MockJob.cs (modified) (1 diff)
• MockServiceLocator.cs (modified) (2 diffs)

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

@@ -26 +26 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.PluginInfrastructure.Manager;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Services.Hive.Common.ServiceContracts;
-
-namespace HeuristicLab.Clients.Hive.Slave.Tests {
+
+namespace HeuristicLab.Clients.Hive.SlaveCore.Tests {
   internal class MockHiveService : IHiveService {
     private static List<Job> jobs;
     private static List<JobData> jobDatas;
-    private static List<HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment> hiveExperiments;
+    private static List<HiveExperiment> hiveExperiments;
     private static List<Plugin> plugins = null;
     public List<Job> ResultJobs { get; set; }
     public List<JobData> ResultJobDatas { get; set; }
-    private static IEnumerable<PluginDescription> pDescs = null;
+    private static List<PluginDescription> pDescs = null;
     private static int cnt = 0;
 
@@ -82 +79 @@
       }
 
-      hiveExperiments = new List<HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment>();
-      hiveExperiments.Add(new HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment() { Id = Guid.NewGuid(), Name = "Hive Exp 1", Description = "", RootJobId = jobs[0].Id });
+      hiveExperiments = new List<HiveExperiment>();
+      hiveExperiments.Add(new HiveExperiment() { Id = Guid.NewGuid(), Name = "Hive Exp 1", Description = "", RootJobId = jobs[0].Id });
 
       ResultJobDatas = new List<JobData>();
@@ -92 +89 @@
       PluginManager pm = new PluginManager(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PluginCacheServer"));
       pm.DiscoverAndCheckPlugins();
-      pDescs = pm.Plugins;
+      pDescs = pm.Plugins.ToList();
       plugins = new List<Plugin>();
       foreach (PluginDescription d in pDescs) {
@@ -106 +103 @@
 
     #region Job Methods
-    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> slaveGroupIds) {
+    public Guid AddJob(Job job, JobData jobData, List<Guid> slaveGroupIds) {
       job.Id = Guid.NewGuid();
       jobData.JobId = job.Id;
@@ -136 +133 @@
     }
 
-    public IEnumerable<Job> GetJobs() {
+    public List<Job> GetJobs() {
       return jobs;
     }
 
-    public IEnumerable<LightweightJob> GetLightweightJobs(IEnumerable<Guid> jobIds) {
-      return jobs.Select(j => new LightweightJob(j)); // not real
-    }
-
-    public IEnumerable<LightweightJob> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent) {
-      return jobs.Where(j => j.ParentJobId.HasValue).Select(j => new LightweightJob(j));
+    public List<LightweightJob> GetLightweightJobs(List<Guid> jobIds) {
+      return jobs.Select(j => new LightweightJob(j)).ToList(); // not real
+    }
+
+    public List<LightweightJob> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent) {
+      return jobs.Where(j => j.ParentJobId.HasValue).Select(j => new LightweightJob(j)).ToList();
     }
 
@@ -196 +193 @@
 
     #region HiveExperiment Methods
-    public HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment GetHiveExperiment(Guid id) {
+    public HiveExperiment GetHiveExperiment(Guid id) {
       return hiveExperiments.Where(he => he.Id == id).SingleOrDefault();
     }
 
-    public IEnumerable<HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment> GetHiveExperiments() {
+    public List<HiveExperiment> GetHiveExperiments() {
       return hiveExperiments;
     }
 
-    public Guid AddHiveExperiment(HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment hiveExperimentDto) {
+    public Guid AddHiveExperiment(HiveExperiment hiveExperimentDto) {
       hiveExperimentDto.Id = Guid.NewGuid();
       hiveExperiments.Add(hiveExperimentDto);
@@ -210 +207 @@
     }
 
-    public void UpdateHiveExperiment(HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment hiveExperimentDto) {
+    public void UpdateHiveExperiment(HiveExperiment hiveExperimentDto) {
       // do nothing
     }
@@ -220 +217 @@
 
     #region Login Methods
-    public void Hello(HeuristicLab.Services.Hive.Common.DataTransfer.Slave slaveInfo) {
+    public void Hello(Slave slaveInfo) {
       // do nothing
     }
@@ -257 +254 @@
     }
 
-    public IEnumerable<Plugin> GetPlugins() {
+    public List<Plugin> GetPlugins() {
       if (plugins == null)
         plugins = ReadPluginsFromServerCache();
@@ -263 +260 @@
     }
 
-    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
+    public List<PluginData> GetPluginDatas(List<Guid> pluginIds) {
       List<PluginData> pluginDatas = new List<PluginData>();
 
@@ -286 +283 @@
 
     #region Slave Methods
-    public Guid AddSlave(Services.Hive.Common.DataTransfer.Slave slave) {
+    public Guid AddSlave(Slave slave) {
       throw new NotImplementedException();
     }
@@ -294 +291 @@
     }
 
-    public Services.Hive.Common.DataTransfer.Slave GetSlave(Guid slaveId) {
+    public Slave GetSlave(Guid slaveId) {
       throw new NotImplementedException();
     }
@@ -302 +299 @@
     }
 
-    public IEnumerable<Services.Hive.Common.DataTransfer.Slave> GetSlaves() {
-      throw new NotImplementedException();
-    }
-
-    public IEnumerable<SlaveGroup> GetSlaveGroups() {
-      throw new NotImplementedException();
-    }
-
-    public void UpdateSlave(Services.Hive.Common.DataTransfer.Slave slave) {
+    public List<Slave> GetSlaves() {
+      throw new NotImplementedException();
+    }
+
+    public List<SlaveGroup> GetSlaveGroups() {
+      throw new NotImplementedException();
+    }
+
+    public void UpdateSlave(Slave slave) {
       throw new NotImplementedException();
     }

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

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Clients.Hive.Slave.Tests {
+namespace HeuristicLab.Clients.Hive.SlaveCore.Tests {
   [Item("Mock Job", "Represents mocked Job which just SpinWaits.")]
   [StorableClass]

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

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Services.Hive.Common.ServiceContracts;
 
-namespace HeuristicLab.Clients.Hive.Slave.Tests {
+namespace HeuristicLab.Clients.Hive.SlaveCore.Tests {
   public class MockServiceLocator : IServiceLocator {
     private MockHiveService service;
@@ -38 +37 @@
       set { password = value; }
     }
-    
+
     public IHiveService GetService() {
       if (service == null)