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

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

File:

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

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));
 
     }