Merge pull request #34 from merbla/build-rework

Build rework and cleanup

Author: merbla

.travis.yml

@@ -18,13 +18,13 @@ addons:
     - zlib1g
 
 os:
-  - osx
+  #- osx
   - linux
 
 env:
   matrix: 
     - CLI_VERSION=1.0.0-preview2-003121
-    - CLI_VERSION=Latest
+  # - CLI_VERSION=Latest
 
 matrix:
   allow_failures:

build.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# Ensure any exit code exits TravisCI
+set -e
+
 dotnet restore
 for path in src/*/project.json; do
     dirname="$(dirname "${path}")"
@@ -8,4 +12,10 @@ done
 for path in sample/project.json; do
     dirname="$(dirname "${path}")"
     dotnet build ${dirname}
-done 
+done 
+
+for path in test/Serilog.Sinks.Splunk.Tests/project.json; do
+    dirname="$(dirname "${path}")"
+    dotnet build ${dirname} -f netcoreapp1.0 -c Release
+    dotnet test ${dirname} -f netcoreapp1.0  -c Release
+done

test/Serilog.Sinks.Splunk.Tests/SplunkJsonFormatterTests.cs

@@ -8,12 +8,16 @@ namespace Serilog.Sinks.Splunk.Tests
 {
     public class SplunkJsonFormatterTests
     {
-        void AssertValidJson(Action<ILogger> act)
+        void AssertValidJson(Action<ILogger> act, 
+            string source = "",
+            string sourceType= "",
+            string host= "",
+            string index= "")
         {
             StringWriter outputRendered = new StringWriter(), output = new StringWriter();
             var log = new LoggerConfiguration()
-                .WriteTo.Sink(new TextWriterSink(output, new SplunkJsonFormatter(false, null)))
-                .WriteTo.Sink(new TextWriterSink(outputRendered, new SplunkJsonFormatter(true, null)))
+                .WriteTo.Sink(new TextWriterSink(output, new SplunkJsonFormatter(false, null, source, sourceType, host, index)))
+                .WriteTo.Sink(new TextWriterSink(outputRendered, new SplunkJsonFormatter(true, null, source, sourceType, host, index)))
                 .CreateLogger();
 
             act(log);
@@ -52,5 +56,30 @@ public void ExceptionAndPropertiesAreValidJson()
         {
             AssertValidJson(log => log.Information(new DivideByZeroException(), "With exception and {Property}", 42));
         }
+
+        [Fact]
+        public void AMinimalEventWithSourceIsValidJson()
+        {
+            AssertValidJson(log => log.Information("One {Property}", 42), source: "A Test Source");
+        }
+        
+        [Fact]
+        public void AMinimalEventWithSourceTypeIsValidJson()
+        {
+            AssertValidJson(log => log.Information("One {Property}", 42), sourceType: "A Test SourceType");
+        }
+
+        [Fact]
+        public void AMinimalEventWithHostIsValidJson()
+        {
+            AssertValidJson(log => log.Information("One {Property}", 42), host: "A Test Host");
+        }
+
+        [Fact]
+        public void AMinimalEventWithIndexIsValidJson()
+        {
+            AssertValidJson(log => log.Information("One {Property}", 42), host: "testindex");
+        }
+    
     }
-}
+}