Skip to content

Commit 4722a80

Browse files
committed
Migrate the rest of the test suites to Assert.That
1 parent ffb861c commit 4722a80

Some content is hidden

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

62 files changed

+832
-774
lines changed

dotnet/test/common/ClearTest.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void WritableTextInputShouldClear()
3131
driver.Url = readOnlyPage;
3232
IWebElement element = driver.FindElement(By.Id("writableTextInput"));
3333
element.Clear();
34-
Assert.AreEqual(string.Empty, element.GetAttribute("value"));
34+
Assert.That(element.GetAttribute("value"), Is.Empty);
3535
}
3636

3737
[Test]
@@ -42,15 +42,19 @@ public void TextInputShouldNotClearWhenDisabled()
4242
driver.Url = readOnlyPage;
4343
IWebElement element = driver.FindElement(By.Id("textInputNotEnabled"));
4444
Assert.That(element.Enabled, Is.False);
45-
Assert.That(() => element.Clear(), Throws.InstanceOf<InvalidElementStateException>());
45+
Assert.That(
46+
() => element.Clear(),
47+
Throws.InstanceOf<InvalidElementStateException>());
4648
}
4749

4850
[Test]
4951
public void TextInputShouldNotClearWhenReadOnly()
5052
{
5153
driver.Url = readOnlyPage;
5254
IWebElement element = driver.FindElement(By.Id("readOnlyTextInput"));
53-
Assert.That(() => element.Clear(), Throws.InstanceOf<InvalidElementStateException>());
55+
Assert.That(
56+
() => element.Clear(),
57+
Throws.InstanceOf<InvalidElementStateException>());
5458
}
5559

5660
[Test]
@@ -59,7 +63,7 @@ public void WritableTextAreaShouldClear()
5963
driver.Url = readOnlyPage;
6064
IWebElement element = driver.FindElement(By.Id("writableTextArea"));
6165
element.Clear();
62-
Assert.AreEqual(string.Empty, element.GetAttribute("value"));
66+
Assert.That(element.GetAttribute("value"), Is.Empty);
6367
}
6468

6569
[Test]
@@ -77,7 +81,9 @@ public void TextAreaShouldNotClearWhenReadOnly()
7781
{
7882
driver.Url = readOnlyPage;
7983
IWebElement element = driver.FindElement(By.Id("textAreaReadOnly"));
80-
Assert.That(() => element.Clear(), Throws.InstanceOf<InvalidElementStateException>());
84+
Assert.That(
85+
() => element.Clear(),
86+
Throws.InstanceOf<InvalidElementStateException>());
8187
}
8288

8389
[Test]
@@ -86,7 +92,8 @@ public void ContentEditableAreaShouldClear()
8692
driver.Url = readOnlyPage;
8793
IWebElement element = driver.FindElement(By.Id("content-editable"));
8894
element.Clear();
89-
Assert.AreEqual(string.Empty, element.Text);
95+
96+
Assert.That(element.Text, Is.Empty);
9097
}
9198

9299
[Test]
@@ -195,9 +202,10 @@ private void ShouldBeAbleToClearInput(By locator, string oldValue, string cleare
195202
{
196203
driver.Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("inputs.html");
197204
IWebElement element = driver.FindElement(locator);
198-
Assert.AreEqual(oldValue, element.GetAttribute("value"));
205+
Assert.That(element.GetAttribute("value"), Is.EqualTo(oldValue));
206+
199207
element.Clear();
200-
Assert.AreEqual(clearedValue, element.GetAttribute("value"));
208+
Assert.That(element.GetAttribute("value"), Is.EqualTo(clearedValue));
201209
}
202210
}
203211
}

dotnet/test/common/ClickScrollingTest.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ public void ShouldBeAbleToClickOnAnElementHiddenByOverflow()
6969
IWebElement link = driver.FindElement(By.Id("line8"));
7070
// This used to throw a MoveTargetOutOfBoundsException - we don't expect it to
7171
link.Click();
72-
Assert.AreEqual("line8", driver.FindElement(By.Id("clicked")).Text);
72+
73+
Assert.That(driver.FindElement(By.Id("clicked")).Text, Is.EqualTo("line8"));
7374
}
7475

7576
[Test]
@@ -109,7 +110,7 @@ public void ShouldNotScrollOverflowElementsWhichAreVisible()
109110
IWebElement item = list.FindElement(By.Id("desired"));
110111
item.Click();
111112
long yOffset = (long)((IJavaScriptExecutor)driver).ExecuteScript("return arguments[0].scrollTop;", list);
112-
Assert.AreEqual(0, yOffset, "Should not have scrolled");
113+
Assert.That(yOffset, Is.Zero, "Should not have scrolled");
113114
}
114115

115116

@@ -122,7 +123,7 @@ public void ShouldNotScrollIfAlreadyScrolledAndElementIsInView()
122123
driver.FindElement(By.Id("button2")).Click();
123124
double scrollTop = GetScrollTop();
124125
driver.FindElement(By.Id("button1")).Click();
125-
Assert.AreEqual(scrollTop, GetScrollTop());
126+
Assert.That(GetScrollTop(), Is.EqualTo(scrollTop));
126127
}
127128

128129
[Test]
@@ -139,7 +140,7 @@ public void ShouldScrollOverflowElementsIfClickPointIsOutOfViewButElementIsInVie
139140
{
140141
driver.Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("scroll5.html");
141142
driver.FindElement(By.Id("inner")).Click();
142-
Assert.AreEqual("clicked", driver.FindElement(By.Id("clicked")).Text);
143+
Assert.That(driver.FindElement(By.Id("clicked")).Text, Is.EqualTo("clicked"));
143144
}
144145

145146
[Test]
@@ -238,7 +239,7 @@ public void ShouldNotScrollWhenGettingElementSize()
238239
driver.Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("scroll3.html");
239240
double scrollTop = GetScrollTop();
240241
Size ignoredSize = driver.FindElement(By.Id("button1")).Size;
241-
Assert.AreEqual(scrollTop, GetScrollTop());
242+
Assert.That(GetScrollTop(), Is.EqualTo(scrollTop));
242243
}
243244

244245
[Test]
@@ -266,7 +267,7 @@ public void ShouldBeAbleToClickInlineTextElementWithChildElementAfterScrolling()
266267
IWebElement label = driver.FindElement(By.Id("wrapper"));
267268
label.Click();
268269
IWebElement checkbox = driver.FindElement(By.Id("check"));
269-
Assert.IsFalse(checkbox.Selected, "Checkbox should not be selected after click");
270+
Assert.That(checkbox.Selected, Is.False, "Checkbox should not be selected after click");
270271
}
271272

272273
private double GetScrollTop()

dotnet/test/common/ClickTest.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void CanClickOnALinkAndFollowIt()
4343
{
4444
driver.FindElement(By.Id("normal")).Click();
4545
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
46-
Assert.AreEqual("XHTML Test Page", driver.Title);
46+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
4747
}
4848

4949
[Test]
@@ -63,7 +63,7 @@ public void CanClickOnAnAnchorAndNotReloadThePage()
6363

6464
bool samePage = (bool)((IJavaScriptExecutor)driver).ExecuteScript("return document.latch");
6565

66-
Assert.AreEqual(true, samePage, "Latch was reset");
66+
Assert.That(samePage, Is.True, "Latch was reset");
6767
}
6868

6969
[Test]
@@ -115,7 +115,7 @@ public void CanClickOnAnElementWithTopSetToANegativeNumber()
115115
driver.FindElement(By.Name("btn")).Click();
116116

117117
string log = driver.FindElement(By.Id("log")).Text;
118-
Assert.AreEqual("click", log);
118+
Assert.That(log, Is.EqualTo("click"));
119119
}
120120

121121
[Test]
@@ -136,7 +136,7 @@ public void ShouldSetRelatedTargetForMouseOver()
136136
}
137137
else
138138
{
139-
Assert.AreEqual("parent matches? true", log);
139+
Assert.That(log, Is.EqualTo("parent matches? true"));
140140
}
141141
}
142142

@@ -145,7 +145,7 @@ public void ShouldClickOnFirstBoundingClientRectWithNonZeroSize()
145145
{
146146
driver.FindElement(By.Id("twoClientRects")).Click();
147147
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
148-
Assert.AreEqual("XHTML Test Page", driver.Title);
148+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
149149
}
150150

151151
[Test]
@@ -158,7 +158,7 @@ public void ShouldOnlyFollowHrefOnce()
158158

159159
driver.FindElement(By.Id("new-window")).Click();
160160
WaitFor(() => { return driver.WindowHandles.Count >= windowHandlesBefore + 1; }, "Window handles was not " + (windowHandlesBefore + 1).ToString());
161-
Assert.AreEqual(windowHandlesBefore + 1, driver.WindowHandles.Count);
161+
Assert.That(driver.WindowHandles, Has.Exactly(windowHandlesBefore + 1).Items);
162162
}
163163

164164
[Test]
@@ -176,23 +176,23 @@ public void CanClickOnALinkWithEnclosedImage()
176176
{
177177
driver.FindElement(By.Id("link-with-enclosed-image")).Click();
178178
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
179-
Assert.AreEqual("XHTML Test Page", driver.Title);
179+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
180180
}
181181

182182
[Test]
183183
public void CanClickOnAnImageEnclosedInALink()
184184
{
185185
driver.FindElement(By.Id("link-with-enclosed-image")).FindElement(By.TagName("img")).Click();
186186
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
187-
Assert.AreEqual("XHTML Test Page", driver.Title);
187+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
188188
}
189189

190190
[Test]
191191
public void CanClickOnALinkThatContainsTextWrappedInASpan()
192192
{
193193
driver.FindElement(By.Id("link-with-enclosed-span")).Click();
194194
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
195-
Assert.AreEqual("XHTML Test Page", driver.Title);
195+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
196196
}
197197

198198
[Test]
@@ -201,15 +201,15 @@ public void CanClickOnALinkThatContainsEmbeddedBlockElements()
201201
{
202202
driver.FindElement(By.Id("embeddedBlock")).Click();
203203
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
204-
Assert.AreEqual("XHTML Test Page", driver.Title);
204+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
205205
}
206206

207207
[Test]
208208
public void CanClickOnAnElementEnclosedInALink()
209209
{
210210
driver.FindElement(By.Id("link-with-enclosed-span")).FindElement(By.TagName("span")).Click();
211211
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
212-
Assert.AreEqual("XHTML Test Page", driver.Title);
212+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
213213
}
214214

215215
[Test]
@@ -287,7 +287,7 @@ public void ShouldBeAbleToClickOnRightToLeftLanguageLink()
287287
element.Click();
288288

289289
WaitFor(() => driver.Title == "clicks", "Expected title to be 'clicks'");
290-
Assert.AreEqual("clicks", driver.Title);
290+
Assert.That(driver.Title, Is.EqualTo("clicks"));
291291
}
292292

293293
[Test]
@@ -298,7 +298,7 @@ public void ShouldBeAbleToClickOnLinkInAbsolutelyPositionedFooter()
298298

299299
driver.FindElement(By.Id("link")).Click();
300300
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
301-
Assert.AreEqual("XHTML Test Page", driver.Title);
301+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
302302
}
303303

304304
[Test]
@@ -309,7 +309,7 @@ public void ShouldBeAbleToClickOnLinkInAbsolutelyPositionedFooterInQuirksMode()
309309

310310
driver.FindElement(By.Id("link")).Click();
311311
WaitFor(() => { return driver.Title == "XHTML Test Page"; }, "Browser title was not 'XHTML Test Page'");
312-
Assert.AreEqual("XHTML Test Page", driver.Title);
312+
Assert.That(driver.Title, Is.EqualTo("XHTML Test Page"));
313313
}
314314

315315
[Test]
@@ -321,7 +321,7 @@ public void ShouldBeAbleToClickOnLinksWithNoHrefAttribute()
321321
element.Click();
322322

323323
WaitFor(() => driver.Title == "Changed", "Expected title to be 'Changed'");
324-
Assert.AreEqual("Changed", driver.Title);
324+
Assert.That(driver.Title, Is.EqualTo("Changed"));
325325
}
326326

327327
[Test]
@@ -332,7 +332,7 @@ public void ShouldBeAbleToClickOnALinkThatWrapsToTheNextLine()
332332
driver.FindElement(By.Id("link")).Click();
333333

334334
WaitFor(() => driver.Title == "Submitted Successfully!", "Expected title to be 'Submitted Successfully!'");
335-
Assert.AreEqual("Submitted Successfully!", driver.Title);
335+
Assert.That(driver.Title, Is.EqualTo("Submitted Successfully!"));
336336
}
337337

338338
[Test]
@@ -343,7 +343,7 @@ public void ShouldBeAbleToClickOnASpanThatWrapsToTheNextLine()
343343
driver.FindElement(By.Id("span")).Click();
344344

345345
WaitFor(() => driver.Title == "Submitted Successfully!", "Expected title to be 'Submitted Successfully!'");
346-
Assert.AreEqual("Submitted Successfully!", driver.Title);
346+
Assert.That(driver.Title, Is.EqualTo("Submitted Successfully!"));
347347
}
348348

349349
[Test]
@@ -364,7 +364,7 @@ public void ShouldBeAbleToClickLinkContainingLineBreak()
364364
driver.Url = simpleTestPage;
365365
driver.FindElement(By.Id("multilinelink")).Click();
366366
WaitFor(() => { return driver.Title == "We Arrive Here"; }, "Browser title was not 'We Arrive Here'");
367-
Assert.AreEqual("We Arrive Here", driver.Title);
367+
Assert.That(driver.Title, Is.EqualTo("We Arrive Here"));
368368
}
369369
}
370370
}

dotnet/test/common/ContentEditableTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void NonPrintableCharactersShouldWorkWithContentEditableOrDesignModeSet()
6363
element.SendKeys("Dishy" + Keys.Backspace + Keys.Left + Keys.Left);
6464
element.SendKeys(Keys.Left + Keys.Left + "F" + Keys.Delete + Keys.End + "ee!");
6565

66-
Assert.AreEqual("Fishee!", element.Text);
66+
Assert.That(element.Text, Is.EqualTo("Fishee!"));
6767
}
6868

6969
[Test]
@@ -137,7 +137,7 @@ public void AppendsTextToEndOfContentEditableWithMultipleTextNodes()
137137
IWebElement input = driver.FindElement(By.Id("editable"));
138138
input.SendKeys(", world!");
139139
WaitFor(() => input.Text != "Why hello", "Text remained the original text");
140-
Assert.AreEqual("Why hello, world!", input.Text);
140+
Assert.That(input.Text, Is.EqualTo("Why hello, world!"));
141141
}
142142
}
143143
}

0 commit comments

Comments
 (0)