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

Timestamp:

02/17/11 14:47:56 (13 years ago)

Author:

cneumuel

Message:

#1233

• added StateLog to log state transitions of hive jobs
• added permissions to hive experiments (in data access layer, no UI for that yet)
• extended unit tests

Location:

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

Files:

• Mocks/MockHiveService.cs (modified) (2 diffs)
• SlaveTest.cs (modified) (3 diffs)

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

@@ -154 +154 @@
     }
 
-    public void UpdateJob(Job jobDto, JobData jobDataDto) {
+    public void UpdateJob(Job jobDto) {
       Console.WriteLine("Update Job called!");
+      ResultJobs.Add(jobDto);
+    }
+
+    public void UpdateJobData(Job jobDto, JobData jobDataDto) {
+      Console.WriteLine("Update JobData called!");
       ResultJobDatas.Add(jobDataDto);
       ResultJobs.Add(jobDto);
@@ -174 +179 @@
       if (curJobIdx < jobs.Count) {
         var job = jobs[curJobIdx];
-        job.SlaveId = slaveId;
+        // job.SlaveId = slaveId; // commented out because of change to StateLog
         curJobIdx++;
         return job;

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

@@ -76 +76 @@
     [TestMethod]
     public void TestSingleJob() {
-      Job testJob = new Job { Id = Guid.NewGuid(), JobState = JobState.Waiting, DateCreated = DateTime.Now, CoresNeeded = 1, MemoryNeeded = 0 };
+      Job testJob = new Job { Id = Guid.NewGuid(), CoresNeeded = 1, MemoryNeeded = 0 };
+      testJob.SetState(JobState.Waiting);
       List<Job> jobList = new List<Job>();
       jobList.Add(testJob);
@@ -113 +114 @@
     [TestMethod]
     public void TestShutdownSlaveWhileJobRunning() {
-      Job testJob = new Job { Id = Guid.NewGuid(), JobState = JobState.Waiting, DateCreated = DateTime.Now, CoresNeeded = 1, MemoryNeeded = 0 };
+      Job testJob = new Job { Id = Guid.NewGuid(), CoresNeeded = 1, MemoryNeeded = 0 };
+      testJob.SetState(JobState.Waiting);
       List<Job> jobList = new List<Job>();
       jobList.Add(testJob);
@@ -173 +175 @@
     [TestMethod]
     public void TestTwoJobs() {
-      Job testJob1 = new Job { Id = Guid.NewGuid(), JobState = JobState.Waiting, DateCreated = DateTime.Now, CoresNeeded = 1, MemoryNeeded = 0 };
-      Job testJob2 = new Job { Id = Guid.NewGuid(), JobState = JobState.Waiting, DateCreated = DateTime.Now, CoresNeeded = 1, MemoryNeeded = 0 };
+      Job testJob1 = new Job { Id = Guid.NewGuid(), CoresNeeded = 1, MemoryNeeded = 0 };
+      testJob1.SetState(JobState.Waiting);
+      Job testJob2 = new Job { Id = Guid.NewGuid(), CoresNeeded = 1, MemoryNeeded = 0 };
+      testJob2.SetState(JobState.Waiting);
       List<Job> jobList = new List<Job>();
       jobList.Add(testJob1);