Merge branch 'develop'

Author: ethanhann

IntegrationEngine.Tests/EngineHostCompositionRootTest.cs

@@ -4,16 +4,15 @@
 using IntegrationEngine.Api;
 using IntegrationEngine.Core.Configuration;
 using IntegrationEngine.Core.R;
-using IntegrationServer.IntegrationJobs.CarReport;
-using IntegrationServer.IntegrationJobs.SampleSqlReport;
 using IntegrationEngine.JobProcessor;
 using Microsoft.Practices.Unity;
 using Moq;
 using Nest;
 using NUnit.Framework;
-using IntegrationServer;
-using System.Reflection;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using IntegrationEngine.Core.IntegrationJob;
 
 namespace IntegrationEngine.Tests
 {
@@ -113,17 +112,14 @@ public void ShouldRegisterIntegrationPoints()
         [Test]
         public void ShouldRegisterIntegrationJobs()
         {
-            var assembliesWithJobs = new List<Assembly> { typeof(Program).Assembly };
+            var assembliesWithJobs = new List<Assembly> { typeof(EngineHostCompositionRootTest).Assembly };
             Subject.IntegrationJobTypes = Subject.ExtractIntegrationJobTypesFromAssemblies(assembliesWithJobs);
             Subject.LoadConfiguration();
             Subject.RegisterIntegrationPoints();
 
             Subject.RegisterIntegrationJobs();
 
-            var container = Subject.Container;
-            container.Resolve<CarMailMessageJob>();
-            container.Resolve<CarReportJob>();
-            container.Resolve<SampleSqlReportJob>();
+            Assert.That(Subject.Container.IsRegistered<IntegrationJobStub>(), Is.True);
         }
     }
 }

IntegrationEngine.Tests/IntegrationEngine.Tests.csproj

@@ -168,10 +168,6 @@
       <Project>{7D49353D-A68C-4ACA-A6A5-40B1C314C30E}</Project>
       <Name>IntegrationEngine</Name>
     </ProjectReference>
-    <ProjectReference Include="..\IntegrationServer\IntegrationServer.csproj">
-      <Project>{C273AE91-E13F-4443-8D01-9C97016AB4AC}</Project>
-      <Name>IntegrationServer</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

IntegrationEngine.userprefs

@@ -1,9 +1,11 @@
 <Properties StartupItem="IntegrationServer/IntegrationServer.csproj">
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="IntegrationEngine.Tests/Api/WebApiApplicationTest.cs">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="IntegrationEngine.Tests/JobProcessor/MessageQueueListenerManagerTest.cs">
     <Files>
-      <File FileName="IntegrationEngine/Api/WebApiApplication.cs" Line="6" Column="6" />
-      <File FileName="IntegrationEngine.Tests/Api/WebApiApplicationTest.cs" Line="81" Column="81" />
+      <File FileName="IntegrationEngine.Tests/JobProcessor/MessageQueueListenerManagerTest.cs" Line="38" Column="38" />
+      <File FileName="IntegrationEngine.Tests/Scheduler/EngineSchedulerTest.cs" Line="48" Column="48" />
+      <File FileName="IntegrationEngine.Tests/EngineHostCompositionRootTest.cs" Line="74" Column="74" />
+      <File FileName="IntegrationEngine/EngineHostCompositionRoot.cs" Line="42" Column="42" />
     </Files>
     <Pads>
       <Pad Id="MonoDevelop.NUnit.TestPad">
@@ -12,7 +14,9 @@
     </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
+    <BreakpointStore>
+      <Breakpoint file="/Users/ethanhann/Projects/IntegrationEngine/IntegrationEngine/Scheduler/EngineScheduler.cs" line="163" column="41" />
+    </BreakpointStore>
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
 </Properties>

IntegrationServer/IntegrationServer.csproj

@@ -11,6 +11,7 @@
     <NuGetPackageImportStamp>0900f602</NuGetPackageImportStamp>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <AssemblyName>IntegrationServer</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,7 +24,6 @@
     <PlatformTarget>x86</PlatformTarget>
     <Externalconsole>true</Externalconsole>
     <ConsolePause>false</ConsolePause>
-    <AssemblyName>IntegrationServer</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>full</DebugType>
@@ -33,7 +33,6 @@
     <WarningLevel>4</WarningLevel>
     <Externalconsole>true</Externalconsole>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <AssemblyName>IntegrationServer</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -48,7 +47,6 @@
     <Optimize>false</Optimize>
     <ConsolePause>false</ConsolePause>
     <Externalconsole>true</Externalconsole>
-    <AssemblyName>IntegrationEngine.ConsoleHost</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
@@ -57,12 +55,8 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
     <WarningLevel>4</WarningLevel>
-    <AssemblyName>IntegrationEngine.ConsoleHost</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyName>IntegrationServer</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />