Skip to content

Commit 80231b4

Browse files
DominikHeroldNickCraver
DominikHerold
authored and
NickCraver
committed
fix equal tests (#944)
* fix equal tests * fix test
1 parent 17ffdc2 commit 80231b4

File tree

8 files changed

+58
-58
lines changed

8 files changed

+58
-58
lines changed

‎Dapper.Tests/AsyncTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ public async Task TestClassWithStringUsageAsync()
132132
public async Task TestExecuteAsync()
133133
{
134134
var val = await connection.ExecuteAsync("declare @foo table(id int not null); insert @foo values(@id);", new { id = 1 }).ConfigureAwait(false);
135-
val.Equals(1);
135+
Assert.Equal(1, val);
136136
}
137137

138138
[Fact]
139139
public void TestExecuteClosedConnAsyncInner()
140140
{
141141
var query = connection.ExecuteAsync("declare @foo table(id int not null); insert @foo values(@id);", new { id = 1 });
142142
var val = query.Result;
143-
val.Equals(1);
143+
Assert.Equal(1, val);
144144
}
145145

146146
[Fact]

‎Dapper.Tests/DecimalTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,31 +77,31 @@ public void TestDoubleDecimalConversions_SO18228523_RightWay()
7777
{
7878
var row = connection.Query<HasDoubleDecimal>(
7979
"select cast(1 as float) as A, cast(2 as float) as B, cast(3 as decimal) as C, cast(4 as decimal) as D").Single();
80-
row.A.Equals(1.0);
81-
row.B.Equals(2.0);
82-
row.C.Equals(3.0M);
83-
row.D.Equals(4.0M);
80+
Assert.Equal(1.0, row.A);
81+
Assert.Equal(2.0, row.B);
82+
Assert.Equal(3.0M, row.C);
83+
Assert.Equal(4.0M, row.D);
8484
}
8585

8686
[Fact]
8787
public void TestDoubleDecimalConversions_SO18228523_WrongWay()
8888
{
8989
var row = connection.Query<HasDoubleDecimal>(
9090
"select cast(1 as decimal) as A, cast(2 as decimal) as B, cast(3 as float) as C, cast(4 as float) as D").Single();
91-
row.A.Equals(1.0);
92-
row.B.Equals(2.0);
93-
row.C.Equals(3.0M);
94-
row.D.Equals(4.0M);
91+
Assert.Equal(1.0, row.A);
92+
Assert.Equal(2.0, row.B);
93+
Assert.Equal(3.0M, row.C);
94+
Assert.Equal(4.0M, row.D);
9595
}
9696

9797
[Fact]
9898
public void TestDoubleDecimalConversions_SO18228523_Nulls()
9999
{
100100
var row = connection.Query<HasDoubleDecimal>(
101101
"select cast(null as decimal) as A, cast(null as decimal) as B, cast(null as float) as C, cast(null as float) as D").Single();
102-
row.A.Equals(0.0);
102+
Assert.Equal(0.0, row.A);
103103
Assert.Null(row.B);
104-
row.C.Equals(0.0M);
104+
Assert.Equal(0.0M, row.C);
105105
Assert.Null(row.D);
106106
}
107107

‎Dapper.Tests/LiteralTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public void LiteralReplacementEnumAndString()
1313
AnEnum x = (AnEnum)(int)row.x;
1414
decimal y = row.y;
1515
AnotherEnum z = (AnotherEnum)(byte)row.z;
16-
x.Equals(AnEnum.B);
17-
y.Equals(123.45M);
18-
z.Equals(AnotherEnum.A);
16+
Assert.Equal(AnEnum.B, x);
17+
Assert.Equal(123.45M, y);
18+
Assert.Equal(AnotherEnum.A, z);
1919
}
2020

2121
[Fact]
@@ -29,9 +29,9 @@ public void LiteralReplacementDynamicEnumAndString()
2929
AnEnum x = (AnEnum)(int)row.x;
3030
decimal y = row.y;
3131
AnotherEnum z = (AnotherEnum)(byte)row.z;
32-
x.Equals(AnEnum.B);
33-
y.Equals(123.45M);
34-
z.Equals(AnotherEnum.A);
32+
Assert.Equal(AnEnum.B, x);
33+
Assert.Equal(123.45M, y);
34+
Assert.Equal(AnotherEnum.A, z);
3535
}
3636

3737
[Fact]

‎Dapper.Tests/MiscTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ public void TestNullableCharInputAndOutputNull()
675675
public void WorkDespiteHavingWrongStructColumnTypes()
676676
{
677677
var hazInt = connection.Query<CanHazInt>("select cast(1 as bigint) Value").Single();
678-
hazInt.Value.Equals(1);
678+
Assert.Equal(1, hazInt.Value);
679679
}
680680

681681
private struct CanHazInt

‎Dapper.Tests/MultiMapTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -599,15 +599,15 @@ public void TestSplitWithMissingMembers()
599599
(T, P) => { T.Author = P; return T; },
600600
null, null, true, "ID,Name").Single();
601601

602-
result.ID.Equals(123);
603-
result.Title.Equals("abc");
604-
result.CreateDate.Equals(new DateTime(2013, 2, 1));
602+
Assert.Equal(123, result.ID);
603+
Assert.Equal("abc", result.Title);
604+
Assert.Equal(new DateTime(2013, 2, 1), result.CreateDate);
605605
Assert.Null(result.Name);
606606
Assert.Null(result.Content);
607607

608-
result.Author.Phone.Equals("def");
609-
result.Author.Name.Equals("ghi");
610-
result.Author.ID.Equals(0);
608+
Assert.Equal("def", result.Author.Phone);
609+
Assert.Equal("ghi", result.Author.Name);
610+
Assert.Equal(0, result.Author.ID);
611611
Assert.Null(result.Author.Address);
612612
}
613613

‎Dapper.Tests/ParameterTests.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -174,20 +174,20 @@ public void GuidIn_SO_24177902()
174174

175175
// check that rows 2&3 yield guids b&c
176176
var guids = connection.Query<Guid>("select g from #foo where i in (2,3)").ToArray();
177-
guids.Length.Equals(2);
178-
guids.Contains(a).Equals(false);
179-
guids.Contains(b).Equals(true);
180-
guids.Contains(c).Equals(true);
181-
guids.Contains(d).Equals(false);
177+
Assert.Equal(2, guids.Length);
178+
Assert.DoesNotContain(a, guids);
179+
Assert.Contains(b, guids);
180+
Assert.Contains(c, guids);
181+
Assert.DoesNotContain(d, guids);
182182

183183
// in query on the guids
184184
var rows = connection.Query("select * from #foo where g in @guids order by i", new { guids })
185185
.Select(row => new { i = (int)row.i, g = (Guid)row.g }).ToArray();
186-
rows.Length.Equals(2);
187-
rows[0].i.Equals(2);
188-
rows[0].g.Equals(b);
189-
rows[1].i.Equals(3);
190-
rows[1].g.Equals(c);
186+
Assert.Equal(2, rows.Length);
187+
Assert.Equal(2, rows[0].i);
188+
Assert.Equal(b, rows[0].g);
189+
Assert.Equal(3, rows[1].i);
190+
Assert.Equal(c, rows[1].g);
191191
}
192192

193193
[FactUnlessCaseSensitiveDatabase]
@@ -514,8 +514,8 @@ public void DataTableParametersWithExtendedProperty()
514514
public void SupportInit()
515515
{
516516
var obj = connection.Query<WithInit>("select 'abc' as Value").Single();
517-
obj.Value.Equals("abc");
518-
obj.Flags.Equals(31);
517+
Assert.Equal("abc", obj.Value);
518+
Assert.Equal(31, obj.Flags);
519519
}
520520

521521
public class WithInit : ISupportInitialize
@@ -656,7 +656,7 @@ public void SqlHierarchyId_SO18888911()
656656
{
657657
SqlMapper.ResetTypeHandlers();
658658
var row = connection.Query<HazSqlHierarchy>("select 3 as [Id], hierarchyid::Parse('/1/2/3/') as [Path]").Single();
659-
row.Id.Equals(3);
659+
Assert.Equal(3, row.Id);
660660
Assert.NotEqual(default(SqlHierarchyId), row.Path);
661661

662662
var val = connection.Query<SqlHierarchyId>("select @Path", row).Single();
@@ -1189,8 +1189,8 @@ public void Issue151_ExpandoObjectArgsQuery()
11891189
args.Name = "abc";
11901190

11911191
var row = connection.Query("select @Id as [Id], @Name as [Name]", (object)args).Single();
1192-
((int)row.Id).Equals(123);
1193-
((string)row.Name).Equals("abc");
1192+
Assert.Equal(123, (int)row.Id);
1193+
Assert.Equal("abc", (string)row.Name);
11941194
}
11951195

11961196
[Fact]
@@ -1202,8 +1202,8 @@ public void Issue151_ExpandoObjectArgsExec()
12021202
connection.Execute("create table #issue151 (Id int not null, Name nvarchar(20) not null)");
12031203
Assert.Equal(1, connection.Execute("insert #issue151 values(@Id, @Name)", (object)args));
12041204
var row = connection.Query("select Id, Name from #issue151").Single();
1205-
((int)row.Id).Equals(123);
1206-
((string)row.Name).Equals("abc");
1205+
Assert.Equal(123, (int)row.Id);
1206+
Assert.Equal("abc", (string)row.Name);
12071207
}
12081208

12091209
[Fact]

‎Dapper.Tests/QueryMultipleTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ public void TestQueryMultipleBuffered()
1818
var c = grid.Read<int>();
1919
var d = grid.Read<int>();
2020

21-
a.Single().Equals(1);
22-
b.Single().Equals(2);
23-
c.Single().Equals(3);
24-
d.Single().Equals(4);
21+
Assert.Equal(1, a.Single());
22+
Assert.Equal(2, b.Single());
23+
Assert.Equal(3, c.Single());
24+
Assert.Equal(4, d.Single());
2525
}
2626
}
2727

@@ -53,10 +53,10 @@ public void TestQueryMultipleNonBufferedCorrectOrder()
5353
var c = grid.Read<int>(false).Single();
5454
var d = grid.Read<int>(false).Single();
5555

56-
a.Equals(1);
57-
b.Equals(2);
58-
c.Equals(3);
59-
d.Equals(4);
56+
Assert.Equal(1, a);
57+
Assert.Equal(2, b);
58+
Assert.Equal(3, c);
59+
Assert.Equal(4, d);
6060
}
6161
}
6262

‎Dapper.Tests/TypeHandlerTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -576,20 +576,20 @@ public class WrongTypes
576576
public void TestWrongTypes_WithRightTypes()
577577
{
578578
var item = connection.Query<WrongTypes>("select 1 as A, cast(2.0 as float) as B, cast(3 as bigint) as C, cast(1 as bit) as D").Single();
579-
item.A.Equals(1);
580-
item.B.Equals(2.0);
581-
item.C.Equals(3L);
582-
item.D.Equals(true);
579+
Assert.Equal(1, item.A);
580+
Assert.Equal(2.0, item.B);
581+
Assert.Equal(3L, item.C);
582+
Assert.True(item.D);
583583
}
584584

585585
[Fact]
586586
public void TestWrongTypes_WithWrongTypes()
587587
{
588588
var item = connection.Query<WrongTypes>("select cast(1.0 as float) as A, 2 as B, 3 as C, cast(1 as bigint) as D").Single();
589-
item.A.Equals(1);
590-
item.B.Equals(2.0);
591-
item.C.Equals(3L);
592-
item.D.Equals(true);
589+
Assert.Equal(1, item.A);
590+
Assert.Equal(2.0, item.B);
591+
Assert.Equal(3L, item.C);
592+
Assert.True(item.D);
593593
}
594594

595595
[Fact]

0 commit comments

Comments
 (0)