Use test paths that are happy on Linux

Author: nblumhardt

test/Serilog.Sinks.File.Tests/RollingFileSinkTests.cs

@@ -54,12 +54,12 @@ public void WhenTheDateChangesTheCorrectFileIsWritten()
         public void WhenRetentionCountIsSetOldFilesAreDeleted()
         {
             LogEvent e1 = Some.InformationEvent(),
-                     e2 = Some.InformationEvent(e1.Timestamp.AddDays(1)),
-                     e3 = Some.InformationEvent(e2.Timestamp.AddDays(5));
+                e2 = Some.InformationEvent(e1.Timestamp.AddDays(1)),
+                e3 = Some.InformationEvent(e2.Timestamp.AddDays(5));
 
             TestRollingEventSequence(
                 (pf, wt) => wt.File(pf, retainedFileCountLimit: 2, rollingInterval: RollingInterval.Day),
-                new[] { e1, e2, e3 },
+                new[] {e1, e2, e3},
                 files =>
                 {
                     Assert.Equal(3, files.Count);
@@ -69,6 +69,30 @@ public void WhenRetentionCountIsSetOldFilesAreDeleted()
                 });
         }
 
+        [Fact]
+        public void WhenSizeLimitIsBreachedNewFilesCreated()
+        {
+            var fileName = Some.String() + ".txt";
+            using (var temp = new TempFolder())
+            using (var log = new LoggerConfiguration()
+                .WriteTo.File(Path.Combine(temp.Path, fileName), rollOnFileSizeLimit: true, fileSizeLimitBytes: 1)
+                .CreateLogger())
+            {
+                LogEvent e1 = Some.InformationEvent(),
+                    e2 = Some.InformationEvent(e1.Timestamp),
+                    e3 = Some.InformationEvent(e1.Timestamp);
+
+                log.Write(e1); log.Write(e2); log.Write(e3);
+
+                var files = Directory.GetFiles(temp.Path);
+
+                Assert.Equal(3, files.Length);
+                Assert.False(files[0].Contains("_000.txt"));
+                Assert.True(files[1].Contains("_001.txt"));
+                Assert.True(files[2].Contains("_002.txt"));
+            }
+        }
+
         [Fact]
         public void IfTheLogFolderDoesNotExistItWillBeCreated()
         {

test/Serilog.Sinks.File.Tests/Support/TempFolder.cs

@@ -11,13 +11,13 @@ class TempFolder : IDisposable
 
         readonly string _tempFolder;
 
-        public TempFolder(string name)
+        public TempFolder(string name = null)
         {
             _tempFolder = System.IO.Path.Combine(
                 Environment.GetEnvironmentVariable("TMP") ?? Environment.GetEnvironmentVariable("TMPDIR") ?? "/tmp",
                 "Serilog.Sinks.File.Tests",
                 Session.ToString("n"),
-                name);
+                name ?? Guid.NewGuid().ToString("n"));
 
             Directory.CreateDirectory(_tempFolder);
         }

test/Serilog.Sinks.File.Tests/TemplatedPathRollerTests.cs

@@ -10,21 +10,21 @@ public class PathRollerTests
         [Fact]
         public void TheLogFileIncludesDateToken()
         {
-            var roller = new PathRoller("Logs\\log..txt", RollingInterval.Day);
+            var roller = new PathRoller("Logs\\log-.txt", RollingInterval.Day);
             var now = new DateTime(2013, 7, 14, 3, 24, 9, 980);
             string path;
             roller.GetLogFilePath(now, null, out path);
-            AssertEqualAbsolute("Logs\\log.20130714.txt", path);
+            AssertEqualAbsolute("Logs\\log-20130714.txt", path);
         }
 
         [Fact]
         public void ANonZeroIncrementIsIncludedAndPadded()
         {
-            var roller = new PathRoller("Logs\\log..txt", RollingInterval.Day);
+            var roller = new PathRoller("Logs\\log-.txt", RollingInterval.Day);
             var now = new DateTime(2013, 7, 14, 3, 24, 9, 980);
             string path;
             roller.GetLogFilePath(now, 12, out path);
-            AssertEqualAbsolute("Logs\\log.20130714_012.txt", path);
+            AssertEqualAbsolute("Logs\\log-20130714_012.txt", path);
         }
 
         static void AssertEqualAbsolute(string path1, string path2)
@@ -37,7 +37,7 @@ static void AssertEqualAbsolute(string path1, string path2)
         [Fact]
         public void TheRollerReturnsTheLogFileDirectory()
         {
-            var roller = new PathRoller("Logs\\log..txt", RollingInterval.Day);
+            var roller = new PathRoller("Logs\\log-.txt", RollingInterval.Day);
             AssertEqualAbsolute("Logs", roller.LogFileDirectory);
         }