Photon CI Tests (#11)

null511 · web-flow · commit 0d266735f96c · 2018-06-24T11:15:51.000-04:00
* run unit tests from photon

* test where fix

* test where fix

* test where fix

* update nunit

* where fix

* update framework

* update framework

* nunit fix

* nunit fix

* fuck nunit

* update photon package; reimp nunit

* photon final; initial release
diff --git a/Jenkins.NET.Publishing/Build_Windows.cs b/Jenkins.NET.Publishing/Build_Windows.cs
@@ -14,8 +14,7 @@ public class Build_Windows : IBuildTask
         public async Task RunAsync(CancellationToken token)
         {
             await BuildSolution();
-
-            // TODO: Test
+            await UnitTest();
         }
 
         private async Task BuildSolution()
@@ -33,5 +32,14 @@ private async Task BuildSolution()
 
             await msBuild.BuildAsync();
         }
+
+        private async Task UnitTest()
+        {
+            var nunit_exe = Context.AgentVariables["global"]["nunit_exe"];
+
+            await Context.RunCommandLineAsync($"\"{nunit_exe}\"",
+                "\"Jenkins.NET.Tests\\bin\\Release\\Jenkins.NET.Tests.dll\"",
+                "--where=\"cat == 'unit'\"");
+        }
     }
 }
diff --git a/Jenkins.NET.Publishing/Jenkins.NET.Publishing.csproj b/Jenkins.NET.Publishing/Jenkins.NET.Publishing.csproj
@@ -69,26 +69,15 @@
     <Reference Include="NuGet.Versioning, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\NuGet.Versioning.4.2.0\lib\net45\NuGet.Versioning.dll</HintPath>
     </Reference>
-    <Reference Include="Photon.Framework, Version=0.0.41.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Photon.Framework.0.0.41\lib\net46\Photon.Framework.dll</HintPath>
+    <Reference Include="Photon.Framework, Version=0.0.46.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Photon.Framework.0.0.46\lib\net46\Photon.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="Photon.NuGet, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Photon.NuGet.0.0.6\lib\net46\Photon.NuGet.dll</HintPath>
+    <Reference Include="Photon.NuGet, Version=0.0.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Photon.NuGet.0.0.9\lib\net46\Photon.NuGet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IdentityModel" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Jenkins.NET.Publishing/packages.config b/Jenkins.NET.Publishing/packages.config
@@ -13,6 +13,6 @@
   <package id="NuGet.Protocol.Core.v2" version="3.5.0" targetFramework="net46" />
   <package id="NuGet.Protocol.Core.v3" version="4.2.0" targetFramework="net46" />
   <package id="NuGet.Versioning" version="4.2.0" targetFramework="net46" />
-  <package id="Photon.Framework" version="0.0.41" targetFramework="net46" />
-  <package id="Photon.NuGet" version="0.0.6" targetFramework="net46" />
+  <package id="Photon.Framework" version="0.0.46" targetFramework="net46" />
+  <package id="Photon.NuGet" version="0.0.9" targetFramework="net46" />
 </packages>
diff --git a/Jenkins.NET.Tests/IntegrationTests/ClientTests.cs b/Jenkins.NET.Tests/IntegrationTests/ClientTests.cs
@@ -6,7 +6,7 @@
 
 namespace JenkinsNET.Tests.IntegrationTests
 {
-    [TestFixture, Category("integration")]
+    [IntegrationTestFixture]
     public class ClientTests
     {
         private const string jobName = "Test Job";
diff --git a/Jenkins.NET.Tests/IntegrationTests/CrumbTests.cs b/Jenkins.NET.Tests/IntegrationTests/CrumbTests.cs
@@ -6,7 +6,7 @@
 
 namespace JenkinsNET.Tests.IntegrationTests
 {
-    [TestFixture, Explicit, Category("integration")]
+    [IntegrationTestFixture, Explicit]
     public class CrumbTests
     {
         [Test]
diff --git a/Jenkins.NET.Tests/Internal/IntegrationTestFixtureAttribute.cs b/Jenkins.NET.Tests/Internal/IntegrationTestFixtureAttribute.cs
@@ -0,0 +1,9 @@
+﻿using NUnit.Framework;
+
+namespace JenkinsNET.Tests.Internal
+{
+    internal class IntegrationTestFixtureAttribute : CategoryAttribute
+    {
+        public IntegrationTestFixtureAttribute() : base("integration") {}
+    }
+}
diff --git a/Jenkins.NET.Tests/Internal/UnitTestFixtureAttribute.cs b/Jenkins.NET.Tests/Internal/UnitTestFixtureAttribute.cs
@@ -0,0 +1,9 @@
+﻿using NUnit.Framework;
+
+namespace JenkinsNET.Tests.Internal
+{
+    internal class UnitTestFixtureAttribute : CategoryAttribute
+    {
+        public UnitTestFixtureAttribute() : base("unit") {}
+    }
+}
diff --git a/Jenkins.NET.Tests/Jenkins.NET.Tests.csproj b/Jenkins.NET.Tests/Jenkins.NET.Tests.csproj
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,9 +36,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -50,6 +52,8 @@
     <Compile Include="IntegrationTests\CrumbTests.cs" />
     <Compile Include="Internal\DefaultClient.cs" />
     <Compile Include="Internal\DefaultRunner.cs" />
+    <Compile Include="Internal\IntegrationTestFixtureAttribute.cs" />
+    <Compile Include="Internal\UnitTestFixtureAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UnitTests\NetPathTests.cs" />
     <Compile Include="UnitTests\StringCastTests.cs" />
@@ -61,12 +65,18 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Jenkins.NET.Tests/UnitTests/NetPathTests.cs b/Jenkins.NET.Tests/UnitTests/NetPathTests.cs
@@ -1,9 +1,10 @@
 ﻿using JenkinsNET.Internal;
+using JenkinsNET.Tests.Internal;
 using NUnit.Framework;
 
 namespace JenkinsNET.Tests.UnitTests
 {
-    [TestFixture, Category("unit")]
+    [UnitTestFixture]
     public class NetPathTests
     {
         [Test]
diff --git a/Jenkins.NET.Tests/UnitTests/StringCastTests.cs b/Jenkins.NET.Tests/UnitTests/StringCastTests.cs
@@ -1,9 +1,10 @@
 ﻿using JenkinsNET.Internal;
+using JenkinsNET.Tests.Internal;
 using NUnit.Framework;
 
 namespace JenkinsNET.Tests.UnitTests
 {
-    [TestFixture, Category("unit")]
+    [UnitTestFixture]
     public class StringCastTests
     {
         [Test]
diff --git a/Jenkins.NET.Tests/packages.config b/Jenkins.NET.Tests/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.7.1" targetFramework="net45" />
+  <package id="NUnit" version="3.10.1" targetFramework="net45" />
 </packages>
diff --git a/Jenkins.NET/Properties/AssemblyInfo.cs b/Jenkins.NET/Properties/AssemblyInfo.cs
@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("0.4.2")]
-[assembly: AssemblyFileVersion("0.4.2")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
 [assembly: AssemblyTitle("Jenkins.NET")]
 [assembly: AssemblyDescription("C# .NET wrapper for Jenkins HTTP/REST API.")]
 [assembly: AssemblyConfiguration("")]

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ public class Build_Windows : IBuildTask`
`14`	`14`	`public async Task RunAsync(CancellationToken token)`
`15`	`15`	`{`
`16`	`16`	`await BuildSolution();`
`17`		`-`
`18`		`- // TODO: Test`
	`17`	`+ await UnitTest();`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`private async Task BuildSolution()`
`@@ -33,5 +32,14 @@ private async Task BuildSolution()`
`33`	`32`
`34`	`33`	`await msBuild.BuildAsync();`
`35`	`34`	`}`
	`35`	`+`
	`36`	`+ private async Task UnitTest()`
	`37`	`+ {`
	`38`	`+ var nunit_exe = Context.AgentVariables["global"]["nunit_exe"];`
	`39`	`+`
	`40`	`+ await Context.RunCommandLineAsync($"\"{nunit_exe}\"",`
	`41`	`+ "\"Jenkins.NET.Tests\\bin\\Release\\Jenkins.NET.Tests.dll\"",`
	`42`	`+ "--where=\"cat == 'unit'\"");`
	`43`	`+ }`
`36`	`44`	`}`
`37`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace JenkinsNET.Tests.IntegrationTests`
`8`	`8`	`{`
`9`		`- [TestFixture, Category("integration")]`
	`9`	`+ [IntegrationTestFixture]`
`10`	`10`	`public class ClientTests`
`11`	`11`	`{`
`12`	`12`	`private const string jobName = "Test Job";`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace JenkinsNET.Tests.IntegrationTests`
`8`	`8`	`{`
`9`		`- [TestFixture, Explicit, Category("integration")]`
	`9`	`+ [IntegrationTestFixture, Explicit]`
`10`	`10`	`public class CrumbTests`
`11`	`11`	`{`
`12`	`12`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`using JenkinsNET.Internal;`
	`2`	`+using JenkinsNET.Tests.Internal;`
`2`	`3`	`using NUnit.Framework;`
`3`	`4`
`4`	`5`	`namespace JenkinsNET.Tests.UnitTests`
`5`	`6`	`{`
`6`		`- [TestFixture, Category("unit")]`
	`7`	`+ [UnitTestFixture]`
`7`	`8`	`public class NetPathTests`
`8`	`9`	`{`
`9`	`10`	`[Test]`