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

Timestamp:

12/13/10 16:09:22 (13 years ago)

Author:

cneumuel

Message:

#1233

• fixed config merge process
• worked on hive server test setup

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive.Tests (modified) (1 prop)
• HeuristicLab.Services.Hive.Tests/HeuristicLab 3.3.exe.config (added)
• HeuristicLab.Services.Hive.Tests/HeuristicLab.Services.Hive.Tests-3.4.csproj (modified) (3 diffs)
• HeuristicLab.Services.Hive.Tests/Mocks/MockAuthorizationManager.cs (added)
• HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs (added)
• HeuristicLab.Services.Hive.Tests/Mocks/MockServiceLocator.cs (added)
• HeuristicLab.Services.Hive.Tests/ServerTest.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources

@@ -1 +1 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+HeuristicLab.Hive 3.4.suo

@@ -1 +1 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+HeuristicLab.Hive 3.4.suo

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

@@ -307 +307 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Mocks\MockAuthorizationManager.cs" />
+    <Compile Include="Mocks\MockLifecycleManager.cs" />
+    <Compile Include="Mocks\MockServiceLocator.cs" />
     <Compile Include="PluginLoader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -312 +315 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Clients.Hive.Slave.Tests\HeuristicLab.Clients.Hive.Slave.Tests-3.4.csproj">
+      <Project>{C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}</Project>
+      <Name>HeuristicLab.Clients.Hive.Slave.Tests-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Clients.Hive\3.4\HeuristicLab.Clients.Hive-3.4.csproj">
+      <Project>{B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB}</Project>
+      <Name>HeuristicLab.Clients.Hive-3.4</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Hive\3.4\HeuristicLab.Hive-3.4.csproj">
       <Project>{F98A1740-9AC9-4D36-A582-6A2D0D06978D}</Project>
@@ -330 +341 @@
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Mocks\" />
+    <None Include="HeuristicLab 3.3.exe.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -4 +4 @@
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using HeuristicLab.Services.Hive.Common.DataTransfer;
+using HeuristicLab.Services.Hive.Common.ServiceContracts;
+using HeuristicLab.Clients.Hive.Slave.Tests;
+using HeuristicLab.Clients.Hive;
 
 namespace HeuristicLab.Services.Hive.Tests {
@@ -12 +16 @@
     public static void MyClassInitialize(TestContext testContext) {
       PluginLoader.pluginAssemblies.Any();
+      ServiceLocator.Instance = new MockServiceLocator(ServiceLocator.Instance);
+    }
+    
+    private IHiveService GetService() {
+      return new HiveService();
     }
 
     [TestMethod]
     public void TestMethod1() {
+      var service = GetService();
+
+      Job job = new Job() {
+        CoresNeeded = 1,
+        MemoryNeeded = 0,
+        Priority = 0
+      };
+
+      JobData jobData = new JobData() {
+        Data = PersistenceUtil.Serialize(new MockJob(500))
+      };
+
+      Guid jobId = service.AddJob(job, jobData);
+
+      Job newJob = service.GetJob(jobId);
+      Assert.AreEqual(job, newJob);
     }
   }

@@ -1 +1 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+HeuristicLab.Hive 3.4.suo