- Timestamp:
- 12/21/10 19:28:29 (14 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 2 added
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj
r5156 r5158 58 58 <Compile Include="Program.cs" /> 59 59 <Compile Include="Properties\AssemblyInfo.cs" /> 60 <Compile Include="SlaveCommListener.cs" />61 60 </ItemGroup> 62 61 <ItemGroup> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/HeuristicLab.Clients.Hive.Slave.Tests-3.4.csproj
r5062 r5158 298 298 </Reference> 299 299 <Reference Include="System.Drawing" /> 300 <Reference Include="System.ServiceModel" /> 300 301 <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1"> 301 302 <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\WeifenLuo.WinFormsUI.Docking-2.3.1.dll</HintPath> … … 313 314 <Compile Include="Properties\AssemblyInfo.cs" /> 314 315 <Compile Include="Mocks\MockServiceLocator.cs" /> 316 <Compile Include="SlaveCommListener.cs" /> 315 317 <Compile Include="SlaveTest.cs" /> 316 318 </ItemGroup> … … 333 335 </ProjectReference> 334 336 </ItemGroup> 337 <ItemGroup> 338 <None Include="app.config" /> 339 </ItemGroup> 335 340 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 336 341 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs
r5156 r5158 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.ServiceModel; 25 26 using HeuristicLab.Clients.Common; 26 27 using HeuristicLab.Services.Hive.Common; … … 33 34 public class SlaveTest { 34 35 36 private static ServiceHost slaveComm; 37 private static SlaveCommListener listener; 38 35 39 // Use ClassInitialize to run code before running the first test in the class 36 40 [ClassInitialize] … … 38 42 PluginLoader.pluginAssemblies.Any(); 39 43 ServiceLocator.Instance = new MockServiceLocator(); 40 } 44 slaveComm = new ServiceHost(typeof(SlaveCommunicationService)); 45 slaveComm.Open(); 46 listener = new SlaveCommListener(); 47 listener.Open(); 48 } 49 50 [ClassCleanup] 51 public static void MyClassCleanup() { 52 listener.Close(); 53 slaveComm.Close(); 54 } 55 41 56 42 57 private List<List<MessageContainer>> CreateMsgsForSingleJob() { … … 48 63 49 64 //do nothing 65 msg = new List<MessageContainer>(); 66 allMsgs.Add(msg); 50 67 msg = new List<MessageContainer>(); 51 68 allMsgs.Add(msg); … … 68 85 List<Job> jobList = new List<Job>(); 69 86 jobList.Add(testJob); 70 MockJob job = new MockJob( 400, false);87 MockJob job = new MockJob(300, false); 71 88 72 89 using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) { … … 74 91 ((MockHiveService)service.Obj).Messages = CreateMsgsForSingleJob(); 75 92 ((MockHiveService)service.Obj).updateJobs(jobList, job); 76 77 93 78 94 HeuristicLab.Clients.Hive.Salve.Core core = new Salve.Core(); -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs
r5156 r5158 82 82 83 83 DeRegisterServiceEvents(); 84 85 ClientCom.LogMessage("Program shutdown");86 84 } 87 85
Note: See TracChangeset
for help on using the changeset viewer.