Build.ps1 (based on Serilog's), including XUnit testing.

nblumhardt · nblumhardt · commit d80be5a53747 · 2016-01-11T22:34:19.000+10:00
diff --git a/Build.ps1 b/Build.ps1
@@ -0,0 +1,103 @@
+function Install-Dnvm
+{
+    & where.exe dnvm 2>&1 | Out-Null
+    if(($LASTEXITCODE -ne 0) -Or ((Test-Path Env:\APPVEYOR) -eq $true))
+    {
+        Write-Host "DNVM not found"
+        &{$Branch='dev';iex ((New-Object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))}
+
+        # Normally this happens automatically during install but AppVeyor has
+        # an issue where you may need to manually re-run setup from within this process.
+        if($env:DNX_HOME -eq $NULL)
+        {
+            Write-Host "Initial DNVM environment setup failed; running manual setup"
+            $tempDnvmPath = Join-Path $env:TEMP "dnvminstall"
+            $dnvmSetupCmdPath = Join-Path $tempDnvmPath "dnvm.ps1"
+            & $dnvmSetupCmdPath setup
+        }
+    }
+}
+
+function Get-DnxVersion
+{
+    $globalJson = Join-Path $PSScriptRoot "global.json"
+    $jsonData = Get-Content -Path $globalJson -Raw | ConvertFrom-JSON
+    return $jsonData.sdk.version
+}
+
+function Restore-Packages
+{
+    param([string] $DirectoryName)
+    & dnu restore ("""" + $DirectoryName + """")
+}
+
+function Build-Projects
+{
+    param([string] $DirectoryName)
+    & dnu build ("""" + $DirectoryName + """") --configuration Release --out .\artifacts\testbin; if($LASTEXITCODE -ne 0) { exit 1 }
+    & dnu pack ("""" + $DirectoryName + """") --configuration Release --out .\artifacts\packages; if($LASTEXITCODE -ne 0) { exit 1 }
+}
+
+function Build-TestProjects
+{
+    param([string] $DirectoryName)
+    & dnu build ("""" + $DirectoryName + """") --configuration Release --out .\artifacts\testbin; if($LASTEXITCODE -ne 0) { exit 1 }
+}
+
+function Test-Projects
+{
+    param([string] $DirectoryName)
+    & dnx -p ("""" + $DirectoryName + """") test; if($LASTEXITCODE -ne 0) { exit 2 }
+}
+
+function Remove-PathVariable
+{
+    param([string] $VariableToRemove)
+    $path = [Environment]::GetEnvironmentVariable("PATH", "User")
+    $newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
+    [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
+    $path = [Environment]::GetEnvironmentVariable("PATH", "Process")
+    $newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
+    [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
+}
+
+Push-Location $PSScriptRoot
+
+$dnxVersion = Get-DnxVersion
+
+# Clean
+if(Test-Path .\artifacts) { Remove-Item .\artifacts -Force -Recurse }
+
+# Remove the installed DNVM from the path and force use of
+# per-user DNVM (which we can upgrade as needed without admin permissions)
+Remove-PathVariable "*Program Files\Microsoft DNX\DNVM*"
+
+# Make sure per-user DNVM is installed
+Install-Dnvm
+
+# Install DNX
+dnvm install $dnxVersion -r CoreCLR -NoNative
+dnvm install $dnxVersion -r CLR -NoNative
+dnvm use $dnxVersion -r CLR
+
+# Package restore
+Get-ChildItem -Path . -Filter *.xproj -Recurse | ForEach-Object { Restore-Packages $_.DirectoryName }
+
+# Set build number
+$env:DNX_BUILD_VERSION = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
+Write-Host "Build number: " $env:DNX_BUILD_VERSION
+
+# Build/package
+Get-ChildItem -Path .\src -Filter *.xproj -Recurse | ForEach-Object { Build-Projects $_.DirectoryName }
+Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Build-TestProjects $_.DirectoryName }
+
+# Test
+Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Test-Projects $_.DirectoryName }
+
+# Switch to Core CLR
+dnvm use $dnxVersion -r CoreCLR
+
+# Test again
+Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Test-Projects $_.DirectoryName }
+
+Pop-Location
diff --git a/test/Serilog.Framework.Logging.Tests/SerilogLoggerTests.cs b/test/Serilog.Framework.Logging.Tests/SerilogLoggerTests.cs
@@ -4,14 +4,13 @@
 using System;
 using Serilog.Events;
 using Microsoft.Extensions.Logging;
-using NUnit.Framework;
 using System.Collections.Generic;
 using System.IO;
 using Serilog.Debugging;
+using Xunit;
 
 namespace Serilog.Framework.Logging.Test
 {
-    [TestFixture]
     public class SerilogLoggerTest
     {
         private const string Name = "test";
@@ -61,7 +60,7 @@ private LogEventLevel MapLevel(LogLevel logLevel)
             }
         }
 
-        [Test]
+        [Fact]
         public void LogsWhenNullFilterGiven()
         {
             var t = SetUp(LogLevel.Verbose);
@@ -70,10 +69,10 @@ public void LogsWhenNullFilterGiven()
 
             logger.Log(LogLevel.Information, 0, TestMessage, null, null);
 
-            Assert.AreEqual(1, sink.Writes.Count);
+            Assert.Equal(1, sink.Writes.Count);
         }
 
-        [Test]
+        [Fact]
         public void LogsCorrectLevel()
         {
             var t = SetUp(LogLevel.Debug);
@@ -87,41 +86,41 @@ public void LogsCorrectLevel()
             logger.Log(LogLevel.Error, 0, TestMessage, null, null);
             logger.Log(LogLevel.Critical, 0, TestMessage, null, null);
 
-            Assert.AreEqual(6, sink.Writes.Count);
-            Assert.AreEqual(LogEventLevel.Verbose, sink.Writes[0].Level);
-            Assert.AreEqual(LogEventLevel.Debug, sink.Writes[1].Level);
-            Assert.AreEqual(LogEventLevel.Information, sink.Writes[2].Level);
-            Assert.AreEqual(LogEventLevel.Warning, sink.Writes[3].Level);
-            Assert.AreEqual(LogEventLevel.Error, sink.Writes[4].Level);
-            Assert.AreEqual(LogEventLevel.Fatal, sink.Writes[5].Level);
+            Assert.Equal(6, sink.Writes.Count);
+            Assert.Equal(LogEventLevel.Verbose, sink.Writes[0].Level);
+            Assert.Equal(LogEventLevel.Debug, sink.Writes[1].Level);
+            Assert.Equal(LogEventLevel.Information, sink.Writes[2].Level);
+            Assert.Equal(LogEventLevel.Warning, sink.Writes[3].Level);
+            Assert.Equal(LogEventLevel.Error, sink.Writes[4].Level);
+            Assert.Equal(LogEventLevel.Fatal, sink.Writes[5].Level);
         }
 
-        [Test]
-        [TestCase(LogLevel.Verbose, LogLevel.Verbose, 1)]
-        [TestCase(LogLevel.Verbose, LogLevel.Information, 1)]
-        [TestCase(LogLevel.Verbose, LogLevel.Warning, 1)]
-        [TestCase(LogLevel.Verbose, LogLevel.Error, 1)]
-        [TestCase(LogLevel.Verbose, LogLevel.Critical, 1)]
-        [TestCase(LogLevel.Information, LogLevel.Verbose, 0)]
-        [TestCase(LogLevel.Information, LogLevel.Information, 1)]
-        [TestCase(LogLevel.Information, LogLevel.Warning, 1)]
-        [TestCase(LogLevel.Information, LogLevel.Error, 1)]
-        [TestCase(LogLevel.Information, LogLevel.Critical, 1)]
-        [TestCase(LogLevel.Warning, LogLevel.Verbose, 0)]
-        [TestCase(LogLevel.Warning, LogLevel.Information, 0)]
-        [TestCase(LogLevel.Warning, LogLevel.Warning, 1)]
-        [TestCase(LogLevel.Warning, LogLevel.Error, 1)]
-        [TestCase(LogLevel.Warning, LogLevel.Critical, 1)]
-        [TestCase(LogLevel.Error, LogLevel.Verbose, 0)]
-        [TestCase(LogLevel.Error, LogLevel.Information, 0)]
-        [TestCase(LogLevel.Error, LogLevel.Warning, 0)]
-        [TestCase(LogLevel.Error, LogLevel.Error, 1)]
-        [TestCase(LogLevel.Error, LogLevel.Critical, 1)]
-        [TestCase(LogLevel.Critical, LogLevel.Verbose, 0)]
-        [TestCase(LogLevel.Critical, LogLevel.Information, 0)]
-        [TestCase(LogLevel.Critical, LogLevel.Warning, 0)]
-        [TestCase(LogLevel.Critical, LogLevel.Error, 0)]
-        [TestCase(LogLevel.Critical, LogLevel.Critical, 1)]
+        [Theory]
+        [InlineData(LogLevel.Verbose, LogLevel.Verbose, 1)]
+        [InlineData(LogLevel.Verbose, LogLevel.Information, 1)]
+        [InlineData(LogLevel.Verbose, LogLevel.Warning, 1)]
+        [InlineData(LogLevel.Verbose, LogLevel.Error, 1)]
+        [InlineData(LogLevel.Verbose, LogLevel.Critical, 1)]
+        [InlineData(LogLevel.Information, LogLevel.Verbose, 0)]
+        [InlineData(LogLevel.Information, LogLevel.Information, 1)]
+        [InlineData(LogLevel.Information, LogLevel.Warning, 1)]
+        [InlineData(LogLevel.Information, LogLevel.Error, 1)]
+        [InlineData(LogLevel.Information, LogLevel.Critical, 1)]
+        [InlineData(LogLevel.Warning, LogLevel.Verbose, 0)]
+        [InlineData(LogLevel.Warning, LogLevel.Information, 0)]
+        [InlineData(LogLevel.Warning, LogLevel.Warning, 1)]
+        [InlineData(LogLevel.Warning, LogLevel.Error, 1)]
+        [InlineData(LogLevel.Warning, LogLevel.Critical, 1)]
+        [InlineData(LogLevel.Error, LogLevel.Verbose, 0)]
+        [InlineData(LogLevel.Error, LogLevel.Information, 0)]
+        [InlineData(LogLevel.Error, LogLevel.Warning, 0)]
+        [InlineData(LogLevel.Error, LogLevel.Error, 1)]
+        [InlineData(LogLevel.Error, LogLevel.Critical, 1)]
+        [InlineData(LogLevel.Critical, LogLevel.Verbose, 0)]
+        [InlineData(LogLevel.Critical, LogLevel.Information, 0)]
+        [InlineData(LogLevel.Critical, LogLevel.Warning, 0)]
+        [InlineData(LogLevel.Critical, LogLevel.Error, 0)]
+        [InlineData(LogLevel.Critical, LogLevel.Critical, 1)]
         public void LogsWhenEnabled(LogLevel minLevel, LogLevel logLevel, int expected)
         {
             var t = SetUp(minLevel);
@@ -130,10 +129,10 @@ public void LogsWhenEnabled(LogLevel minLevel, LogLevel logLevel, int expected)
 
             logger.Log(logLevel, 0, TestMessage, null, null);
 
-            Assert.AreEqual(expected, sink.Writes.Count);
+            Assert.Equal(expected, sink.Writes.Count);
         }
 
-        [Test]
+        [Fact]
         public void LogsCorrectMessage()
         {
             var t = SetUp(LogLevel.Verbose);
@@ -143,11 +142,11 @@ public void LogsCorrectMessage()
             logger.Log(LogLevel.Information, 0, null, null, null);
             logger.Log(LogLevel.Information, 0, TestMessage, null, null);
 
-            Assert.AreEqual(1, sink.Writes.Count);
-            Assert.AreEqual(TestMessage, sink.Writes[0].RenderMessage());
+            Assert.Equal(1, sink.Writes.Count);
+            Assert.Equal(TestMessage, sink.Writes[0].RenderMessage());
         }
 
-        [Test]
+        [Fact]
         public void CarriesException()
         {
             var t = SetUp(LogLevel.Verbose);
@@ -158,11 +157,11 @@ public void CarriesException()
 
             logger.Log(LogLevel.Information, 0, "Test", exception, null);
 
-            Assert.AreEqual(1, sink.Writes.Count);
-            Assert.AreSame(exception, sink.Writes[0].Exception);
+            Assert.Equal(1, sink.Writes.Count);
+            Assert.Same(exception, sink.Writes[0].Exception);
         }
 
-        [Test]
+        [Fact]
         public void SingleScopeProperty()
         {
             var t = SetUp(LogLevel.Verbose);
@@ -174,12 +173,12 @@ public void SingleScopeProperty()
                 logger.Log(LogLevel.Information, 0, TestMessage, null, null);
             }
 
-            Assert.AreEqual(1, sink.Writes.Count);
+            Assert.Equal(1, sink.Writes.Count);
             Assert.True(sink.Writes[0].Properties.ContainsKey("Name"));
-            Assert.AreEqual("\"pizza\"", sink.Writes[0].Properties["Name"].ToString());
+            Assert.Equal("\"pizza\"", sink.Writes[0].Properties["Name"].ToString());
         }
 
-        [Test]
+        [Fact]
         public void NestedScopeSameProperty()
         {
             var t = SetUp(LogLevel.Verbose);
@@ -195,12 +194,12 @@ public void NestedScopeSameProperty()
             }
 
             // Should retain the property of the most specific scope
-            Assert.AreEqual(1, sink.Writes.Count);
+            Assert.Equal(1, sink.Writes.Count);
             Assert.True(sink.Writes[0].Properties.ContainsKey("Name"));
-            Assert.AreEqual("\"bacon\"", sink.Writes[0].Properties["Name"].ToString());
+            Assert.Equal("\"bacon\"", sink.Writes[0].Properties["Name"].ToString());
         }
 
-        [Test]
+        [Fact]
         public void NestedScopesDifferentProperties()
         {
             var t = SetUp(LogLevel.Verbose);
@@ -215,14 +214,14 @@ public void NestedScopesDifferentProperties()
                 }
             }
 
-            Assert.AreEqual(1, sink.Writes.Count);
+            Assert.Equal(1, sink.Writes.Count);
             Assert.True(sink.Writes[0].Properties.ContainsKey("Name"));
-            Assert.AreEqual("\"spaghetti\"", sink.Writes[0].Properties["Name"].ToString());
+            Assert.Equal("\"spaghetti\"", sink.Writes[0].Properties["Name"].ToString());
             Assert.True(sink.Writes[0].Properties.ContainsKey("LuckyNumber"));
-            Assert.AreEqual("7", sink.Writes[0].Properties["LuckyNumber"].ToString());
+            Assert.Equal("7", sink.Writes[0].Properties["LuckyNumber"].ToString());
         }
 
-        [Test]
+        [Fact]
         public void CarriesMessageTemplateProperties()
         {
             var selfLog = new StringWriter();
@@ -235,11 +234,11 @@ public void CarriesMessageTemplateProperties()
             logger.LogInformation("Hello, {Recipient}", "World");
 
             Assert.True(sink.Writes[0].Properties.ContainsKey("Recipient"));
-            Assert.AreEqual("\"World\"", sink.Writes[0].Properties["Recipient"].ToString());
-            Assert.AreEqual("Hello, {Recipient}", sink.Writes[0].MessageTemplate.Text);
+            Assert.Equal("\"World\"", sink.Writes[0].Properties["Recipient"].ToString());
+            Assert.Equal("Hello, {Recipient}", sink.Writes[0].MessageTemplate.Text);
 
             SelfLog.Out = null;
-            Assert.IsEmpty(selfLog.ToString());
+            Assert.Empty(selfLog.ToString());
         }
 
         private class FoodScope : ILogValues
diff --git a/test/Serilog.Framework.Logging.Tests/project.json b/test/Serilog.Framework.Logging.Tests/project.json
@@ -1,12 +1,18 @@
 ﻿{
-    "dependencies": {
-        "Serilog.Framework.Logging": "1.0.0-*",
-        "NUnitTestAdapter.WithFramework": "2.0.0"
-    },
-    "frameworks": {
-        "dnx451": {
-            "dependencies": {
-            }
-        }
+  "commands": {
+    "test": "xunit.runner.dnx",
+    "test-dnxcore50": "xunit.runner.dnx"
+  },
+  "dependencies": {
+    "Serilog.Framework.Logging": "1.0.0-*",
+    "xunit": "2.1.0",
+    "xunit.runner.visualstudio": "2.1.0",
+    "xunit.runner.dnx": "2.1.0-rc1-build204"
+  },
+  "frameworks": {
+    "dnx451": {
+      "dependencies": {
+      }
     }
+  }
 }
diff --git a/test/Serilog.Framework.Logging.Tests/project.lock.json b/test/Serilog.Framework.Logging.Tests/project.lock.json
