Merge branch 'develop'

Conflicts:
	.travis.yml

Author: ethanhann

.travis.yml

@@ -1,5 +1,10 @@
 language: csharp
 solution: IntegrationEngine.sln
 
+sudo: false
+cache: apt
+
 script:
-  - xbuild /p:Configuration=Debug IntegrationEngine.sln
+  - xbuild /p:Configuration=Release IntegrationEngine.sln
+  - mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./IntegrationEngine.Model.Tests/bin/Debug/IntegrationEngine.Model.Tests.dll
+  - mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./IntegrationEngine.Tests/bin/Debug/IntegrationEngine.Tests.dll

IntegrationEngine.Client/IInEngineClient.cs

@@ -20,7 +20,7 @@ public interface IInEngineClient
         SimpleTrigger UpdateSimpleTrigger(SimpleTrigger simpleTrigger);
         SimpleTrigger DeleteSimpleTrigger(string id);
         IList<InEngineTimeZone> GetTimeZones();
-        IList<string> GetJobTypes();
+        IList<JobType> GetJobTypes();
         HealthStatus GetHealthStatus();
     }
 }

IntegrationEngine.Client/InEngineClient.cs

@@ -123,11 +123,11 @@ public IList<InEngineTimeZone> GetTimeZones()
         #endregion
 
         #region JobType
-        public IList<string> GetJobTypes()
+        public IList<JobType> GetJobTypes()
         {
             var request = new RestRequest(EndpointName.JobType, Method.GET);
             var result = RestClient.Execute(request);
-            return JsonConvert.DeserializeObject<IList<string>>(result.Content);
+            return JsonConvert.DeserializeObject<IList<JobType>>(result.Content);
         }
         #endregion
 

IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj

@@ -86,7 +86,7 @@
       <Name>IntegrationEngine.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\IntegrationEngine.Model\IntegrationEngine.Model.csproj">
-      <Project>{0b499fe4-0bdb-4080-bcb7-f8d4ce54a4ff}</Project>
+      <Project>{0B499FE4-0BDB-4080-BCB7-F8D4CE54A4FF}</Project>
       <Name>IntegrationEngine.Model</Name>
     </ProjectReference>
     <ProjectReference Include="..\IntegrationEngine\IntegrationEngine.csproj">

IntegrationEngine.ConsoleHost/IntegrationJobs/SampleSqlReport/SampleSqlReportJob.cs

@@ -1,6 +1,7 @@
 using IntegrationEngine.Core.Jobs;
 using IntegrationEngine.Core.Mail;
 using RazorEngine;
+using RazorEngine.Templating;
 using System;
 using System.Net.Mail;
 
@@ -20,13 +21,9 @@ public override void Run()
 
             // Pass into Razor engine
             string template = "Created on <strong>@Model.Created</strong> with <strong>@Model.Data.Count</strong> records.";
-            Razor.Compile<SampleReport>(template, "template-01");
-            var html = Razor.Run("template-01", report);
-            //Console.WriteLine(result.ToString());
-             
-            // Write result to Elasticsearch
+            var html = Engine.Razor.RunCompile(template, "template-01", typeof(SampleReport), report);
+
             // Send Mail
-            // How to get recipients?
             var mailMessage = new MailMessage();
             mailMessage.To.Add("ethanhann@gmail.com");
             mailMessage.Subject = "Sample SQL Report";

IntegrationEngine.ConsoleHost/Program.cs

@@ -3,7 +3,7 @@
 
 namespace IntegrationEngine.ConsoleHost
 {
-    class MainClass
+    public class MainClass
     {
         public static void Main(string[] args)
         {

IntegrationEngine.Model/JobType.cs

@@ -10,5 +10,10 @@ public class JobType : IJobType
     {
         public string Name { get; set; }
         public string FullName { get; set; }
+
+        public override string ToString()
+        {
+            return string.Format("[JobType: Name={0}, FullName={1}]", Name, FullName);
+        }
     }
 }

IntegrationEngine.Tests/Api/Controllers/JobTypeControllerTest.cs

@@ -0,0 +1,36 @@
+using BeekmanLabs.UnitTesting;
+using IntegrationEngine.Api.Controllers;
+using IntegrationEngine.Model;
+using IntegrationEngine.Scheduler;
+using Moq;
+using NUnit.Framework;
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace IntegrationEngine.Tests
+{
+    public class JobTypeControllerTest : TestBase<JobTypeController>
+    {
+        [Test]
+        public void ShouldReturnListOfJobTypes()
+        {
+            var engineScheduler = new Mock<EngineScheduler>();
+            var type = typeof(IntegrationJobFixture);
+            var expected = new JobType() {
+                FullName = type.FullName,
+                Name = type.Name,
+            };
+            engineScheduler.SetupGet(x => x.IntegrationJobTypes).Returns(new List<Type>() { type });
+            Subject.EngineScheduler = engineScheduler.Object;
+
+            var result = Subject.GetJobTypes();
+
+            var first = result.First();
+            Assert.That(first.FullName, Is.EqualTo(expected.FullName));
+            Assert.That(first.Name, Is.EqualTo(expected.Name));
+        }
+    }
+}
+

IntegrationEngine.Tests/Api/Controllers/TimeZoneControllerTest.cs

@@ -0,0 +1,25 @@
+using BeekmanLabs.UnitTesting;
+using IntegrationEngine.Api.Controllers;
+using IntegrationEngine.Model;
+using IntegrationEngine.Scheduler;
+using Moq;
+using NUnit.Framework;
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace IntegrationEngine.Tests
+{
+    public class TimeZoneControllerTest : TestBase<TimeZoneController>
+    {
+        [Test]
+        public void ShouldReturnListOfTimeZones()
+        {
+            var result = Subject.GetTimeZones().ToList();
+
+            Assert.That(result.Count, Is.GreaterThan(0));
+        }
+    }
+}
+

IntegrationEngine.Tests/IntegrationEngine.Tests.csproj

@@ -40,7 +40,7 @@
       <HintPath>..\packages\BeekmanLabs.UnitTesting.0.0.0\lib\net45\BeekmanLabs.UnitTesting.dll</HintPath>
     </Reference>
     <Reference Include="fx.configuration">
-      <HintPath>..\packages\fx.configuration.0.4.0\lib\net45\fx.configuration.dll</HintPath>
+      <HintPath>..\packages\FX.Configuration.0.4.0\lib\net45\fx.configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.Unity.Configuration">
       <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
@@ -91,6 +91,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Scheduler\EngineSchedulerTest.cs" />
     <Compile Include="StubContainer.cs" />
+    <Compile Include="Api\Controllers\JobTypeControllerTest.cs" />
+    <Compile Include="Api\Controllers\TimeZoneControllerTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\configuration\IntegrationEngine.json">
@@ -135,4 +137,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>