Skip to content

Commit

Permalink
fix unit tests if executed on a machine with UTC as timezone, specify…
Browse files Browse the repository at this point in the history
… pipelines to run on windows so no tests file because of newline characters
  • Loading branch information
Arnaud Boussaer authored and Arnaud Boussaer committed Feb 13, 2025
1 parent f8af327 commit da4d962
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/odata2linq-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: windows-latest
strategy:
matrix:
dotnet-version: ['6.0.x']
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/odata2linq-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: windows-latest
strategy:
matrix:
dotnet-version: ['6.0.x']
Expand Down
2 changes: 1 addition & 1 deletion src/OData2Linq/OData2Linq.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>FriendAssemblies.snk</AssemblyOriginatorKeyFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>0.0.7</Version>
<Version>0.0.8</Version>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/ArnaudB88/OData2Linq</RepositoryUrl>
Expand Down
26 changes: 21 additions & 5 deletions test/OData2Linq.Tests/DateTimeFilterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ public void LocalDateTimetNotEquaIncorrectUtcOffset()
output.WriteLine(filter);

var result = SimpleClass.CreateQuery().OData().Filter(filter).ToArray();
Assert.Empty(result);
if (TimeZoneInfo.Local != TimeZoneInfo.Utc)
Assert.Empty(result);
else
Assert.Single(result);
}

[Fact]
Expand Down Expand Up @@ -88,7 +91,10 @@ public void DateTimeOffsetNotEqualIncorrectUtcOffset()
output.WriteLine(filter);

var result = SimpleClass.CreateQuery().OData().Filter(filter).ToArray();
Assert.Empty(result);
if (TimeZoneInfo.Local != TimeZoneInfo.Utc)
Assert.Empty(result);
else
Assert.Single(result);
}

[Fact]
Expand Down Expand Up @@ -125,7 +131,10 @@ public void UtcDateTimeNotEqualIncorrectLocalOffset()
output.WriteLine(filter);

var result = SimpleClass.CreateQuery().OData(c => c.QuerySettings.TimeZone = TimeZoneInfo.Utc).Filter(filter).ToArray();
Assert.Empty(result);
if (TimeZoneInfo.Local != TimeZoneInfo.Utc)
Assert.Empty(result);
else
Assert.Single(result);
}

[Fact]
Expand All @@ -136,7 +145,10 @@ public void UtcDateTimeNotEqualIncorrectLocalOffset2()
output.WriteLine(filter);

var result = SimpleClass.CreateQuery().OData(c => c.QuerySettings.TimeZone = TimeZoneInfo.Utc).Filter(filter).ToArray();
Assert.Empty(result);
if (TimeZoneInfo.Local != TimeZoneInfo.Utc)
Assert.Empty(result);
else
Assert.Single(result);
}

[Fact]
Expand All @@ -147,7 +159,11 @@ public void UtcDateTimetNotEqualIncorrectUtcOffset()
output.WriteLine(filter);

var result = SimpleClass.CreateQuery().OData(c => c.QuerySettings.TimeZone = TimeZoneInfo.Utc).Filter(filter).ToArray();
Assert.Empty(result);

if (TimeZoneInfo.Local != TimeZoneInfo.Utc)
Assert.Empty(result);
else
Assert.Single(result);
}

[Fact]
Expand Down

0 comments on commit da4d962

Please sign in to comment.