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

Timestamp:

06/16/11 14:20:48 (13 years ago)

Author:

cneumuel

Message:

#1233

• changed Log to ThreadSafeLog
• added license information to all files
• added assembly descriptions
• using blocks before namespace
• made TransactionManager static
• removed DaoException
• removed TimeSpanExtensions
• renamed prepareHiveDatabase.sql should be renamed to Prepare Hive Database.sql
• created Initialize Hive Database.sql

Location:

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

Files:

• DaoTests.cs (modified) (6 diffs)
• Mocks/MockServiceLocator.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (2 diffs)
• ServiceTests.cs (modified) (2 diffs)

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using HeuristicLab.Services.Hive.DataAccess;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
 
 namespace HeuristicLab.Services.Hive.Tests {
-  using System.Collections.Generic;
-  using System.Threading;
-  using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-
   [TestClass]
   public class DaoTests {
@@ -49 +69 @@
       plugin1.Version = new Version("1.0.0.0");
       plugin1.UserId = Guid.Empty;
-      plugin1.IsLocal = true;
       plugin1.DateCreated = DateTime.Now;
 
@@ -155 +174 @@
       DT.Plugin plugin1 = new DT.Plugin();
       plugin1.DateCreated = DateTime.Now;
-      plugin1.IsLocal = false;
       plugin1.Name = "Tests.MyPlugin";
       plugin1.Version = new Version("1.0.0.0");
@@ -168 +186 @@
       Assert.AreEqual(plugin1.UserId, plugin1loaded.UserId);
       Assert.AreEqual(plugin1.DateCreated.ToString(), plugin1loaded.DateCreated.ToString());
-      Assert.AreEqual(plugin1.IsLocal, plugin1loaded.IsLocal);
 
       DT.PluginData pluginData1 = new DT.PluginData();
@@ -264 +281 @@
       Assert.IsTrue(Math.Abs((stats.TimeStamp - statsLoaded.TimeStamp).TotalSeconds) < 1);
 
-      for (int i = 0; i  < slaveStats.Count; i ++) {
+      for (int i = 0; i < slaveStats.Count; i++) {
         Assert.AreEqual(slaveStats[i].Cores, statsLoaded.SlaveStatistics.Single(x => x.SlaveId == slaveStats[i].SlaveId).Cores);
         Assert.AreEqual(slaveStats[i].FreeCores, statsLoaded.SlaveStatistics.Single(x => x.SlaveId == slaveStats[i].SlaveId).FreeCores);
@@ -274 +291 @@
       for (int i = 0; i < userStats.Count; i++) {
         Assert.AreEqual(userStats[i].ExecutionTime, statsLoaded.UserStatistics.Single(x => x.UserId == userStats[i].UserId).ExecutionTime);
-        Assert.AreEqual(userStats[i].UsedCores, statsLoaded.UserStatistics.Single(x => x.UserId == userStats[i].UserId).UsedCores);        
+        Assert.AreEqual(userStats[i].UsedCores, statsLoaded.UserStatistics.Single(x => x.UserId == userStats[i].UserId).UsedCores);
       }
 

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

@@ -49 +49 @@
     }
 
-    public TransactionManager TransactionManager {
-      get { return defaultServiceLocator.TransactionManager; }
-    }
-
     public HeartbeatManager HeartbeatManager {
       get {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Properties/AssemblyInfo.cs

@@ -1 +1 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -7 +6 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("HeuristicLab.Services.Hive.Tests")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Unit tests for HeuristicLab.Hive services")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Services.Hive.Common;
+using HeuristicLab.Services.Hive.Common.DataTransfer;
+using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
 
 namespace HeuristicLab.Services.Hive.Tests {
-
-  using HeuristicLab.Services.Hive.Common;
-  using HeuristicLab.Services.Hive.Common.DataTransfer;
-  using HeuristicLab.Services.Hive.Common.ServiceContracts;
-  using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-
   [TestClass]
   public class ServiceTests {
@@ -73 +71 @@
       plugin1.Version = new Version("1.0.0.0");
       plugin1.UserId = Guid.Empty;
-      plugin1.IsLocal = true;
       plugin1.DateCreated = DateTime.Now;