Changeset 6743 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests

Timestamp:

09/12/11 18:04:25 (13 years ago)

Author:

ascheibe

Message:

#1233

• fixed a bug in the Slave UI
• finished renaming Webservice and Dao methods to be consistent with Job/Task naming
• some cosmetic changes and project dependencies cleanups

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests

Files:

• DaoTests.cs (modified) (9 diffs)
• HeuristicLab.Services.Hive.Tests-3.3.csproj (modified) (1 diff)
• Mocks/MockAuthorizationManager.cs (modified) (1 diff)
• ServiceTests.cs (modified) (14 diffs)
• Test References/HeuristicLab.Services.Hive-3.3.accessor (moved) (moved from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Test References/HeuristicLab.Services.Hive-3.4.accessor)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/DaoTests.cs

@@ -49 +49 @@
       he.OwnerUserId = Guid.NewGuid();
       he.ResourceNames = "HEAL";
-      he.Id = dao.AddHiveExperiment(he);
+      he.Id = dao.AddJob(he);
 
       DT.Task job1 = new DT.Task();
@@ -80 +80 @@
       job1.PluginsNeededIds.Add(plugin1.Id);
 
-      job1.Id = dao.AddJob(job1);
+      job1.Id = dao.AddTask(job1);
       jobData1.TaskId = job1.Id;
-      dao.AddJobData(jobData1);
-
-      DT.Task job1loaded = dao.GetJob(job1.Id);
+      dao.AddTaskData(jobData1);
+
+      DT.Task job1loaded = dao.GetTask(job1.Id);
       Assert.AreEqual(job1.Id, job1loaded.Id);
       Assert.AreEqual(job1.CoresNeeded, job1loaded.CoresNeeded);
@@ -94 +94 @@
       Assert.AreEqual(job1.JobId, job1loaded.JobId);
       Assert.AreEqual(job1.IsPrivileged, job1loaded.IsPrivileged);
-      Assert.IsTrue(Math.Abs((job1loaded.LastJobDataUpdate - jobData1.LastUpdate).TotalSeconds) < 1);
+      Assert.IsTrue(Math.Abs((job1loaded.LastTaskDataUpdate - jobData1.LastUpdate).TotalSeconds) < 1);
       for (int i = 0; i < job1.StateLog.Count; i++) {
         Assert.AreEqual(job1.Id, job1loaded.StateLog[i].TaskId);
@@ -111 +111 @@
       job1.StateLog.Add(new DT.StateLog { State = DT.TaskState.Transferring, DateTime = DateTime.Now }); Thread.Sleep(10);
       job1.StateLog.Add(new DT.StateLog { State = DT.TaskState.Finished, DateTime = DateTime.Now }); Thread.Sleep(10);
-      dao.UpdateJob(job1);
-
-      job1loaded = dao.GetJob(job1.Id);
+      dao.UpdateTask(job1);
+
+      job1loaded = dao.GetTask(job1.Id);
       for (int i = 0; i < job1.StateLog.Count; i++) {
         Assert.AreEqual(job1.Id, job1loaded.StateLog[i].TaskId);
@@ -123 +123 @@
       }
 
-      DT.TaskData jobData1Loaded = dao.GetJobData(job1.Id);
+      DT.TaskData jobData1Loaded = dao.GetTaskData(job1.Id);
       Assert.AreEqual(jobData1.TaskId, jobData1Loaded.TaskId);
       Assert.IsTrue(Math.Abs((jobData1.LastUpdate - jobData1Loaded.LastUpdate).TotalSeconds) < 1);
       Assert.IsTrue(jobData1.Data.SequenceEqual(jobData1Loaded.Data));
 
-      dao.DeleteHiveExperiment(he.Id);
-
-      Assert.AreEqual(null, dao.GetJob(job1.Id));
-      Assert.AreEqual(null, dao.GetJobData(job1.Id));
-      Assert.AreEqual(null, dao.GetHiveExperiment(he.Id));
+      dao.DeleteJob(he.Id);
+
+      Assert.AreEqual(null, dao.GetTask(job1.Id));
+      Assert.AreEqual(null, dao.GetTaskData(job1.Id));
+      Assert.AreEqual(null, dao.GetJob(he.Id));
 
       dao.DeletePlugin(plugin1.Id);
@@ -220 +220 @@
       he.OwnerUserId = Guid.NewGuid();
       he.ResourceNames = "HEAL";
-      he.Id = dao.AddHiveExperiment(he);
+      he.Id = dao.AddJob(he);
 
       DT.Task job = new DT.Task();
@@ -226 +226 @@
       job.StateLog.Add(new DT.StateLog { State = DT.TaskState.Offline, DateTime = DateTime.Now });
       job.JobId = he.Id;
-      job.Id = dao.AddJob(job);
+      job.Id = dao.AddTask(job);
 
       DT.JobPermission perm = new DT.JobPermission();
@@ -233 +233 @@
       perm.GrantedUserId = Guid.NewGuid();
       perm.Permission = DT.Permission.Full;
-      dao.AddHiveExperimentPermission(perm);
-
-      DT.Job heLoaded = dao.GetHiveExperiment(he.Id);
+      dao.AddJobPermission(perm);
+
+      DT.Job heLoaded = dao.GetJob(he.Id);
       Assert.AreEqual(he.Id, heLoaded.Id);
       Assert.AreEqual(he.Name, heLoaded.Name);
       Assert.AreEqual(he.ResourceNames, heLoaded.ResourceNames);
-      //Assert.AreEqual(he.LastAccessed, heLoaded.LastAccessed);
-      //Assert.AreEqual(he.DateCreated, heLoaded.DateCreated);
-
-      DT.Task jobLoaded = dao.GetJob(job.Id);
+      //Assert.AreEqual(job.LastAccessed, heLoaded.LastAccessed);
+      //Assert.AreEqual(job.DateCreated, heLoaded.DateCreated);
+
+      DT.Task jobLoaded = dao.GetTask(job.Id);
       Assert.AreEqual(job.Id, jobLoaded.Id);
       Assert.AreEqual(job.State, jobLoaded.State);
       Assert.AreEqual(job.JobId, jobLoaded.JobId);
 
-      DT.JobPermission permLoaded = dao.GetHiveExperimentPermission(he.Id, perm.GrantedUserId);
+      DT.JobPermission permLoaded = dao.GetJobPermission(he.Id, perm.GrantedUserId);
       Assert.AreEqual(perm.JobId, permLoaded.JobId);
       Assert.AreEqual(perm.GrantedUserId, permLoaded.GrantedUserId);
@@ -253 +253 @@
       Assert.AreEqual(perm.Permission, permLoaded.Permission);
 
-      dao.DeleteHiveExperiment(he.Id);
-      Assert.AreEqual(null, dao.GetHiveExperiment(he.Id));
-      Assert.AreEqual(null, dao.GetJob(job.Id));
-      Assert.AreEqual(null, dao.GetHiveExperimentPermission(perm.JobId, perm.GrantedUserId));
+      dao.DeleteJob(he.Id);
+      Assert.AreEqual(null, dao.GetJob(he.Id));
+      Assert.AreEqual(null, dao.GetTask(job.Id));
+      Assert.AreEqual(null, dao.GetJobPermission(perm.JobId, perm.GrantedUserId));
 
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/HeuristicLab.Services.Hive.Tests-3.3.csproj

@@ -85 +85 @@
       <SubType>Designer</SubType>
     </None>
-    <Shadow Include="Test References\HeuristicLab.Services.Hive-3.4.accessor" />
+    <Shadow Include="Test References\HeuristicLab.Services.Hive-3.3.accessor" />
   </ItemGroup>
   <ItemGroup />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockAuthorizationManager.cs

@@ -28 +28 @@
     }
 
-    public void AuthorizeForJob(Guid jobId, DataTransfer.Permission requiredPermission) {
+    public void AuthorizeForTask(Guid jobId, DataTransfer.Permission requiredPermission) {
       // ok.
     }
 
-    public void AuthorizeForExperiment(Guid experimentId, DataTransfer.Permission requiredPermission) {
+    public void AuthorizeForJob(Guid experimentId, DataTransfer.Permission requiredPermission) {
       // ok.
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs

@@ -98 +98 @@
 
       // add hive experiment
-      experiment.Id = service.AddHiveExperiment(experiment);
+      experiment.Id = service.AddJob(experiment);
 
       // add task
       job.JobId = experiment.Id;
-      job.Id = service.AddJob(job, jobData, new List<Guid> { slave.Id });
+      job.Id = service.AddTask(job, jobData, new List<Guid> { slave.Id });
 
       // test task
-      DT.Task jobLoaded = service.GetJob(job.Id);
+      DT.Task jobLoaded = service.GetTask(job.Id);
       Assert.AreEqual(job.Id, jobLoaded.Id);
       Assert.AreEqual(job.CoresNeeded, jobLoaded.CoresNeeded);
@@ -114 +114 @@
       Assert.AreEqual(job.JobId, jobLoaded.JobId);
 
-      DT.TaskData jobDataLoaded = service.GetJobData(job.Id);
+      DT.TaskData jobDataLoaded = service.GetTaskData(job.Id);
       Assert.AreEqual(job.Id, jobDataLoaded.TaskId);
       Assert.IsTrue(jobData.Data.SequenceEqual(jobDataLoaded.Data));
 
       // test hive experiment
-      DT.Job experimentLoaded = service.GetHiveExperiment(experiment.Id);
+      DT.Job experimentLoaded = service.GetJob(experiment.Id);
       Assert.AreEqual(experiment.Id, experimentLoaded.Id);
       Assert.AreEqual(experiment.Name, experimentLoaded.Name);
@@ -130 +130 @@
       Assert.AreEqual(job.Id, actions[0].TaskId);
 
-      jobLoaded = service.GetJob(job.Id);
+      jobLoaded = service.GetTask(job.Id);
       Assert.AreEqual(TaskState.Transferring, jobLoaded.State);
 
       // slave is responsible for updating state to 'Calculating'
-      service.UpdateJobState(jobLoaded.Id, DT.TaskState.Calculating, slave.Id, null, null);
+      service.UpdateTaskState(jobLoaded.Id, DT.TaskState.Calculating, slave.Id, null, null);
 
       // send progress
@@ -143 +143 @@
 
       // the task should be in state 'Calculating' now
-      jobLoaded = service.GetJob(job.Id);
+      jobLoaded = service.GetTask(job.Id);
       Assert.AreEqual(TaskState.Calculating, jobLoaded.State);
       Assert.AreEqual(new TimeSpan(1, 5, 10, 20, 30), jobLoaded.ExecutionTime);
 
       // test if the task is returned for the resource
-      var jobsBySlave = service.GetJobsByResourceId(slave.Id);
+      var jobsBySlave = service.GetTasksByResourceId(slave.Id);
       Assert.AreEqual(1, jobsBySlave.Count());
       Assert.AreEqual(job.Id, jobsBySlave.Single().Id);
 
       // set it to finished
-      service.UpdateJobState(jobLoaded.Id, DT.TaskState.Finished, slave.Id, null, null);
+      service.UpdateTaskState(jobLoaded.Id, DT.TaskState.Finished, slave.Id, null, null);
 
       // test if the task is returned for the resource (it should not be)
-      var jobsBySlave2 = service.GetJobsByResourceId(slave.Id);
+      var jobsBySlave2 = service.GetTasksByResourceId(slave.Id);
       Assert.AreEqual(0, jobsBySlave2.Count());
 
       // set task waiting again
-      service.UpdateJobState(job.Id, DT.TaskState.Waiting, null, null, string.Empty);
+      service.UpdateTaskState(job.Id, DT.TaskState.Waiting, null, null, string.Empty);
 
       // get task again
@@ -181 +181 @@
 
       // delete
-      service.DeleteHiveExperiment(experiment.Id);
-      Assert.AreEqual(null, service.GetHiveExperiment(experiment.Id));
-      Assert.AreEqual(null, service.GetJob(job.Id));
-      Assert.AreEqual(null, service.GetJobData(job.Id));
+      service.DeleteJob(experiment.Id);
+      Assert.AreEqual(null, service.GetJob(experiment.Id));
+      Assert.AreEqual(null, service.GetTask(job.Id));
+      Assert.AreEqual(null, service.GetTaskData(job.Id));
 
       // send another heartbeat with the deleted task; the server should command the abortion of the task
@@ -241 +241 @@
 
       // add hive experiment
-      experiment.Id = service.AddHiveExperiment(experiment);
+      experiment.Id = service.AddJob(experiment);
 
       // add parent task
       parentJob.JobId = experiment.Id;
-      parentJob.Id = service.AddJob(parentJob, parentJobData, new List<Guid> { slave.Id });
+      parentJob.Id = service.AddTask(parentJob, parentJobData, new List<Guid> { slave.Id });
 
       // add child task
       childJob.JobId = experiment.Id;
-      childJob.Id = service.AddChildJob(parentJob.Id, childJob, childJobData);
+      childJob.Id = service.AddChildTask(parentJob.Id, childJob, childJobData);
       childJob.ParentTaskId = parentJob.Id;
 
       // test child task
-      var childJobLoaded = service.GetJob(childJob.Id);
+      var childJobLoaded = service.GetTask(childJob.Id);
       Assert.AreEqual(childJob.ParentTaskId, childJobLoaded.ParentTaskId);
       Assert.AreEqual(childJob.JobId, childJobLoaded.JobId);
@@ -261 +261 @@
 
       // test parent task
-      var parentJobLoaded = service.GetJob(parentJob.Id);
+      var parentJobLoaded = service.GetTask(parentJob.Id);
       Assert.AreEqual(parentJob.JobId, parentJobLoaded.JobId);
       Assert.AreEqual(TaskState.Waiting, parentJobLoaded.State);
@@ -276 +276 @@
       service.TriggerEventManager(true);
 
-      parentJobLoaded = service.GetJob(parentJob.Id);
+      parentJobLoaded = service.GetTask(parentJob.Id);
       Assert.AreEqual(TaskState.Waiting, parentJobLoaded.State);
 
       // set child task to finished
-      childJobLoaded = service.UpdateJobState(childJobLoaded.Id, DT.TaskState.Finished, slave.Id, null, null);
+      childJobLoaded = service.UpdateTaskState(childJobLoaded.Id, DT.TaskState.Finished, slave.Id, null, null);
 
       // lifecycle - let it process one server-heartbeat; this should set the parent task to finished
@@ -286 +286 @@
 
       // test if parent task is finished
-      parentJobLoaded = service.GetJob(parentJob.Id);
+      parentJobLoaded = service.GetTask(parentJob.Id);
       Assert.AreEqual(TaskState.Finished, parentJobLoaded.State);
 
       // delete experiment
-      service.DeleteHiveExperiment(experiment.Id);
-      Assert.AreEqual(null, service.GetJob(parentJob.Id));
-      Assert.AreEqual(null, service.GetJob(childJob.Id));
+      service.DeleteJob(experiment.Id);
+      Assert.AreEqual(null, service.GetTask(parentJob.Id));
+      Assert.AreEqual(null, service.GetTask(childJob.Id));
 
       service.DeleteSlave(slave.Id);
@@ -305 +305 @@
       // create hive experiment
       DT.Job e1 = new DT.Job() { Name = "TestExperiment", Description = "" };
-      e1.Id = service.AddHiveExperiment(e1);
-
-      var e1loaded = service.GetHiveExperiment(e1.Id);
+      e1.Id = service.AddJob(e1);
+
+      var e1loaded = service.GetJob(e1.Id);
       Assert.AreEqual(Permission.Full, e1loaded.Permission);
-      var allExp = service.GetHiveExperiments();
+      var allExp = service.GetJobs();
       Assert.AreEqual(1, allExp.Count(x => x.Id == e1.Id));
 
@@ -315 +315 @@
       mockServiceLocator.SetCurrentUserId(MockUserManager.MockUserId2);
       try {
-        e1loaded = service.GetHiveExperiment(e1.Id);
+        e1loaded = service.GetJob(e1.Id);
         Assert.Fail("Access should not be possible");
       }
       catch { /* ok, cool */ }
-      allExp = service.GetHiveExperiments();
+      allExp = service.GetJobs();
       Assert.AreEqual(0, allExp.Count(x => x.Id == e1.Id));
 
@@ -335 +335 @@
       // back to user2
       mockServiceLocator.SetCurrentUserId(MockUserManager.MockUserId2);
-      e1loaded = service.GetHiveExperiment(e1.Id);
+      e1loaded = service.GetJob(e1.Id);
       Assert.AreEqual(Permission.Read, e1loaded.Permission);
-      allExp = service.GetHiveExperiments();
+      allExp = service.GetJobs();
       Assert.AreEqual(1, allExp.Count(x => x.Id == e1.Id));
 
@@ -353 +353 @@
       // back to user2
       mockServiceLocator.SetCurrentUserId(MockUserManager.MockUserId2);
-      e1loaded = service.GetHiveExperiment(e1.Id);
+      e1loaded = service.GetJob(e1.Id);
       Assert.AreEqual(Permission.Full, e1loaded.Permission);
-      allExp = service.GetHiveExperiments();
+      allExp = service.GetJobs();
       Assert.AreEqual(1, allExp.Count(x => x.Id == e1.Id));
 
@@ -368 +368 @@
       mockServiceLocator.SetCurrentUserId(MockUserManager.MockUserId2);
       try {
-        e1loaded = service.GetHiveExperiment(e1.Id);
+        e1loaded = service.GetJob(e1.Id);
         Assert.Fail("Access should not be possible");
       }
       catch { /* ok, cool */ }
-      allExp = service.GetHiveExperiments();
+      allExp = service.GetJobs();
       Assert.AreEqual(0, allExp.Count(x => x.Id == e1.Id));
 
       // back to user1
       mockServiceLocator.SetCurrentUserId(MockUserManager.MockUserId1);
-      service.DeleteHiveExperiment(e1.Id);
+      service.DeleteJob(e1.Id);
     }
   }