Skip to content

Commit 76096c1

Browse files
AndriySvyrydAndriySvyryd
authored
Code cleanup for FunctionalTests (#36582)
Part of #35884
1 parent eb33348 commit 76096c1

File tree

338 files changed

+14263
-17190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

338 files changed

+14263
-17190
lines changed

‎test/EFCore.Relational.Specification.Tests/BulkUpdates/ComplexTypeBulkUpdatesRelationalFixtureBase.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ public TestSqlLoggerFactory TestSqlLoggerFactory
1717
=> (TestSqlLoggerFactory)ListLoggerFactory;
1818

1919
public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
20-
=> base.AddOptions(builder).ConfigureWarnings(
21-
c => c.Log(RelationalEventId.QueryPossibleUnintendedUseOfEqualsWarning))
20+
=> base.AddOptions(builder).ConfigureWarnings(c => c.Log(RelationalEventId.QueryPossibleUnintendedUseOfEqualsWarning))
2221
.EnableDetailedErrors();
2322

2423
protected override bool ShouldLogCategory(string logCategory)

‎test/EFCore.Relational.Specification.Tests/BulkUpdates/FiltersInheritanceBulkUpdatesRelationalTestBase.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ protected FiltersInheritanceBulkUpdatesRelationalTestBase(TFixture fixture, ITes
1717
Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
1818
}
1919

20-
[ConditionalTheory]
21-
[MemberData(nameof(IsAsyncData))]
20+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
2221
public virtual Task Delete_where_keyless_entity_mapped_to_sql_query(bool async)
2322
=> AssertTranslationFailed(
2423
RelationalStrings.ExecuteOperationOnKeylessEntityTypeWithUnsupportedOperator("ExecuteDelete", "EagleQuery"),
@@ -27,8 +26,7 @@ public virtual Task Delete_where_keyless_entity_mapped_to_sql_query(bool async)
2726
ss => ss.Set<EagleQuery>().Where(e => e.CountryId > 0),
2827
rowsAffectedCount: 1));
2928

30-
[ConditionalTheory]
31-
[MemberData(nameof(IsAsyncData))]
29+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
3230
public virtual Task Update_where_keyless_entity_mapped_to_sql_query(bool async)
3331
=> AssertTranslationFailed(
3432
RelationalStrings.ExecuteOperationOnKeylessEntityTypeWithUnsupportedOperator("ExecuteUpdate", "EagleQuery"),

‎test/EFCore.Relational.Specification.Tests/BulkUpdates/InheritanceBulkUpdatesRelationalFixtureBase.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ public TestSqlLoggerFactory TestSqlLoggerFactory
1717
=> (TestSqlLoggerFactory)ListLoggerFactory;
1818

1919
public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
20-
=> base.AddOptions(builder).ConfigureWarnings(
21-
c => c.Log(RelationalEventId.QueryPossibleUnintendedUseOfEqualsWarning))
20+
=> base.AddOptions(builder).ConfigureWarnings(c => c.Log(RelationalEventId.QueryPossibleUnintendedUseOfEqualsWarning))
2221
.EnableDetailedErrors();
2322

2423
protected override bool ShouldLogCategory(string logCategory)

‎test/EFCore.Relational.Specification.Tests/BulkUpdates/InheritanceBulkUpdatesRelationalTestBase.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ protected InheritanceBulkUpdatesRelationalTestBase(TFixture fixture, ITestOutput
1717
Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
1818
}
1919

20-
[ConditionalTheory]
21-
[MemberData(nameof(IsAsyncData))]
20+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
2221
public virtual Task Delete_where_keyless_entity_mapped_to_sql_query(bool async)
2322
=> AssertTranslationFailed(
2423
RelationalStrings.ExecuteOperationOnKeylessEntityTypeWithUnsupportedOperator("ExecuteDelete", "EagleQuery"),
@@ -27,8 +26,7 @@ public virtual Task Delete_where_keyless_entity_mapped_to_sql_query(bool async)
2726
ss => ss.Set<EagleQuery>().Where(e => e.CountryId > 0),
2827
rowsAffectedCount: 1));
2928

30-
[ConditionalTheory]
31-
[MemberData(nameof(IsAsyncData))]
29+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
3230
public virtual Task Update_where_keyless_entity_mapped_to_sql_query(bool async)
3331
=> AssertTranslationFailed(
3432
RelationalStrings.ExecuteOperationOnKeylessEntityTypeWithUnsupportedOperator("ExecuteUpdate", "EagleQuery"),

‎test/EFCore.Relational.Specification.Tests/BulkUpdates/NonSharedModelBulkUpdatesRelationalTestBase.cs‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ public abstract class NonSharedModelBulkUpdatesRelationalTestBase(NonSharedFixtu
1212
protected override string StoreName
1313
=> "NonSharedModelBulkUpdatesTests";
1414

15-
[ConditionalTheory]
16-
[MemberData(nameof(IsAsyncData))]
15+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
1716
public virtual async Task Delete_aggregate_root_when_table_sharing_with_non_owned_throws(bool async)
1817
{
1918
var contextFactory = await InitializeAsync<Context28671>(
@@ -30,8 +29,7 @@ await AssertTranslationFailedWithDetails(
3029
RelationalStrings.ExecuteDeleteOnTableSplitting(nameof(Owner)));
3130
}
3231

33-
[ConditionalTheory]
34-
[MemberData(nameof(IsAsyncData))]
32+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
3533
public virtual async Task Update_main_table_in_entity_with_entity_splitting(bool async)
3634
{
3735
var contextFactory = await InitializeAsync<DbContext>(
@@ -57,8 +55,7 @@ await AssertUpdate(
5755
rowsAffectedCount: 1);
5856
}
5957

60-
[ConditionalTheory]
61-
[MemberData(nameof(IsAsyncData))]
58+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
6259
public virtual async Task Update_non_main_table_in_entity_with_entity_splitting(bool async)
6360
{
6461
var contextFactory = await InitializeAsync<DbContext>(
@@ -86,8 +83,7 @@ await AssertUpdate(
8683
rowsAffectedCount: 1);
8784
}
8885

89-
[ConditionalTheory] // #34677
90-
[MemberData(nameof(IsAsyncData))]
86+
[ConditionalTheory, MemberData(nameof(IsAsyncData))] // #34677
9187
public virtual async Task Delete_with_view_mapping(bool async)
9288
{
9389
var contextFactory = await InitializeAsync<Context34677>(seed: async context => await context.Seed());
@@ -99,8 +95,7 @@ await AssertDelete(
9995
rowsAffectedCount: 1);
10096
}
10197

102-
[ConditionalTheory] // #34677
103-
[MemberData(nameof(IsAsyncData))]
98+
[ConditionalTheory, MemberData(nameof(IsAsyncData))] // #34677
10499
public virtual async Task Update_with_view_mapping(bool async)
105100
{
106101
var contextFactory = await InitializeAsync<Context34677>(seed: async context => await context.Seed());
@@ -113,8 +108,7 @@ await AssertUpdate(
113108
rowsAffectedCount: 1);
114109
}
115110

116-
[ConditionalTheory] // #34677, #34706
117-
[MemberData(nameof(IsAsyncData))]
111+
[ConditionalTheory, MemberData(nameof(IsAsyncData))] // #34677, #34706
118112
public virtual async Task Update_complex_type_with_view_mapping(bool async)
119113
{
120114
var contextFactory = await InitializeAsync<Context34677>(seed: async context => await context.Seed());
@@ -155,6 +149,7 @@ public class Foo
155149
{
156150
[DatabaseGenerated(DatabaseGeneratedOption.None)]
157151
public int Id { get; set; }
152+
158153
public string Data { get; set; }
159154
public ComplexThing ComplexThing { get; set; }
160155
}

‎test/EFCore.Relational.Specification.Tests/BulkUpdates/NorthwindBulkUpdatesRelationalFixture.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public TestSqlLoggerFactory TestSqlLoggerFactory
1616
=> (TestSqlLoggerFactory)ListLoggerFactory;
1717

1818
public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
19-
=> base.AddOptions(builder).ConfigureWarnings(
20-
c => c.Log(RelationalEventId.QueryPossibleUnintendedUseOfEqualsWarning))
19+
=> base.AddOptions(builder).ConfigureWarnings(c => c.Log(RelationalEventId.QueryPossibleUnintendedUseOfEqualsWarning))
2120
.EnableDetailedErrors();
2221

2322
protected override bool ShouldLogCategory(string logCategory)

‎test/EFCore.Relational.Specification.Tests/BulkUpdates/NorthwindBulkUpdatesRelationalTestBase.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ public override Task Delete_non_entity_projection_3(bool async)
3232
RelationalStrings.ExecuteDeleteOnNonEntityType,
3333
() => base.Delete_non_entity_projection_3(async));
3434

35-
[ConditionalTheory]
36-
[MemberData(nameof(IsAsyncData))]
35+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
3736
public virtual Task Delete_FromSql_converted_to_subquery(bool async)
3837
=> TestHelpers.ExecuteWithStrategyInTransactionAsync(
3938
() => Fixture.CreateContext(),
@@ -77,8 +76,7 @@ public override Task Update_unmapped_property_throws(bool async)
7776
RelationalStrings.InvalidPropertyInSetProperty("c => c.IsLondon"),
7877
() => base.Update_unmapped_property_throws(async));
7978

80-
[ConditionalTheory]
81-
[MemberData(nameof(IsAsyncData))]
79+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
8280
public virtual Task Update_FromSql_set_constant(bool async)
8381
=> TestHelpers.ExecuteWithStrategyInTransactionAsync(
8482
() => Fixture.CreateContext(),

0 commit comments

Comments
 (0)