Changeset 5104

Timestamp:

12/14/10 16:07:42 (14 years ago)

Author:

ascheibe

Message:

added some more functionality to the MockService #1233

Location:

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

Files:

• Mocks/MockHiveService.cs (modified) (9 diffs)
• Mocks/MockJob.cs (modified) (2 diffs)
• Mocks/MockServiceLocator.cs (modified) (1 diff)
• SlaveTest.cs (modified) (2 diffs)

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

@@ -6 +6 @@
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common;
+using HeuristicLab.PluginInfrastructure.Manager;
+using System.IO;
+using System.Reflection;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Clients.Hive.Slave.Tests {
@@ -11 +15 @@
     private static List<Job> jobs;
     private static List<JobData> jobDatas;
-    private static List<HiveExperiment> hiveExperiments;
+    private static List<HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment> hiveExperiments;    
+    private static List<Plugin> plugins = null;
+    private static IEnumerable<PluginDescription> pDescs = null;
+    private static int cnt = 0;
+
+    public List<List<MessageContainer>> Messages { get; set; }
+    public static string ServerPluginCachePath { get; set; }
+    public static string ServerConfigFilePath { get; set; }
 
     static MockHiveService() {
-      
-      byte[] data = PersistenceUtil.Serialize(new MockJob(5000));
+      ServerPluginCachePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PluginCacheServer");
+      ServerConfigFilePath = Path.Combine(ServerPluginCachePath, "HeuristicLab 3.3.exe.config");
+
+      byte[] data = PersistenceUtil.Serialize(new MockJob(4000));
+      if (plugins == null)
+        plugins = ReadPluginsFromServerCache();
 
       jobs = new List<Job>();
@@ -25 +40 @@
       jobDatas = new List<JobData>();
       foreach (var job in jobs) {
-        jobDatas.Add(new JobData() { JobId = job.Id, Data = data });
-      }
-
-      hiveExperiments = new List<HiveExperiment>();
-      hiveExperiments.Add(new HiveExperiment() { Id = Guid.NewGuid(), Name = "Hive Exp 1", Description = "", RootJobId = jobs[0].Id });
+        job.PluginsNeededIds = new List<Guid>();
+        job.PluginsNeededIds.AddRange(plugins.Select(a => a.Id));
+        jobDatas.Add(new JobData() { JobId = job.Id, Data = data });        
+      }
+      
+      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 });
+    }
+
+    private static List<Plugin> ReadPluginsFromServerCache() {
+      PluginManager pm = new PluginManager(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PluginCacheServer"));
+      pm.DiscoverAndCheckPlugins();
+      pDescs = pm.Plugins;
+      plugins = new List<Plugin>();
+      foreach (PluginDescription d in pDescs) {
+        Plugin p = new Plugin();
+        p.Name = d.Name;
+        p.Version = d.Version;
+        p.Id = Guid.NewGuid();
+        plugins.Add(p);
+      }
+      return plugins;
     }
 
@@ -50 +82 @@
     }
 
+    public PluginData GetConfigurationFile() {
+      byte[] cf = File.ReadAllBytes(ServerConfigFilePath);
+      PluginData pd = new PluginData();
+      pd.Data = cf;
+      return pd;
+    }
+
     public Job GetJob(Guid jobId) {
       return jobs.Where(j => j.Id == jobId).SingleOrDefault();
@@ -71 +110 @@
 
     public void UpdateJob(Job jobDto, JobData jobDataDto) {
-      // do nothing
+      Console.WriteLine("Update Job called!");
     }
 
@@ -96 +135 @@
 
     #region HiveExperiment Methods
-    public HiveExperiment GetHiveExperiment(Guid id) {
+    public HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment GetHiveExperiment(Guid id) {
       return hiveExperiments.Where(he => he.Id == id).SingleOrDefault();
     }
 
-    public IEnumerable<HiveExperiment> GetHiveExperiments() {
+    public IEnumerable<HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment> GetHiveExperiments() {
       return hiveExperiments;
     }
 
-    public Guid AddHiveExperiment(HiveExperiment hiveExperimentDto) {
+    public Guid AddHiveExperiment(HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment hiveExperimentDto) {
       hiveExperimentDto.Id = Guid.NewGuid();
       hiveExperiments.Add(hiveExperimentDto);
@@ -110 +149 @@
     }
 
-    public void UpdateHiveExperiment(HiveExperiment hiveExperimentDto) {
+    public void UpdateHiveExperiment(HeuristicLab.Services.Hive.Common.DataTransfer.HiveExperiment hiveExperimentDto) {
       // do nothing
     }
@@ -126 +165 @@
     public void GoodBye() {
       // do nothing
-    }
-
+    }    
+    
     public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
-      // todo
-      return new List<MessageContainer>();
-    }
+      if (Messages != null && cnt < Messages.Count) {
+        return Messages[cnt++];
+      } else {
+        return new List<MessageContainer>();
+      }
+    }
+      
     #endregion
 
@@ -141 +184 @@
 
     public IEnumerable<Plugin> GetPlugins() {
-      // todo
-      return new List<Plugin>();
+      if (plugins == null)
+        plugins = ReadPluginsFromServerCache();
+      return plugins;              
     }
 
     public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
-      // todo
-      return new List<PluginData>();
+      List<PluginData> pluginDatas = new List<PluginData>();
+
+      foreach (Guid guid in pluginIds) {
+        Plugin plugin = plugins.Find(p => p.Id == guid);
+        if (plugin != null) {
+          PluginDescription desc = pDescs.First(p => p.Name == plugin.Name && p.Version == plugin.Version);
+          if (desc != null) {
+            foreach (IPluginFile file in desc.Files) {
+              PluginData data = new PluginData();
+              data.PluginId = guid;
+              data.Data = File.ReadAllBytes(file.Name);
+              pluginDatas.Add(data);
+            }
+          }          
+        }     
+      }
+      return pluginDatas;
     }
     #endregion

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

@@ -97 +97 @@
         this.ExecutionTime = DateTime.Now - start;
       } while (ExecutionTime.TotalMilliseconds < ms);
-      this.ExecutionState = Core.ExecutionState.Stopped;
+      Stop();
+      OnJobStopped();
     }
 
@@ -148 +149 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+                                                      
+    public event EventHandler JobFailed;
+    protected virtual void OnJobFailed() {
+      EventHandler handler = JobFailed;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler JobStopped;
+    protected virtual void OnJobStopped() {
+      EventHandler handler = JobStopped;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
     #endregion
   }

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

@@ -9 +9 @@
   internal class MockServiceLocator : IServiceLocator {
 
+    private MockHiveService service;
+
     public Disposable<IHiveService> GetService() {
-      return new Disposable<IHiveService>(new MockHiveService());
+      if (service == null)
+        service = new MockHiveService();
+
+      return new Disposable<IHiveService>(service);
     }
   }

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

@@ -4 +4 @@
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using HeuristicLab.Clients.Hive.Salve;
+using HeuristicLab.Services.Hive.Common;
+using HeuristicLab.Services.Hive.Common.ServiceContracts;
+using HeuristicLab.Clients.Common;
 
 namespace HeuristicLab.Clients.Hive.Slave.Tests {
@@ -12 +16 @@
     [ClassInitialize]
     public static void MyClassInitialize(TestContext testContext) {
-      PluginLoader.pluginAssemblies.Any();
+      PluginLoader.pluginAssemblies.Any();      
       ServiceLocator.Instance = new MockServiceLocator();
+    }
+
+    public List<List<MessageContainer>> CreateMsgs() {
+      List<List<MessageContainer>> allMsgs = new List<List<MessageContainer>>();
+      //get slave to fetch job
+      List<MessageContainer> msg = new List<MessageContainer>();
+      msg.Add(new MessageContainer(MessageContainer.MessageType.AquireJob));
+      allMsgs.Add(msg);
+
+      //do nothing
+      msg = new List<MessageContainer>();
+      allMsgs.Add(msg);
+
+      msg = new List<MessageContainer>();
+      msg.Add(new MessageContainer(MessageContainer.MessageType.ShutdownSlave));
+      allMsgs.Add(msg);
+      return allMsgs;
     }
 
     [TestMethod]
     public void TestMethod1() {
-      SlaveDummy slave = new SlaveDummy();
+      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) { 
+        ((MockHiveService)service.Obj).Messages = CreateMsgs();
+      }
       
-      slave.SayHello();
+      HeuristicLab.Clients.Hive.Salve.Core core = new Salve.Core();
+      core.Start();
     }
   }