Skip to content

Commit 6a0cf9a

Browse files
CedXCedX
committed
Update the tests
1 parent 1388209 commit 6a0cf9a

4 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎Tests/Command/SqlOrderHintCollection.Tests.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,26 @@ public void Contains() {
4343
public void ImplicitConversion() {
4444
// It should create a collection from the specified array of column names.
4545
SqlOrderHintCollection collection = new object[] { "ID", "Name" };
46-
CollectionAssert.AreEqual(new[] { "ID", "Name" }, collection.Select(parameter => parameter.Column).ToArray());
47-
CollectionAssert.AreEqual(new[] { SortOrder.Ascending, SortOrder.Ascending }, collection.Select(parameter => parameter.SortOrder).ToArray());
46+
AreSequenceEqual(["ID", "Name"], collection.Select(parameter => parameter.Column));
47+
AreSequenceEqual([SortOrder.Ascending, SortOrder.Ascending], collection.Select(parameter => parameter.SortOrder));
4848

4949
collection = new string[] { "ID", "Name" };
50-
CollectionAssert.AreEqual(new[] { "ID", "Name" }, collection.Select(parameter => parameter.Column).ToArray());
51-
CollectionAssert.AreEqual(new[] { SortOrder.Ascending, SortOrder.Ascending }, collection.Select(parameter => parameter.SortOrder).ToArray());
50+
AreSequenceEqual(["ID", "Name"], collection.Select(parameter => parameter.Column));
51+
AreSequenceEqual([SortOrder.Ascending, SortOrder.Ascending], collection.Select(parameter => parameter.SortOrder));
5252

5353
// It should create a collection from the specified list of column names.
5454
collection = new List<string> { "ID", "Name" };
55-
CollectionAssert.AreEqual(new[] { "ID", "Name" }, collection.Select(parameter => parameter.Column).ToArray());
56-
CollectionAssert.AreEqual(new[] { SortOrder.Ascending, SortOrder.Ascending }, collection.Select(parameter => parameter.SortOrder).ToArray());
55+
AreSequenceEqual(["ID", "Name"], collection.Select(parameter => parameter.Column));
56+
AreSequenceEqual([SortOrder.Ascending, SortOrder.Ascending], collection.Select(parameter => parameter.SortOrder));
5757

5858
// It should create a collection from the specified dictionary of column names and sort orders.
5959
collection = new OrderedDictionary { ["ID"] = "Descending", ["Name"] = "Ascending" };
60-
CollectionAssert.AreEqual(new[] { "ID", "Name" }, collection.Select(parameter => parameter.Column).ToArray());
61-
CollectionAssert.AreEqual(new[] { SortOrder.Descending, SortOrder.Ascending }, collection.Select(parameter => parameter.SortOrder).ToArray());
60+
AreSequenceEqual(["ID", "Name"], collection.Select(parameter => parameter.Column));
61+
AreSequenceEqual([SortOrder.Descending, SortOrder.Ascending], collection.Select(parameter => parameter.SortOrder));
6262

6363
collection = new OrderedDictionary<string, SortOrder> { ["ID"] = SortOrder.Descending, ["Name"] = SortOrder.Ascending };
64-
CollectionAssert.AreEqual(new[] { "ID", "Name" }, collection.Select(parameter => parameter.Column).ToArray());
65-
CollectionAssert.AreEqual(new[] { SortOrder.Descending, SortOrder.Ascending }, collection.Select(parameter => parameter.SortOrder).ToArray());
64+
AreSequenceEqual(["ID", "Name"], collection.Select(parameter => parameter.Column));
65+
AreSequenceEqual([SortOrder.Descending, SortOrder.Ascending], collection.Select(parameter => parameter.SortOrder));
6666
}
6767

6868
[TestMethod]

‎Tests/Command/SqlParameterCollection.Tests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,23 @@ public void Contains() {
6363
public void ImplicitConversion() {
6464
// It should create a collection from the specified array of positional parameters.
6565
SqlParameterCollection collection = new object[] { "foo", "bar" };
66-
CollectionAssert.AreEqual(new[] { "?1", "?2" }, collection.Select(parameter => parameter.Name).ToArray());
67-
CollectionAssert.AreEqual(new[] { "foo", "bar" }, collection.Select(parameter => parameter.Value).ToArray());
66+
AreSequenceEqual(["?1", "?2"], collection.Select(parameter => parameter.Name));
67+
AreSequenceEqual(["foo", "bar"], collection.Select(parameter => parameter.Value));
6868

6969
// It should create a collection from the specified list of positional parameters.
7070
collection = new List<object?> { "foo", "bar" };
71-
CollectionAssert.AreEqual(new[] { "?1", "?2" }, collection.Select(parameter => parameter.Name).ToArray());
72-
CollectionAssert.AreEqual(new[] { "foo", "bar" }, collection.Select(parameter => parameter.Value).ToArray());
71+
AreSequenceEqual(["?1", "?2"], collection.Select(parameter => parameter.Name));
72+
AreSequenceEqual(["foo", "bar"], collection.Select(parameter => parameter.Value));
7373

7474
// It should create a collection from the specified dictionary of named parameters.
7575
collection = new Dictionary<string, object?> { ["foo"] = "bar", ["baz"] = "qux" };
76-
CollectionAssert.AreEquivalent(new[] { "@foo", "@baz" }, collection.Select(parameter => parameter.Name).ToArray());
77-
CollectionAssert.AreEquivalent(new[] { "bar", "qux" }, collection.Select(parameter => parameter.Value).ToArray());
76+
AreSequenceEqual(["@foo", "@baz"], collection.Select(parameter => parameter.Name));
77+
AreSequenceEqual(["bar", "qux"], collection.Select(parameter => parameter.Value));
7878

7979
// It should create a collection from the specified hash table of named parameters.
8080
collection = new Hashtable { ["foo"] = "bar", ["baz"] = "qux" };
81-
CollectionAssert.AreEquivalent(new[] { "@foo", "@baz" }, collection.Select(parameter => parameter.Name).ToArray());
82-
CollectionAssert.AreEquivalent(new[] { "bar", "qux" }, collection.Select(parameter => parameter.Value).ToArray());
81+
AreSequenceEqual(["@foo", "@baz"], collection.Select(parameter => parameter.Name), SequenceOrder.InAnyOrder);
82+
AreSequenceEqual(["bar", "qux"], collection.Select(parameter => parameter.Value), SequenceOrder.InAnyOrder);
8383
}
8484

8585
[TestMethod]

‎Tests/Mapping/DbTableInfo.Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void Columns() {
1313

1414
var columns = new DbTableInfo(typeof(Character)).Columns;
1515
HasCount(5, columns);
16-
CollectionAssert.AreEquivalent(new[] { "firstName", "fullName", "gender", "ID", "lastName" }, columns.Keys.ToArray());
16+
AreSequenceEqual(["firstName", "fullName", "gender", "ID", "lastName"], columns.Keys);
1717
}
1818

1919
[TestMethod]

‎Tests/Mapping/SqlMapper.Tests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,23 +168,23 @@ public void SplitOn() {
168168
// It should return a dictionary equivalent to the specified data row.
169169
var records = SqlMapper.SplitOn(record);
170170
HasCount(1, records);
171-
CollectionAssert.AreEqual(properties, records[0]);
171+
AreSequenceEqual(properties, records[0]);
172172

173173
// It should not split the data row if the specified field does not exist.
174174
records = SqlMapper.SplitOn(record, "_NonExistent_");
175175
HasCount(1, records);
176-
CollectionAssert.AreEqual(properties, records[0]);
176+
AreSequenceEqual(properties, records[0]);
177177

178178
// It should split the data row according to the specified fields.
179179
records = SqlMapper.SplitOn(record, "id");
180180
HasCount(2, records);
181-
CollectionAssert.AreEqual(new Dictionary<string, object?> { ["Id"] = 123, ["LongLabel"] = "Hello World!", ["ShortLabel"] = null }, records[0]);
182-
CollectionAssert.AreEqual(new Dictionary<string, object?> { ["Id"] = 456, ["FirstName"] = "Cédric", ["LastName"] = "Belin", ["RowID"] = 789 }, records[1]);
181+
AreSequenceEqual(new Dictionary<string, object?> { ["Id"] = 123, ["LongLabel"] = "Hello World!", ["ShortLabel"] = null }, records[0]);
182+
AreSequenceEqual(new Dictionary<string, object?> { ["Id"] = 456, ["FirstName"] = "Cédric", ["LastName"] = "Belin", ["RowID"] = 789 }, records[1]);
183183

184184
records = SqlMapper.SplitOn(record, "id", "rowid", "_Unused_");
185185
HasCount(3, records);
186-
CollectionAssert.AreEqual(new Dictionary<string, object?> { ["Id"] = 123, ["LongLabel"] = "Hello World!", ["ShortLabel"] = null }, records[0]);
187-
CollectionAssert.AreEqual(new Dictionary<string, object?> { ["Id"] = 456, ["FirstName"] = "Cédric", ["LastName"] = "Belin" }, records[1]);
188-
CollectionAssert.AreEqual(new Dictionary<string, object?> { ["RowID"] = 789 }, records[2]);
186+
AreSequenceEqual(new Dictionary<string, object?> { ["Id"] = 123, ["LongLabel"] = "Hello World!", ["ShortLabel"] = null }, records[0]);
187+
AreSequenceEqual(new Dictionary<string, object?> { ["Id"] = 456, ["FirstName"] = "Cédric", ["LastName"] = "Belin" }, records[1]);
188+
AreSequenceEqual(new Dictionary<string, object?> { ["RowID"] = 789 }, records[2]);
189189
}
190190
}

0 commit comments

Comments
 (0)