Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions Sources/EventViewerX.Tests/TestTimeHelper.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
using System;
using Xunit;

namespace EventViewerX.Tests {
public class TestTimeHelper {
[Fact]
public void PastHourRangeIsLocal() {
var now = DateTime.Now;
var expectedStart = new DateTime(now.Year, now.Month, now.Day, now.Hour, 0, 0).AddHours(-1);
var expectedEnd = expectedStart.AddHours(1);

var result = TimeHelper.GetTimePeriod(TimePeriod.PastHour);

Assert.Equal(expectedStart, result.StartTime);
Assert.Equal(expectedEnd, result.EndTime);
}

[Fact]
public void LastSevenDaysStartsFromLocal() {
var now = DateTime.Now;
var expectedStart = now.Date.AddDays(-7);

var result = TimeHelper.GetTimePeriod(TimePeriod.Last7Days);

Assert.Equal(expectedStart, result.StartTime);
Assert.Null(result.EndTime);
}

[Fact]
public void TodayRangeMatchesLocalDay() {
var now = DateTime.Now;
var expectedStart = new DateTime(now.Year, now.Month, now.Day, 0, 0, 0);
var expectedEnd = expectedStart.AddDays(1);

var result = TimeHelper.GetTimePeriod(TimePeriod.Today);

Assert.Equal(expectedStart, result.StartTime);
Assert.Equal(expectedEnd, result.EndTime);
}
}
}
9 changes: 7 additions & 2 deletions Sources/EventViewerX/EventViewerX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,14 @@
<SupportedOSPlatform>windows</SupportedOSPlatform>
</PropertyGroup>

<ItemGroup>
<ItemGroup>
<PackageReference Include="DnsClientX" Version="0.4.0" />
</ItemGroup>
</ItemGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>EventViewerX.Tests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
Expand Down
8 changes: 4 additions & 4 deletions Sources/EventViewerX/TimeHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public enum TimePeriod {

internal static class TimeHelper {
internal static (DateTime? StartTime, DateTime? EndTime, TimeSpan? LastPeriod) GetTimePeriod(TimePeriod timePeriod) {
DateTime now = DateTime.UtcNow;
DateTime now = DateTime.Now;
DateTime? startTime = null;
DateTime? endTime = null;
TimeSpan? lastPeriod = null;
Expand Down Expand Up @@ -76,13 +76,13 @@ internal static (DateTime? StartTime, DateTime? EndTime, TimeSpan? LastPeriod) G
endTime = startTime.Value.AddMonths(3);
break;
case TimePeriod.Last3Days:
startTime = DateTime.UtcNow.Date.AddDays(-3);
startTime = now.Date.AddDays(-3);
break;
case TimePeriod.Last7Days:
startTime = DateTime.UtcNow.Date.AddDays(-7);
startTime = now.Date.AddDays(-7);
break;
case TimePeriod.Last14Days:
startTime = DateTime.UtcNow.Date.AddDays(-14);
startTime = now.Date.AddDays(-14);
break;
case TimePeriod.Last1Hours:
lastPeriod = TimeSpan.FromHours(1);
Expand Down
Loading