Skip to content

Commit 4a92725

Browse files
committed
SkipIfGitHubActionsFactAttribute
1 parent 9abc9c7 commit 4a92725

File tree

4 files changed

+17
-20
lines changed

4 files changed

+17
-20
lines changed

test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<Compile Include="..\System.Linq.Dynamic.Core.Tests\TestClasses\*.cs" />
3030
</ItemGroup>
3131

32+
<ItemGroup>
33+
<Compile Remove="..\System.Linq.Dynamic.Core.Tests\TestHelpers\SkipIfGitHubActionsAttribute.cs" />
34+
</ItemGroup>
35+
3236
<ItemGroup>
3337
<ProjectReference Include="..\..\src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
3438
<ProjectReference Include="..\..\src\EntityFramework.DynamicLinq\EntityFramework.DynamicLinq.csproj" />

test/System.Linq.Dynamic.Core.Tests/DynamicClassTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void DynamicClass_GetRuntimeType()
217217
typeOf.ToString().Should().Be("System.Linq.Dynamic.Core.DynamicClass");
218218
}
219219

220-
[SkipIfGitHubActions]
220+
[SkipIfGitHubActionsFact]
221221
public void DynamicClassArray()
222222
{
223223
// Arrange
@@ -249,7 +249,7 @@ public void DynamicClassArray()
249249
isValid.Should().BeTrue();
250250
}
251251

252-
[SkipIfGitHubActions]
252+
[SkipIfGitHubActionsFact]
253253
public void DynamicClassArray_Issue593_Fails()
254254
{
255255
// Arrange
@@ -281,7 +281,7 @@ public void DynamicClassArray_Issue593_Fails()
281281
isValid.Should().BeFalse(); // This should actually be true, but fails. For solution see Issue593_Solution1 and Issue593_Solution2.
282282
}
283283

284-
[SkipIfGitHubActions]
284+
[SkipIfGitHubActionsFact]
285285
public void DynamicClassArray_Issue593_Solution1()
286286
{
287287
// Arrange
@@ -318,7 +318,7 @@ public void DynamicClassArray_Issue593_Solution1()
318318
isValid.Should().BeTrue();
319319
}
320320

321-
[SkipIfGitHubActions]
321+
[SkipIfGitHubActionsFact]
322322
public void DynamicClassArray_Issue593_Solution2()
323323
{
324324
// Arrange

test/System.Linq.Dynamic.Core.Tests/DynamicGetMemberBinderTests.cs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#if !NET461
2-
using System.Data;
1+
using System.Data;
2+
using System.Linq.Dynamic.Core.Tests.TestHelpers;
33
using FluentAssertions;
44
using Xunit;
55

@@ -82,7 +82,7 @@ public void DynamicGetMemberBinder_SelectTypeOnArrayWithComplexObjects()
8282
ordered.Should().HaveCount(6);
8383
}
8484

85-
[Fact]
85+
[SkipIfGitHubActionsFact]
8686
public void DynamicGetMemberBinder_SelectOnDataTable()
8787
{
8888
// Arrange
@@ -96,10 +96,7 @@ public void DynamicGetMemberBinder_SelectOnDataTable()
9696
dataTable.Rows.Add("South", "Apples", 200);
9797
dataTable.Rows.Add("South", "Oranges", 250);
9898

99-
var extractedRows =
100-
from row in dataTable.AsEnumerable()
101-
select row;
102-
var rows = extractedRows.AsQueryable();
99+
var rows = dataTable.Rows.Cast<DataRow>().AsQueryable();
103100

104101
// Act
105102
var grouping1 = rows
@@ -117,7 +114,7 @@ from row in dataTable.AsEnumerable()
117114
ordered.Should().HaveCount(6);
118115
}
119116

120-
[Fact]
117+
[SkipIfGitHubActionsFact]
121118
public void DynamicGetMemberBinder_SelectTypeOnDataTable()
122119
{
123120
// Arrange
@@ -131,10 +128,7 @@ public void DynamicGetMemberBinder_SelectTypeOnDataTable()
131128
dataTable.Rows.Add("South", "Apples", 200);
132129
dataTable.Rows.Add("South", "Oranges", 250);
133130

134-
var extractedRows =
135-
from row in dataTable.AsEnumerable()
136-
select row;
137-
var rows = extractedRows.AsQueryable();
131+
var rows = dataTable.Rows.Cast<DataRow>().AsQueryable();
138132

139133
// Act
140134
var grouping1 = rows
@@ -175,5 +169,4 @@ public void DynamicGetMemberBinder_SelectOnArrayWithIntegers()
175169
dynamicResult1.Should().HaveCount(2);
176170
dynamicResult2.Should().BeEquivalentTo([2, 4]);
177171
}
178-
}
179-
#endif
172+
}

test/System.Linq.Dynamic.Core.Tests/TestHelpers/SkipIfGitHubActionsAttribute.cs renamed to test/System.Linq.Dynamic.Core.Tests/TestHelpers/SkipIfGitHubActionsFactAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace System.Linq.Dynamic.Core.Tests.TestHelpers;
44

5-
internal class SkipIfGitHubActionsAttribute : FactAttribute
5+
internal class SkipIfGitHubActionsFactAttribute : FactAttribute
66
{
7-
public SkipIfGitHubActionsAttribute()
7+
public SkipIfGitHubActionsFactAttribute()
88
{
99
if (IsRunningOnGitHubActions())
1010
{

0 commit comments

Comments
 (0)