Skip to content

Commit b70b486

Browse files
samsmithnzsamsmithnz
committed
updated tests
1 parent 7295aaa commit b70b486

20 files changed

+131
-131
lines changed

‎src/SamSmithNZ.Tests/GuitarTab/RatingDataAccessTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public async Task RatingsExistTest()
2222
List<Rating> results = await controller.GetRatings();
2323

2424
//assert
25-
Assert.IsTrue(results != null);
26-
Assert.IsTrue(results.Count > 0);
25+
Assert.IsNotNull(results);
26+
Assert.IsNotEmpty(results);
2727
}
2828

2929
[TestMethod()]
@@ -34,12 +34,12 @@ public async Task RatingsFirstItemTest()
3434

3535
//act
3636
List<Rating> results = await controller.GetRatings();
37-
37+
3838
//assert
39-
Assert.IsTrue(results != null);
40-
Assert.IsTrue(results.Count > 0);
41-
Assert.IsTrue(results[0].RatingCode == 0);
42-
Assert.IsTrue(results[1].RatingCode == 1);
39+
Assert.IsNotNull(results);
40+
Assert.IsNotEmpty(results);
41+
Assert.AreEqual(0, results[0].RatingCode);
42+
Assert.AreEqual(1, results[1].RatingCode);
4343
}
4444

4545
}

‎src/SamSmithNZ.Tests/GuitarTab/SearchDataAccessTest.cs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public async Task SearchTabItemsExistTest()
2727
List<Search> results = await controller.GetSearchResults(searchText, recordId);
2828

2929
//assert
30-
Assert.IsTrue(results != null);
31-
Assert.IsTrue(results.Count == 2);
30+
Assert.IsNotNull(results);
31+
Assert.HasCount(2, results);
3232
}
3333

3434
//3. Specific Search Tab 14
@@ -44,15 +44,15 @@ public async Task SearchTabFirstItemTest()
4444
List<Search> results = await controller.GetSearchResults(searchText, recordId);
4545

4646
//assert
47-
Assert.IsTrue(results != null);
48-
Assert.IsTrue(results.Count >= 0);
49-
Assert.IsTrue(results[0] != null);
50-
Assert.IsTrue(results[0].AlbumCode == 14);
51-
Assert.IsTrue(results[0].ArtistAlbumResult == "Foo Fighters - The Colour And The Shape");
52-
Assert.IsTrue(results[0].IsBassTab == false);
53-
Assert.IsTrue(results[0].TrackName == "Everlong");
54-
Assert.IsTrue(results[0].TrackResult == "11. Everlong");
55-
Assert.IsTrue(results[0].SearchText == "Everlong");
47+
Assert.IsNotNull(results);
48+
Assert.IsGreaterThanOrEqualTo(0, results.Count);
49+
Assert.IsNotNull(results[0]);
50+
Assert.AreEqual(14, results[0].AlbumCode);
51+
Assert.AreEqual("Foo Fighters - The Colour And The Shape", results[0].ArtistAlbumResult);
52+
Assert.IsFalse(results[0].IsBassTab);
53+
Assert.AreEqual("Everlong", results[0].TrackName);
54+
Assert.AreEqual("11. Everlong", results[0].TrackResult);
55+
Assert.AreEqual("Everlong", results[0].SearchText);
5656

5757
}
5858

@@ -67,22 +67,22 @@ public async Task SearchBigTest()
6767
List<Search> results = await controller.GetSearchResults(searchText);
6868

6969
//assert
70-
Assert.IsTrue(results != null);
71-
Assert.IsTrue(results.Count >= 19);
72-
Assert.IsTrue(results[0] != null);
73-
Assert.IsTrue(results[0].AlbumCode == 168);
74-
Assert.IsTrue(results[0].ArtistAlbumResult == "Cure - Disintegration");
75-
Assert.IsTrue(results[0].IsBassTab == false);
76-
Assert.IsTrue(results[0].TrackName == "Homesick");
77-
Assert.IsTrue(results[0].TrackResult == "11. Homesick");
78-
Assert.IsTrue(results[0].SearchText == "home");
79-
Assert.IsTrue(results[1] != null);
80-
Assert.IsTrue(results[1].AlbumCode == 203);
81-
Assert.IsTrue(results[1].ArtistAlbumResult == "Foo Fighters - Echoes, Silence, Patience And Grace");
82-
Assert.IsTrue(results[1].IsBassTab == false);
83-
Assert.IsTrue(results[1].TrackName == "Home");
84-
Assert.IsTrue(results[1].TrackResult == "12. Home");
85-
Assert.IsTrue(results[1].SearchText == "home");
70+
Assert.IsNotNull(results);
71+
Assert.IsGreaterThanOrEqualTo(19, results.Count);
72+
Assert.IsNotNull(results[0]);
73+
Assert.AreEqual(168, results[0].AlbumCode);
74+
Assert.AreEqual("Cure - Disintegration", results[0].ArtistAlbumResult);
75+
Assert.IsFalse(results[0].IsBassTab);
76+
Assert.AreEqual("Homesick", results[0].TrackName);
77+
Assert.AreEqual("11. Homesick", results[0].TrackResult);
78+
Assert.AreEqual("home", results[0].SearchText);
79+
Assert.IsNotNull(results[1]);
80+
Assert.AreEqual(203, results[1].AlbumCode);
81+
Assert.AreEqual("Foo Fighters - Echoes, Silence, Patience And Grace", results[1].ArtistAlbumResult);
82+
Assert.IsFalse(results[1].IsBassTab);
83+
Assert.AreEqual("Home", results[1].TrackName);
84+
Assert.AreEqual("12. Home", results[1].TrackResult);
85+
Assert.AreEqual("home", results[1].SearchText);
8686
}
8787

8888
[TestMethod()]
@@ -96,8 +96,8 @@ public async Task SearchEncodedTextTest()
9696
List<Search> results = await controller.GetSearchResults(searchText);
9797

9898
//assert
99-
Assert.IsTrue(results != null);
100-
Assert.AreEqual(0, results.Count);
99+
Assert.IsNotNull(results);
100+
Assert.IsEmpty(results);
101101
}
102102

103103
}

‎src/SamSmithNZ.Tests/GuitarTab/TabDataAccessTest.cs‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public async Task TabsExistTest()
2929
List<Tab> results = await controller.GetTabs(albumCode, sortOrder);
3030

3131
//assert
32-
Assert.IsTrue(results != null);
33-
Assert.IsTrue(results.Count > 0);
32+
Assert.IsNotNull(results);
33+
Assert.IsNotEmpty(results);
3434
}
3535

3636
//3. Get tab 500/Everlong
@@ -45,16 +45,16 @@ public async Task TabFirstItemTest()
4545
Tab results = await controller.GetTab(tabCode); //Tab code of 500/Everlong
4646

4747
//assert
48-
Assert.IsTrue(results != null);
49-
Assert.IsTrue(results.AlbumCode == 14);
50-
Assert.IsTrue(results.Rating == 5);
51-
Assert.IsTrue(results.TabCode == 500);
52-
Assert.IsTrue(results.TabName == "Everlong");
53-
Assert.IsTrue(results.TabNameTrimed == "Everlong");
54-
Assert.IsTrue(results.TabOrder == 11);
55-
Assert.IsTrue(results.TabText.Length == 7477);
56-
Assert.IsTrue(results.TuningCode == 2);
57-
Assert.IsTrue(results.TuningName == "Drop D Tuning");
48+
Assert.IsNotNull(results);
49+
Assert.AreEqual(14, results.AlbumCode);
50+
Assert.AreEqual(5, results.Rating);
51+
Assert.AreEqual(500, results.TabCode);
52+
Assert.AreEqual("Everlong", results.TabName);
53+
Assert.AreEqual("Everlong", results.TabNameTrimed);
54+
Assert.AreEqual(11, results.TabOrder);
55+
Assert.AreEqual(7477, results.TabText.Length);
56+
Assert.AreEqual(2, results.TuningCode);
57+
Assert.AreEqual("Drop D Tuning", results.TuningName);
5858
Assert.IsTrue(results.LastUpdated > DateTime.MinValue);
5959
}
6060

@@ -70,7 +70,7 @@ public async Task Tab0ItemTest()
7070
Tab results = await controller.GetTab(tabCode); //Tab code of 0/nothing
7171

7272
//assert
73-
Assert.IsTrue(results == null);
73+
Assert.IsNull(results);
7474
}
7575

7676
//Test album 14, sorted by track
@@ -86,24 +86,24 @@ public async Task TabAlbumSortedbyTrackOrderTest()
8686
List<Tab> results = await controller.GetTabs(albumCode, sortOrder);
8787

8888
//assert
89-
Assert.IsTrue(results != null);
90-
Assert.IsTrue(results.Count == 13);
89+
Assert.IsNotNull(results);
90+
Assert.AreEqual(13, results.Count);
9191
int i = 0;
9292
foreach (Tab result in results)
9393
{
9494
i++;
9595
if (result.TabCode == 500)
9696
{
97-
Assert.IsTrue(i == 11);
98-
Assert.IsTrue(result.AlbumCode == 14);
99-
Assert.IsTrue(result.Rating == 5);
100-
Assert.IsTrue(result.TabCode == 500);
101-
Assert.IsTrue(result.TabName == "Everlong");
102-
Assert.IsTrue(result.TabNameTrimed == "Everlong");
103-
Assert.IsTrue(result.TabOrder == 11);
104-
Assert.IsTrue(result.TabText.Length == 7477);
105-
Assert.IsTrue(result.TuningCode == 2);
106-
Assert.IsTrue(result.TuningName == "Drop D Tuning");
97+
Assert.AreEqual(11, i);
98+
Assert.AreEqual(14, result.AlbumCode);
99+
Assert.AreEqual(5, result.Rating);
100+
Assert.AreEqual(500, result.TabCode);
101+
Assert.AreEqual("Everlong", result.TabName);
102+
Assert.AreEqual("Everlong", result.TabNameTrimed);
103+
Assert.AreEqual(11, result.TabOrder);
104+
Assert.AreEqual(7477, result.TabText.Length);
105+
Assert.AreEqual(2, result.TuningCode);
106+
Assert.AreEqual("Drop D Tuning", result.TuningName);
107107
Assert.IsTrue(result.LastUpdated > DateTime.MinValue);
108108
break;
109109
}
@@ -130,16 +130,16 @@ public async Task TabAlbumSortedbyTuningTest()
130130
i++;
131131
if (result.TabCode == 500)
132132
{
133-
Assert.IsTrue(i == 5); //Is 5th in the tab order when sorting by tuning
134-
Assert.IsTrue(result.AlbumCode == 14);
135-
Assert.IsTrue(result.Rating == 5);
136-
Assert.IsTrue(result.TabCode == 500);
137-
Assert.IsTrue(result.TabName == "Everlong");
138-
Assert.IsTrue(result.TabNameTrimed == "Everlong");
139-
Assert.IsTrue(result.TabOrder == 11);
140-
Assert.IsTrue(result.TabText.Length == 7477);
141-
Assert.IsTrue(result.TuningCode == 2);
142-
Assert.IsTrue(result.TuningName == "Drop D Tuning");
133+
Assert.AreEqual(5, i); //Is 5th in the tab order when sorting by tuning
134+
Assert.AreEqual(14, result.AlbumCode);
135+
Assert.AreEqual(5, result.Rating);
136+
Assert.AreEqual(500, result.TabCode);
137+
Assert.AreEqual("Everlong", result.TabName);
138+
Assert.AreEqual("Everlong", result.TabNameTrimed);
139+
Assert.AreEqual(11, result.TabOrder);
140+
Assert.AreEqual(7477, result.TabText.Length);
141+
Assert.AreEqual(2, result.TuningCode);
142+
Assert.AreEqual("Drop D Tuning", result.TuningName);
143143
Assert.IsTrue(result.LastUpdated > DateTime.MinValue);
144144
break;
145145
}
@@ -170,13 +170,13 @@ public async Task TabSaveAndDeleteTest()
170170
List<Tab> results = await controller.GetTabs(albumCode, sortOrder);
171171

172172
//assert part 2: check that the track is correct
173-
Assert.IsTrue(results != null);
174-
Assert.IsTrue(results.Count > 0);
175-
Assert.IsTrue(results[0].TabCode > 0);
176-
Assert.IsTrue(results[0].AlbumCode == albumCode);
177-
Assert.IsTrue(results[0].TabName == "Test track 14");
178-
Assert.IsTrue(results[0].TabNameTrimed == "Testtrack14");
179-
Assert.IsTrue(results[0].TabText == "Test track text 14");
173+
Assert.IsNotNull(results);
174+
Assert.IsNotEmpty(results);
175+
Assert.IsGreaterThan(0, results[0].TabCode);
176+
Assert.AreEqual(albumCode, results[0].AlbumCode);
177+
Assert.AreEqual("Test track 14", results[0].TabName);
178+
Assert.AreEqual("Testtrack14", results[0].TabNameTrimed);
179+
Assert.AreEqual("Test track text 14", results[0].TabText);
180180
Assert.IsTrue(results[0].LastUpdated > DateTime.MinValue);
181181

182182
//act part 3: delete the tracks
@@ -189,8 +189,8 @@ public async Task TabSaveAndDeleteTest()
189189
results = await controller.GetTabs(albumCode, sortOrder);
190190

191191
//assert part 4: check that the tracks have all been deleted
192-
Assert.IsTrue(results != null);
193-
Assert.AreEqual(0, results.Count);
192+
Assert.IsNotNull(results);
193+
Assert.IsEmpty(results);
194194
}
195195

196196
}

‎src/SamSmithNZ.Tests/GuitarTab/TrackOrderDataAccessTest.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public async Task TrackOrderExistTest()
2222
List<TrackOrder> results = await controller.GetTrackOrders();
2323

2424
//assert
25-
Assert.IsTrue(results != null);
26-
Assert.IsTrue(results.Count > 0);
25+
Assert.IsNotNull(results);
26+
Assert.IsNotEmpty(results);
2727
}
2828

2929
[TestMethod()]
@@ -36,12 +36,12 @@ public async Task TuningsFirstItemTest()
3636
List<TrackOrder> results = await controller.GetTrackOrders();
3737

3838
//assert
39-
Assert.IsTrue(results != null);
40-
Assert.IsTrue(results.Count >= 2);
41-
Assert.IsTrue(results[0].SortOrderCode == 0);
42-
Assert.IsTrue(results[0].SortOrderName != "[unknown]");
43-
Assert.IsTrue(results[1].SortOrderCode == 1);
44-
Assert.IsTrue(results[1].SortOrderName != "");
39+
Assert.IsNotNull(results);
40+
Assert.IsGreaterThanOrEqualTo(2, results.Count);
41+
Assert.AreEqual(0, results[0].SortOrderCode);
42+
Assert.AreNotEqual("[unknown]", results[0].SortOrderName);
43+
Assert.AreEqual(1, results[1].SortOrderCode);
44+
Assert.AreNotEqual("", results[1].SortOrderName);
4545
}
4646
}
4747
}

‎src/SamSmithNZ.Tests/GuitarTab/TuningDataAccessTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public async Task TuningsExistTest()
2222
List<Tuning> results = await controller.GetTunings();
2323

2424
//assert
25-
Assert.IsTrue(results != null);
26-
Assert.IsTrue(results.Count > 0);
25+
Assert.IsNotNull(results);
26+
Assert.IsNotEmpty(results);
2727
}
2828

2929
[TestMethod()]
@@ -36,10 +36,10 @@ public async Task TuningsFirstItemTest()
3636
List<Tuning> results = await controller.GetTunings();
3737

3838
//assert
39-
Assert.IsTrue(results != null);
40-
Assert.IsTrue(results.Count > 0);
41-
Assert.IsTrue(results[0].TuningCode == 0);
42-
Assert.IsTrue(results[0].TuningName == "[unknown]");
39+
Assert.IsNotNull(results);
40+
Assert.IsNotEmpty(results);
41+
Assert.AreEqual(0, results[0].TuningCode);
42+
Assert.AreEqual("[unknown]", results[0].TuningName);
4343
}
4444

4545
}

‎src/SamSmithNZ.Tests/WorldCup/GameGoalAssignmentTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public async Task GameGoalAssignmentsExistTest()
2424

2525
//assert
2626
Assert.IsTrue(results != null);
27-
Assert.IsTrue(results.Count > 0);
27+
Assert.IsNotEmpty(results);
2828
}
2929

3030
[TestMethod()]
@@ -39,7 +39,7 @@ public async Task GameGoalAssignmentsFirstItemTest()
3939

4040
//assert
4141
Assert.IsTrue(results != null);
42-
Assert.IsTrue(results.Count > 0);
42+
Assert.IsNotEmpty(results);
4343
Assert.IsTrue(results[0].GameCode > 0);
4444
Assert.IsTrue(results[0].GameNumber > 0);
4545
Assert.IsTrue(results[0].GameTime > DateTime.MinValue);

0 commit comments

Comments
 (0)