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

Timestamp:

09/08/11 14:37:52 (13 years ago)

Author:

ascheibe

Message:

#1233 Review comments: renamed HiveEperiment to Job

File:

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

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

@@ -49 +49 @@
 
       // create hive experiment
-      DT.HiveExperiment experiment = new DT.HiveExperiment() { Name = "TestExperiment", Description = "" };
+      DT.Job experiment = new DT.Job() { Name = "TestExperiment", Description = "" };
 
       // create job
@@ -101 +101 @@
 
       // add job
-      job.HiveExperimentId = experiment.Id;
+      job.JobId = experiment.Id;
       job.Id = service.AddJob(job, jobData, new List<Guid> { slave.Id });
 
@@ -112 +112 @@
       Assert.AreEqual(DT.TaskState.Waiting, jobLoaded.State);
       Assert.IsTrue(job.PluginsNeededIds.SequenceEqual(jobLoaded.PluginsNeededIds));
-      Assert.AreEqual(job.HiveExperimentId, jobLoaded.HiveExperimentId);
+      Assert.AreEqual(job.JobId, jobLoaded.JobId);
 
       DT.TaskData jobDataLoaded = service.GetJobData(job.Id);
@@ -119 +119 @@
 
       // test hive experiment
-      DT.HiveExperiment experimentLoaded = service.GetHiveExperiment(experiment.Id);
+      DT.Job experimentLoaded = service.GetHiveExperiment(experiment.Id);
       Assert.AreEqual(experiment.Id, experimentLoaded.Id);
       Assert.AreEqual(experiment.Name, experimentLoaded.Name);
@@ -201 +201 @@
 
       // create hive experiment
-      DT.HiveExperiment experiment = new DT.HiveExperiment() { Name = "TestExperiment", Description = "" };
+      DT.Job experiment = new DT.Job() { Name = "TestExperiment", Description = "" };
 
       // create parent job
@@ -244 +244 @@
 
       // add parent job
-      parentJob.HiveExperimentId = experiment.Id;
+      parentJob.JobId = experiment.Id;
       parentJob.Id = service.AddJob(parentJob, parentJobData, new List<Guid> { slave.Id });
 
       // add child job
-      childJob.HiveExperimentId = experiment.Id;
+      childJob.JobId = experiment.Id;
       childJob.Id = service.AddChildJob(parentJob.Id, childJob, childJobData);
       childJob.ParentTaskId = parentJob.Id;
@@ -255 +255 @@
       var childJobLoaded = service.GetJob(childJob.Id);
       Assert.AreEqual(childJob.ParentTaskId, childJobLoaded.ParentTaskId);
-      Assert.AreEqual(childJob.HiveExperimentId, childJobLoaded.HiveExperimentId);
+      Assert.AreEqual(childJob.JobId, childJobLoaded.JobId);
       Assert.AreEqual(DT.TaskState.Waiting, childJobLoaded.State);
       Assert.AreEqual(false, childJobLoaded.FinishWhenChildJobsFinished);
@@ -262 +262 @@
       // test parent job
       var parentJobLoaded = service.GetJob(parentJob.Id);
-      Assert.AreEqual(parentJob.HiveExperimentId, parentJobLoaded.HiveExperimentId);
+      Assert.AreEqual(parentJob.JobId, parentJobLoaded.JobId);
       Assert.AreEqual(TaskState.Waiting, parentJobLoaded.State);
       Assert.AreEqual(true, parentJobLoaded.FinishWhenChildJobsFinished);
@@ -304 +304 @@
 
       // create hive experiment
-      DT.HiveExperiment e1 = new DT.HiveExperiment() { Name = "TestExperiment", Description = "" };
+      DT.Job e1 = new DT.Job() { Name = "TestExperiment", Description = "" };
       e1.Id = service.AddHiveExperiment(e1);