nunit#1 Handling of TeamCity messages is different between the engine…

… and nunitlite - add tests for nunitlite
NikolayPianikov · Aug 2, 2016 · e9ea151 · e9ea151
1 parent 773b4a3
commit e9ea151
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git a/build.cake b/build.cake
@@ -176,7 +176,7 @@ Task("InitializeForIntegrationTests")
 		CleanDirectories(TEST_NUNIT_DIR + "**/*.*");
 		CleanDirectories(TEST_PACKAGES_DIR + "**/*.*");		
 
-		NuGetInstall(new [] {"NUnit.Runners", "NUnit"}, new NuGetInstallSettings()
+		NuGetInstall(new [] {"NUnit.Runners", "NUnit", "NUnitLite"}, new NuGetInstallSettings()
         {
 			OutputDirectory = TEST_NUNIT_DIR,
             Source = PRERELEASE_PACKAGE_SOURCE,

diff --git a/src/nunit.integration.tests/Dsl/Compiler.cs b/src/nunit.integration.tests/Dsl/Compiler.cs
@@ -41,10 +41,18 @@ public void Compile(TestAssembly testAssembly, string assemblyFileName, TargetDo
                     break;
             }
 
+            var outputKind = OutputKind.DynamicallyLinkedLibrary;
+            switch (Path.GetExtension(assemblyFileName)?.ToLowerInvariant())
+            {
+                case ".exe":
+                    outputKind = OutputKind.ConsoleApplication;
+                    break;
+            }
+
             var assemblyInfoSyntaxTree = CSharpSyntaxTree.ParseText(ResourceManager.GetContentFromResource(AssemblyInfoResourceName) + Environment.NewLine + string.Join(Environment.NewLine, testAssembly.Attributes));            
             var compilation =
                 CSharpCompilation.Create(Path.GetFileName(assemblyFileName))
-                    .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
+                    .WithOptions(new CSharpCompilationOptions(outputKind)
                     .WithPlatform(testAssembly.Platform)
                     .WithOptimizationLevel(OptimizationLevel.Debug))
                     .AddReferences(GetDotNetFrameworkReferences(dotNetFrameworkVersion, architecture))

diff --git a/src/nunit.integration.tests/Dsl/EnvironmentManager.cs b/src/nunit.integration.tests/Dsl/EnvironmentManager.cs
@@ -37,6 +37,7 @@ public void CopyReference(string directoryName, string referenceFileName)
         public IEnumerable<string> EnumerateNUnitAssemblies(string nunitBasePath, TargetDotNetFrameworkVersion frameworkVersion)
         {
             yield return GetNUnitFrameworkPath(nunitBasePath, frameworkVersion, "nunit.framework.dll");
+            yield return GetNUnitFrameworkPath(nunitBasePath, frameworkVersion, "nunitlite.dll");
             var file = GetNUnitFrameworkPath(nunitBasePath, frameworkVersion, "NUnit.System.Linq.dll");
             if (file != null)
             {

diff --git a/src/nunit.integration.tests/NUnitSteps.cs b/src/nunit.integration.tests/NUnitSteps.cs
@@ -224,6 +224,16 @@ public void RunNUnitConsole()
             ctx.TestSession = testSession;            
         }
 
+        [When(@"I run (.+)")]
+        public void Run(string executable)
+        {
+            var ctx = ScenarioContext.Current.GetTestContext();
+            var runner = new NUnitRunner();
+            ICommandLineSetupFactory setupFactory = new GenericCommandLineSetupFactory(executable);
+            var testSession = runner.Run(ctx, setupFactory.Create(ctx));
+            ctx.TestSession = testSession;
+        }
+
         [Then(@"processes (.+) are finished")]
         public void CheckProcessesWereFinished(string processName)
         {

diff --git a/src/nunit.integration.tests/Templates/UnitTest.cs b/src/nunit.integration.tests/Templates/UnitTest.cs
@@ -11,6 +11,11 @@
     [TestFixture]
     internal class UnitTest
     {
+        public static int NUnitLiteEntryPoint(string[] args)
+        {
+            return new NUnitLite.AutoRun(typeof(Program).Assembly).Execute(args, new NUnit.Common.ExtendedTextWrapper(Console.Out), Console.In);            
+        }
+
         [SetUp]
         public void FailedSeTup()
         {

diff --git a/src/nunit.integration.tests/nunit.integration.tests.csproj b/src/nunit.integration.tests/nunit.integration.tests.csproj
@@ -183,6 +183,7 @@
   </Choose>
   <ItemGroup>
     <Compile Include="CommonSteps.cs" />
+    <Compile Include="Dsl\GenericCommandLineSetupFactory.cs" />
     <Compile Include="Dsl\ArgumentsCommandLineSetupFactory.cs" />
     <Compile Include="Dsl\CommandLineArtifact.cs" />
     <Compile Include="Dsl\CommandLineSetup.cs" />
@@ -254,6 +255,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>SupportPlatforms.feature</DependentUpon>
     </Compile>
+    <Compile Include="TeamCityForNUnitlite.feature.cs">
+      <DependentUpon>TeamCityForNUnitlite.feature</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="TeamCity.feature.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -294,6 +300,10 @@
       <Generator>SpecFlowSingleFileGenerator</Generator>
       <LastGenOutput>SupportPlatforms.feature.cs</LastGenOutput>
     </None>
+    <None Include="TeamCityForNUnitlite.feature">
+      <Generator>SpecFlowSingleFileGenerator</Generator>
+      <LastGenOutput>TeamCityForNUnitlite.feature.cs</LastGenOutput>
+    </None>
     <None Include="TeamCity.feature">
       <Generator>SpecFlowSingleFileGenerator</Generator>
       <LastGenOutput>TeamCity.feature.cs</LastGenOutput>