Skip to content

Commit 5ece0ae

Browse files
btecumaumar
authored and
roji
committed
Cleanup asserts (dotnet#32968)
* Cleanup asserts * Assert.True * fixing compilation error --------- Co-authored-by: maumar <[email protected]>
1 parent afd879d commit 5ece0ae

File tree

5 files changed

+46
-47
lines changed

5 files changed

+46
-47
lines changed

‎test/EFCore.Design.Tests/Scaffolding/Internal/CSharpDbContextGeneratorTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ public Task Is_fixed_length_annotation_should_be_scaffolded_without_optional_par
968968
new ModelCodeGenerationOptions { UseDataAnnotations = false },
969969
code => Assert.Contains(".IsFixedLength()", code.ContextFile.Code),
970970
model =>
971-
Assert.Equal(true, model.FindEntityType("TestNamespace.Employee").GetProperty("Name").IsFixedLength()));
971+
Assert.True(model.FindEntityType("TestNamespace.Employee").GetProperty("Name").IsFixedLength()));
972972

973973
[ConditionalFact]
974974
public Task Global_namespace_works()

‎test/EFCore.Relational.Specification.Tests/Query/AdHocJsonQueryTestBase.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public virtual async Task Optional_json_properties_materialized_as_null_when_the
8585
: query.Single();
8686

8787
Assert.Equal(3, result.Id);
88-
Assert.Equal(null, result.Reference.NullableScalar);
89-
Assert.Equal(null, result.Collection[0].NullableScalar);
88+
Assert.Null(result.Reference.NullableScalar);
89+
Assert.Null(result.Collection[0].NullableScalar);
9090
}
9191
}
9292

@@ -107,8 +107,8 @@ public virtual async Task Can_project_nullable_json_property_when_the_element_in
107107

108108
Assert.Equal(3, result.Count);
109109
Assert.Equal(11, result[0]);
110-
Assert.Equal(null, result[1]);
111-
Assert.Equal(null, result[2]);
110+
Assert.Null(result[1]);
111+
Assert.Null(result[2]);
112112
}
113113
}
114114

‎test/EFCore.Relational.Specification.Tests/TwoDatabasesTestBase.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public virtual void Can_query_from_one_connection_and_save_changes_to_another()
7575

7676
[ConditionalTheory]
7777
[InlineData(true, false)]
78-
[InlineData(true, false)]
7978
[InlineData(true, true)]
8079
public virtual void Can_set_connection_string_in_interceptor(bool withConnectionString, bool withNullConnectionString)
8180
{

‎test/EFCore.Relational.Specification.Tests/Update/JsonUpdateTestBase.cs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,8 @@ public virtual Task Edit_single_property_bool()
772772
async context =>
773773
{
774774
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
775-
Assert.Equal(false, result.Reference.TestBoolean);
776-
Assert.Equal(true, result.Collection[0].TestBoolean);
775+
Assert.False(result.Reference.TestBoolean);
776+
Assert.True(result.Collection[0].TestBoolean);
777777
});
778778

779779
[ConditionalFact]
@@ -1217,8 +1217,8 @@ public virtual Task Edit_single_property_nullable_int32_set_to_null()
12171217
async context =>
12181218
{
12191219
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
1220-
Assert.Equal(null, result.Reference.TestNullableInt32);
1221-
Assert.Equal(null, result.Collection[0].TestNullableInt32);
1220+
Assert.Null(result.Reference.TestNullableInt32);
1221+
Assert.Null(result.Collection[0].TestNullableInt32);
12221222
});
12231223

12241224
[ConditionalFact]
@@ -1305,8 +1305,8 @@ public virtual Task Edit_single_property_nullable_enum_set_to_null()
13051305
async context =>
13061306
{
13071307
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
1308-
Assert.Equal(null, result.Reference.TestNullableEnum);
1309-
Assert.Equal(null, result.Collection[0].TestNullableEnum);
1308+
Assert.Null(result.Reference.TestNullableEnum);
1309+
Assert.Null(result.Collection[0].TestNullableEnum);
13101310
});
13111311

13121312
[ConditionalFact]
@@ -1349,8 +1349,8 @@ public virtual Task Edit_single_property_nullable_enum_with_int_converter_set_to
13491349
async context =>
13501350
{
13511351
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
1352-
Assert.Equal(null, result.Reference.TestNullableEnumWithIntConverter);
1353-
Assert.Equal(null, result.Collection[0].TestNullableEnumWithIntConverter);
1352+
Assert.Null(result.Reference.TestNullableEnumWithIntConverter);
1353+
Assert.Null(result.Collection[0].TestNullableEnumWithIntConverter);
13541354
});
13551355

13561356
[ConditionalFact]
@@ -1393,8 +1393,8 @@ public virtual Task Edit_single_property_nullable_enum_with_converter_that_handl
13931393
async context =>
13941394
{
13951395
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
1396-
Assert.Equal(null, result.Reference.TestNullableEnumWithConverterThatHandlesNulls);
1397-
Assert.Equal(null, result.Collection[0].TestNullableEnumWithConverterThatHandlesNulls);
1396+
Assert.Null(result.Reference.TestNullableEnumWithConverterThatHandlesNulls);
1397+
Assert.Null(result.Collection[0].TestNullableEnumWithConverterThatHandlesNulls);
13981398
});
13991399

14001400
[ConditionalFact]
@@ -1522,7 +1522,7 @@ public virtual Task Edit_single_property_with_converter_bool_to_int_zero_one()
15221522
async context =>
15231523
{
15241524
var result = await context.Set<JsonEntityConverters>().SingleAsync(x => x.Id == 1);
1525-
Assert.Equal(false, result.Reference.BoolConvertedToIntZeroOne);
1525+
Assert.False(result.Reference.BoolConvertedToIntZeroOne);
15261526
});
15271527

15281528
[ConditionalFact]
@@ -1542,7 +1542,7 @@ public virtual Task Edit_single_property_with_converter_bool_to_string_True_Fals
15421542
async context =>
15431543
{
15441544
var result = await context.Set<JsonEntityConverters>().SingleAsync(x => x.Id == 1);
1545-
Assert.Equal(true, result.Reference.BoolConvertedToStringTrueFalse);
1545+
Assert.True(result.Reference.BoolConvertedToStringTrueFalse);
15461546
});
15471547

15481548
[ConditionalFact]
@@ -1562,7 +1562,7 @@ public virtual Task Edit_single_property_with_converter_bool_to_string_Y_N()
15621562
async context =>
15631563
{
15641564
var result = await context.Set<JsonEntityConverters>().SingleAsync(x => x.Id == 1);
1565-
Assert.Equal(false, result.Reference.BoolConvertedToStringYN);
1565+
Assert.False(result.Reference.BoolConvertedToStringYN);
15661566
});
15671567

15681568
[ConditionalFact]
@@ -2227,8 +2227,8 @@ public virtual Task Edit_single_property_collection_of_nullable_int32_set_to_nul
22272227
async context =>
22282228
{
22292229
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
2230-
Assert.Equal(null, result.Reference.TestNullableInt32Collection);
2231-
Assert.Equal(null, result.Collection[0].TestNullableInt32Collection);
2230+
Assert.Null(result.Reference.TestNullableInt32Collection);
2231+
Assert.Null(result.Collection[0].TestNullableInt32Collection);
22322232

22332233
Assert.True(result.Reference.NewCollectionSet); // Set to null.
22342234
Assert.True(result.Collection[0].NewCollectionSet); // Set to null.
@@ -2327,8 +2327,8 @@ public virtual Task Edit_single_property_collection_of_nullable_enum_set_to_null
23272327
async context =>
23282328
{
23292329
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
2330-
Assert.Equal(null, result.Reference.TestNullableEnumCollection);
2331-
Assert.Equal(null, result.Collection[0].TestNullableEnumCollection);
2330+
Assert.Null(result.Reference.TestNullableEnumCollection);
2331+
Assert.Null(result.Collection[0].TestNullableEnumCollection);
23322332

23332333
Assert.True(result.Reference.NewCollectionSet); // Set to null.
23342334
Assert.True(result.Collection[0].NewCollectionSet); // Set to null.
@@ -2383,8 +2383,8 @@ public virtual Task Edit_single_property_collection_of_nullable_enum_with_int_co
23832383
async context =>
23842384
{
23852385
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
2386-
Assert.Equal(null, result.Reference.TestNullableEnumWithIntConverterCollection);
2387-
Assert.Equal(null, result.Collection[0].TestNullableEnumWithIntConverterCollection);
2386+
Assert.Null(result.Reference.TestNullableEnumWithIntConverterCollection);
2387+
Assert.Null(result.Collection[0].TestNullableEnumWithIntConverterCollection);
23882388

23892389
Assert.True(result.Reference.NewCollectionSet); // Set to null.
23902390
Assert.True(result.Collection[0].NewCollectionSet); // Set to null.
@@ -2434,8 +2434,8 @@ public virtual Task Edit_single_property_collection_of_nullable_enum_with_conver
24342434
async context =>
24352435
{
24362436
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
2437-
Assert.Equal(null, result.Reference.TestNullableEnumWithConverterThatHandlesNullsCollection);
2438-
Assert.Equal(null, result.Collection[0].TestNullableEnumWithConverterThatHandlesNullsCollection);
2437+
Assert.Null(result.Reference.TestNullableEnumWithConverterThatHandlesNullsCollection);
2438+
Assert.Null(result.Collection[0].TestNullableEnumWithConverterThatHandlesNullsCollection);
24392439

24402440
Assert.False(result.Reference.NewCollectionSet);
24412441
Assert.False(result.Collection[0].NewCollectionSet);
@@ -2878,7 +2878,7 @@ public virtual Task Edit_single_property_relational_collection_of_nullable_int32
28782878
async context =>
28792879
{
28802880
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
2881-
Assert.Equal(null, result.TestNullableInt32Collection);
2881+
Assert.Null(result.TestNullableInt32Collection);
28822882

28832883
Assert.True(result.NewCollectionSet); // Set to null.
28842884
});
@@ -2966,7 +2966,7 @@ public virtual Task Edit_single_property_relational_collection_of_nullable_enum_
29662966
async context =>
29672967
{
29682968
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
2969-
Assert.Equal(null, result.TestNullableEnumCollection);
2969+
Assert.Null(result.TestNullableEnumCollection);
29702970

29712971
Assert.True(result.NewCollectionSet); // Set to null.
29722972
});
@@ -3013,7 +3013,7 @@ public virtual Task Edit_single_property_relational_collection_of_nullable_enum_
30133013
async context =>
30143014
{
30153015
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
3016-
Assert.Equal(null, result.TestNullableEnumWithIntConverterCollection);
3016+
Assert.Null(result.TestNullableEnumWithIntConverterCollection);
30173017

30183018
Assert.True(result.NewCollectionSet); // Set to null.
30193019
});
@@ -3057,7 +3057,7 @@ public virtual Task Edit_single_property_relational_collection_of_nullable_enum_
30573057
async context =>
30583058
{
30593059
var result = await context.Set<JsonEntityAllTypes>().SingleAsync(x => x.Id == 1);
3060-
Assert.Equal(null, result.TestNullableEnumWithConverterThatHandlesNullsCollection);
3060+
Assert.Null(result.TestNullableEnumWithConverterThatHandlesNullsCollection);
30613061

30623062
Assert.False(result.NewCollectionSet);
30633063
});

0 commit comments

Comments
 (0)