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

Timestamp:

09/08/11 16:38:28 (13 years ago)

Author:

ascheibe

Message:

#1233 more renaming for more consistency

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs (modified) (11 diffs)

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

@@ -51 +51 @@
       DT.Job experiment = new DT.Job() { Name = "TestExperiment", Description = "" };
 
-      // create job
+      // create task
       DT.Task job = new DT.Task() { CoresNeeded = 1, MemoryNeeded = 0, Priority = 0 };
       job.State = DT.TaskState.Offline;
@@ -100 +100 @@
       experiment.Id = service.AddHiveExperiment(experiment);
 
-      // add job
+      // add task
       job.JobId = experiment.Id;
       job.Id = service.AddJob(job, jobData, new List<Guid> { slave.Id });
 
-      // test job
+      // test task
       DT.Task jobLoaded = service.GetJob(job.Id);
       Assert.AreEqual(job.Id, jobLoaded.Id);
@@ -127 +127 @@
       var actions = service.Heartbeat(new DT.Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 4, FreeMemory = 1024, JobProgress = new Dictionary<Guid, TimeSpan>() });
       Assert.AreEqual(1, actions.Count);
-      Assert.AreEqual(MessageContainer.MessageType.CalculateJob, actions[0].Message);
+      Assert.AreEqual(MessageContainer.MessageType.CalculateTask, actions[0].Message);
       Assert.AreEqual(job.Id, actions[0].TaskId);
 
@@ -142 +142 @@
       Assert.AreEqual(0, actions.Count);
 
-      // the job should be in state 'Calculating' now
+      // the task should be in state 'Calculating' now
       jobLoaded = service.GetJob(job.Id);
       Assert.AreEqual(TaskState.Calculating, jobLoaded.State);
       Assert.AreEqual(new TimeSpan(1, 5, 10, 20, 30), jobLoaded.ExecutionTime);
 
-      // test if the job is returned for the resource
+      // test if the task is returned for the resource
       var jobsBySlave = service.GetJobsByResourceId(slave.Id);
       Assert.AreEqual(1, jobsBySlave.Count());
@@ -155 +155 @@
       service.UpdateJobState(jobLoaded.Id, DT.TaskState.Finished, slave.Id, null, null);
 
-      // test if the job is returned for the resource (it should not be)
+      // test if the task is returned for the resource (it should not be)
       var jobsBySlave2 = service.GetJobsByResourceId(slave.Id);
       Assert.AreEqual(0, jobsBySlave2.Count());
 
-      // set job waiting again
+      // set task waiting again
       service.UpdateJobState(job.Id, DT.TaskState.Waiting, null, null, string.Empty);
 
-      // get job again
+      // get task again
       actions = service.Heartbeat(new DT.Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 4, FreeMemory = 1024, JobProgress = new Dictionary<Guid, TimeSpan>() });
       Assert.AreEqual(1, actions.Count);
-      Assert.AreEqual(MessageContainer.MessageType.CalculateJob, actions[0].Message);
+      Assert.AreEqual(MessageContainer.MessageType.CalculateTask, actions[0].Message);
       Assert.AreEqual(job.Id, actions[0].TaskId);
 
@@ -186 +186 @@
       Assert.AreEqual(null, service.GetJobData(job.Id));
 
-      // send another heartbeat with the deleted job; the server should command the abortion of the job
+      // send another heartbeat with the deleted task; the server should command the abortion of the task
       actions = service.Heartbeat(new DT.Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 3, FreeMemory = 1024, JobProgress = progress });
       Assert.AreEqual(1, actions.Count);
-      Assert.AreEqual(MessageContainer.MessageType.AbortJob, actions[0].Message);
+      Assert.AreEqual(MessageContainer.MessageType.AbortTask, actions[0].Message);
       Assert.AreEqual(job.Id, actions[0].TaskId);
 
@@ -203 +203 @@
       DT.Job experiment = new DT.Job() { Name = "TestExperiment", Description = "" };
 
-      // create parent job
+      // create parent task
       DT.Task parentJob = new DT.Task() {
         CoresNeeded = 1,
         MemoryNeeded = 0,
         Priority = 0,
-        IsParentJob = true,
+        IsParentTask = true,
         FinishWhenChildJobsFinished = true
       };
@@ -216 +216 @@
       DT.TaskData parentJobData = new DT.TaskData() { Data = new byte[0] };
 
-      // create child job
+      // create child task
       DT.Task childJob = new DT.Task() {
         CoresNeeded = 1,
@@ -243 +243 @@
       experiment.Id = service.AddHiveExperiment(experiment);
 
-      // add parent job
+      // add parent task
       parentJob.JobId = experiment.Id;
       parentJob.Id = service.AddJob(parentJob, parentJobData, new List<Guid> { slave.Id });
 
-      // add child job
+      // add child task
       childJob.JobId = experiment.Id;
       childJob.Id = service.AddChildJob(parentJob.Id, childJob, childJobData);
       childJob.ParentTaskId = parentJob.Id;
 
-      // test child job
+      // test child task
       var childJobLoaded = service.GetJob(childJob.Id);
       Assert.AreEqual(childJob.ParentTaskId, childJobLoaded.ParentTaskId);
@@ -258 +258 @@
       Assert.AreEqual(DT.TaskState.Waiting, childJobLoaded.State);
       Assert.AreEqual(false, childJobLoaded.FinishWhenChildJobsFinished);
-      Assert.AreEqual(false, childJobLoaded.IsParentJob);
-
-      // test parent job
+      Assert.AreEqual(false, childJobLoaded.IsParentTask);
+
+      // test parent task
       var parentJobLoaded = service.GetJob(parentJob.Id);
       Assert.AreEqual(parentJob.JobId, parentJobLoaded.JobId);
       Assert.AreEqual(TaskState.Waiting, parentJobLoaded.State);
       Assert.AreEqual(true, parentJobLoaded.FinishWhenChildJobsFinished);
-      Assert.AreEqual(true, parentJobLoaded.IsParentJob);
+      Assert.AreEqual(true, parentJobLoaded.IsParentTask);
 
       // test heartbeat
       var actions = service.Heartbeat(new DT.Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 4, FreeMemory = 1024, JobProgress = new Dictionary<Guid, TimeSpan>() });
-      Assert.AreEqual(1, actions.Count); // only the child job should be assigned
-      Assert.AreEqual(MessageContainer.MessageType.CalculateJob, actions[0].Message);
+      Assert.AreEqual(1, actions.Count); // only the child task should be assigned
+      Assert.AreEqual(MessageContainer.MessageType.CalculateTask, actions[0].Message);
       Assert.AreEqual(childJob.Id, actions[0].TaskId);
 
-      // lifecycle - let it process one server-heartbeat; the parent job must NOT be set to finished
+      // lifecycle - let it process one server-heartbeat; the parent task must NOT be set to finished
       service.TriggerEventManager(true);
 
@@ -279 +279 @@
       Assert.AreEqual(TaskState.Waiting, parentJobLoaded.State);
 
-      // set child job to finished
+      // set child task to finished
       childJobLoaded = service.UpdateJobState(childJobLoaded.Id, DT.TaskState.Finished, slave.Id, null, null);
 
-      // lifecycle - let it process one server-heartbeat; this should set the parent job to finished
+      // lifecycle - let it process one server-heartbeat; this should set the parent task to finished
       service.TriggerEventManager(true);
 
-      // test if parent job is finished
+      // test if parent task is finished
       parentJobLoaded = service.GetJob(parentJob.Id);
       Assert.AreEqual(TaskState.Finished, parentJobLoaded.State);