Skip to content

Commit a2422ee

Browse files
committed
And one more...
1 parent 14ebc56 commit a2422ee

File tree

1 file changed

+28
-22
lines changed

1 file changed

+28
-22
lines changed

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

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ public void WhenFirstOpeningFailedWithLockRetryDelayedUntilNextCheckpoint()
163163
.CreateLogger();
164164
LogEvent e1 = Some.InformationEvent(new DateTime(2012, 10, 28)),
165165
e2 = Some.InformationEvent(e1.Timestamp.AddSeconds(1)),
166-
e3 = Some.InformationEvent(e2.Timestamp.AddMinutes(28)),
167-
e4 = Some.InformationEvent(e3.Timestamp.AddMinutes(3));
166+
e3 = Some.InformationEvent(e1.Timestamp.AddMinutes(5)),
167+
e4 = Some.InformationEvent(e1.Timestamp.AddMinutes(31));
168168
LogEvent[] logEvents = new[] { e1, e2, e3, e4 };
169169

170170
foreach (var logEvent in logEvents)
@@ -196,19 +196,22 @@ public void WhenFirstOpeningFailedWithLockRetryDelayed30Minutes()
196196
{
197197
var fileName = Some.String() + ".txt";
198198
using var temp = new TempFolder();
199-
using var log = new LoggerConfiguration()
200-
.WriteTo.File(Path.Combine(temp.Path, fileName), rollOnFileSizeLimit: true, fileSizeLimitBytes: 1, rollingInterval: RollingInterval.Hour, hooks: new FailOpeningHook(true, 2, 3, 4))
201-
.CreateLogger();
202199
LogEvent e1 = Some.InformationEvent(new DateTime(2012, 10, 28)),
203200
e2 = Some.InformationEvent(e1.Timestamp.AddSeconds(1)),
204-
e3 = Some.InformationEvent(e2.Timestamp.AddMinutes(28)),
205-
e4 = Some.InformationEvent(e3.Timestamp.AddMinutes(3));
201+
e3 = Some.InformationEvent(e1.Timestamp.AddMinutes(5)),
202+
e4 = Some.InformationEvent(e1.Timestamp.AddMinutes(31));
206203
LogEvent[] logEvents = new[] { e1, e2, e3, e4 };
207-
208-
foreach (var logEvent in logEvents)
204+
205+
using (var log = new LoggerConfiguration()
206+
.WriteTo.File(Path.Combine(temp.Path, fileName), rollOnFileSizeLimit: true, fileSizeLimitBytes: 1,
207+
rollingInterval: RollingInterval.Hour, hooks: new FailOpeningHook(true, 2, 3, 4))
208+
.CreateLogger())
209209
{
210-
Clock.SetTestDateTimeNow(logEvent.Timestamp.DateTime);
211-
log.Write(logEvent);
210+
foreach (var logEvent in logEvents)
211+
{
212+
Clock.SetTestDateTimeNow(logEvent.Timestamp.DateTime);
213+
log.Write(logEvent);
214+
}
212215
}
213216

214217
var files = Directory.GetFiles(temp.Path)
@@ -218,7 +221,7 @@ public void WhenFirstOpeningFailedWithLockRetryDelayed30Minutes()
218221

219222
foreach (var file in files)
220223
{
221-
_testOutputHelper.WriteLine(file);
224+
_testOutputHelper.WriteLine(file + ": " + System.IO.File.ReadAllText(file));
222225
}
223226
Assert.Equal(5, files.Length);
224227
// Successful write of e1:
@@ -237,19 +240,22 @@ public void WhenFirstOpeningFailedWithoutLockRetryDelayed30Minutes()
237240
{
238241
var fileName = Some.String() + ".txt";
239242
using var temp = new TempFolder();
240-
using var log = new LoggerConfiguration()
241-
.WriteTo.File(Path.Combine(temp.Path, fileName), rollOnFileSizeLimit: true, fileSizeLimitBytes: 1, rollingInterval: RollingInterval.Hour, hooks: new FailOpeningHook(false, 2))
242-
.CreateLogger();
243243
LogEvent e1 = Some.InformationEvent(new DateTime(2012, 10, 28)),
244244
e2 = Some.InformationEvent(e1.Timestamp.AddSeconds(1)),
245-
e3 = Some.InformationEvent(e2.Timestamp.AddMinutes(28)),
246-
e4 = Some.InformationEvent(e3.Timestamp.AddMinutes(3));
245+
e3 = Some.InformationEvent(e1.Timestamp.AddMinutes(5)),
246+
e4 = Some.InformationEvent(e1.Timestamp.AddMinutes(31));
247247
LogEvent[] logEvents = new[] { e1, e2, e3, e4 };
248-
249-
foreach (var logEvent in logEvents)
248+
249+
using (var log = new LoggerConfiguration()
250+
.WriteTo.File(Path.Combine(temp.Path, fileName), rollOnFileSizeLimit: true, fileSizeLimitBytes: 1,
251+
rollingInterval: RollingInterval.Hour, hooks: new FailOpeningHook(false, 2))
252+
.CreateLogger())
250253
{
251-
Clock.SetTestDateTimeNow(logEvent.Timestamp.DateTime);
252-
log.Write(logEvent);
254+
foreach (var logEvent in logEvents)
255+
{
256+
Clock.SetTestDateTimeNow(logEvent.Timestamp.DateTime);
257+
log.Write(logEvent);
258+
}
253259
}
254260

255261
var files = Directory.GetFiles(temp.Path)
@@ -259,7 +265,7 @@ public void WhenFirstOpeningFailedWithoutLockRetryDelayed30Minutes()
259265

260266
foreach (var file in files)
261267
{
262-
_testOutputHelper.WriteLine(file);
268+
_testOutputHelper.WriteLine(file + ": " + System.IO.File.ReadAllText(file));
263269
}
264270
Assert.Equal(3, files.Length);
265271
// Successful write of e1:

0 commit comments

Comments
 (0)