Skip to content

Commit 6d37359

Browse files
Dor-blDor-bl
authored
test: Replace existing NUnit assertions with updated ones to align with NUnit 4 standards. (#713)
* build(deps): Add NUnit.Analyzers 3.10.0 to test/integration * build(deps): Bump NUnit from 3.14.0 to 4.0.1 * chore: Add rule NUnit1032 to recognize Quit as an additional dispose method * Revert "build(deps): Bump NUnit from 3.14.0 to 4.0.1" This reverts commit d391711. * test: Replace existing NUnit assertions with updated ones to align with NUnit 4 standards. * test: fix FindByAccessibilityIdTest null object reference * test: fix flaky CheckAbilityToLogServiceOutputToConsole + CheckTheAbilityToDefineTheDesiredLogFile improvements
1 parent 94ab0a9 commit 6d37359

Some content is hidden

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

49 files changed

+353
-265
lines changed

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ indent_size = 4
77
[*.cs]
88
indent_style = space
99
indent_size = 4
10+
11+
# Set up additional disposal methods for a specific diagnostic rule
12+
dotnet_diagnostic.NUnit1032.additional_dispose_methods = Quit

‎test/integration/Android/ActivityTest.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -41,53 +41,53 @@ public void StartActivityInThisAppTestCase()
4141
{
4242
_driver.StartActivity(AppId, ".ApiDemos");
4343

44-
Assert.AreEqual(_driver.CurrentActivity, ".ApiDemos");
44+
Assert.That(_driver.CurrentActivity, Is.EqualTo(".ApiDemos"));
4545

4646
_driver.StartActivity(AppId, ".accessibility.AccessibilityNodeProviderActivity");
4747

48-
Assert.AreEqual(_driver.CurrentActivity, ".accessibility.AccessibilityNodeProviderActivity");
48+
Assert.That(_driver.CurrentActivity, Is.EqualTo(".accessibility.AccessibilityNodeProviderActivity"));
4949
}
5050

5151
[Test]
5252
public void StartActivityWithWaitingAppTestCase()
5353
{
5454
_driver.StartActivity(AppId, ".ApiDemos", AppId, ".ApiDemos");
5555

56-
Assert.AreEqual(_driver.CurrentActivity, ".ApiDemos");
56+
Assert.That(_driver.CurrentActivity, Is.EqualTo(".ApiDemos"));
5757

5858
_driver.StartActivity(AppId, ".accessibility.AccessibilityNodeProviderActivity",
5959
"io.appium.android.apis", ".accessibility.AccessibilityNodeProviderActivity");
6060

61-
Assert.AreEqual(_driver.CurrentActivity, ".accessibility.AccessibilityNodeProviderActivity");
61+
Assert.That(_driver.CurrentActivity, Is.EqualTo(".accessibility.AccessibilityNodeProviderActivity"));
6262
}
6363

6464
[Test]
6565
public void StartActivityInNewAppTestCase()
6666
{
6767
_driver.StartActivity(AppId, ".ApiDemos");
6868

69-
Assert.AreEqual(_driver.CurrentActivity, ".ApiDemos");
69+
Assert.That(_driver.CurrentActivity, Is.EqualTo(".ApiDemos"));
7070

7171
_driver.StartActivity("com.android.contacts", ContactsActivity);
7272

73-
Assert.AreEqual(_driver.CurrentActivity, ContactsActivity);
73+
Assert.That(_driver.CurrentActivity, Is.EqualTo(ContactsActivity));
7474
_driver.PressKeyCode(AndroidKeyCode.Back);
75-
Assert.AreEqual(_driver.CurrentActivity, ".ApiDemos");
75+
Assert.That(_driver.CurrentActivity, Is.EqualTo(".ApiDemos"));
7676
}
7777

7878
[Test]
7979
public void StartActivityInNewAppTestCaseWithoutClosingApp()
8080
{
8181
_driver.StartActivity(AppId, ".accessibility.AccessibilityNodeProviderActivity");
8282

83-
Assert.AreEqual(_driver.CurrentActivity, ".accessibility.AccessibilityNodeProviderActivity");
83+
Assert.That(_driver.CurrentActivity, Is.EqualTo(".accessibility.AccessibilityNodeProviderActivity"));
8484

8585
_driver.StartActivity("com.android.contacts", ContactsActivity, "com.android.contacts",
8686
ContactsActivity, false);
8787

88-
Assert.AreEqual(_driver.CurrentActivity, ContactsActivity);
88+
Assert.That(_driver.CurrentActivity, Is.EqualTo(ContactsActivity));
8989
_driver.PressKeyCode(AndroidKeyCode.Back);
90-
Assert.AreEqual(_driver.CurrentActivity, ".accessibility.AccessibilityNodeProviderActivity");
90+
Assert.That(_driver.CurrentActivity, Is.EqualTo(".accessibility.AccessibilityNodeProviderActivity"));
9191
}
9292

9393
[OneTimeTearDown]

‎test/integration/Android/AndroidUiScrollableTests.cs

+23-23
Original file line numberDiff line numberDiff line change
@@ -20,141 +20,141 @@ public void Setup()
2020
public void NewScrollablesStartWithEmptyConstructorCall()
2121
{
2222
var statement = _sut.Build();
23-
Assert.AreEqual(ScrollableCtor, statement);
23+
Assert.That(statement, Is.EqualTo(ScrollableCtor));
2424
}
2525

2626
[Test]
2727
public void NewScrollableUsesCustomScrollContainerSelector()
2828
{
2929
var selector = new AndroidUiSelector().Instance(7);
3030
var statement = new AndroidUiScrollable(selector).Build();
31-
Assert.AreEqual("new UiScrollable(new UiSelector().instance(7))", statement);
31+
Assert.That(statement, Is.EqualTo("new UiScrollable(new UiSelector().instance(7))"));
3232
}
3333

3434
[Test]
3535
public void FlingBackwardAddsCorrectCallToStatement()
3636
{
3737
var statement = _sut.FlingBackward().Build();
38-
Assert.AreEqual(ScrollableCtor + ".flingBackward()", statement);
38+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".flingBackward()"));
3939
}
4040

4141
[Test]
4242
public void FlingForwardAddsCorrectCallToStatement()
4343
{
4444
var statement = _sut.FlingForward().Build();
45-
Assert.AreEqual(ScrollableCtor + ".flingForward()", statement);
45+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".flingForward()"));
4646
}
4747

4848
[Test]
4949
public void FlingToBeginningAddsCorrectCallToStatement()
5050
{
5151
var statement = _sut.FlingToBeginning(45).Build();
52-
Assert.AreEqual(ScrollableCtor + ".flingToBeginning(45)", statement);
52+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".flingToBeginning(45)"));
5353
}
5454

5555
[Test]
5656
public void FlingToEndAddsCorrectCallToStatement()
5757
{
5858
var statement = _sut.FlingToEnd(77).Build();
59-
Assert.AreEqual(ScrollableCtor + ".flingToEnd(77)", statement);
59+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".flingToEnd(77)"));
6060
}
6161

6262
[Test]
6363
public void GetChildByDescriptionAddsCorrectCallToStatement()
6464
{
6565
var statement = _sut.GetChildByDescription(new AndroidUiSelector(), "Hello World", false).Build();
66-
Assert.AreEqual(ScrollableCtor + ".getChildByDescription(new UiSelector(), \"Hello World\", false)", statement);
66+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".getChildByDescription(new UiSelector(), \"Hello World\", false)"));
6767
}
6868

6969
[Test]
7070
public void GetChildByInstanceAddsCorrectCallToStatement()
7171
{
7272
var statement = _sut.GetChildByInstance(new AndroidUiSelector(), 9).Build();
73-
Assert.AreEqual(ScrollableCtor + ".getChildByInstance(new UiSelector(), 9)", statement);
73+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".getChildByInstance(new UiSelector(), 9)"));
7474
}
7575

7676
[Test]
7777
public void GetChildByTextAddsCorrectCallToStatement()
7878
{
7979
var statement = _sut.GetChildByText(new AndroidUiSelector(), "Help", false).Build();
80-
Assert.AreEqual(ScrollableCtor + ".getChildByText(new UiSelector(), \"Help\", false)", statement);
80+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".getChildByText(new UiSelector(), \"Help\", false)"));
8181
}
8282

8383
[Test]
8484
public void ScrollBackwardAddsCorrectCallToStatement()
8585
{
8686
var statement = _sut.ScrollBackward(32).Build();
87-
Assert.AreEqual(ScrollableCtor + ".scrollBackward(32)", statement);
87+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".scrollBackward(32)"));
8888
}
8989

9090
[Test]
9191
public void ScrollDescriptionIntoViewAddsCorrectCallToStatement()
9292
{
9393
var statement = _sut.ScrollDescriptionIntoView("Description Here").Build();
94-
Assert.AreEqual(ScrollableCtor + ".scrollDescriptionIntoView(\"Description Here\")", statement);
94+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".scrollDescriptionIntoView(\"Description Here\")"));
9595
}
9696

9797
[Test]
9898
public void ScrollForwardAddsCorrectCallToStatement()
9999
{
100100
var statement = _sut.ScrollForward(46).Build();
101-
Assert.AreEqual(ScrollableCtor + ".scrollForward(46)", statement);
101+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".scrollForward(46)"));
102102
}
103103

104104
[Test]
105105
public void ScrollIntoViewAddsCorrectCallToStatement()
106106
{
107107
var statement = _sut.ScrollIntoView(new AndroidUiSelector()).Build();
108-
Assert.AreEqual(ScrollableCtor + ".scrollIntoView(new UiSelector())", statement);
108+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".scrollIntoView(new UiSelector())"));
109109
}
110110

111111
[Test]
112112
public void ScrollTextIntoViewAddsCorrectCallToStatement()
113113
{
114114
var statement = _sut.ScrollTextIntoView("Some Text").Build();
115-
Assert.AreEqual(ScrollableCtor + ".scrollTextIntoView(\"Some Text\")", statement);
115+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".scrollTextIntoView(\"Some Text\")"));
116116
}
117117

118118
[Test]
119119
public void ScrollToBeginningAddsCorrectCallToStatement()
120120
{
121121
var statement = _sut.ScrollToBeginning(12, 90).Build();
122-
Assert.AreEqual(ScrollableCtor + ".scrollToBeginning(12, 90)", statement);
122+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".scrollToBeginning(12, 90)"));
123123
}
124124

125125
[Test]
126126
public void ScrollToEndAddsCorrectCallToStatement()
127127
{
128128
var statement = _sut.ScrollToEnd(32, 51).Build();
129-
Assert.AreEqual(ScrollableCtor + ".scrollToEnd(32, 51)", statement);
129+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".scrollToEnd(32, 51)"));
130130
}
131131

132132
[Test]
133133
public void SetScrollDirectionVerticalAddsCorrectCallToStatement()
134134
{
135135
var statement = _sut.SetScrollDirection(ListDirection.Vertical).Build();
136-
Assert.AreEqual(ScrollableCtor + ".setAsVerticalList()", statement);
136+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".setAsVerticalList()"));
137137
}
138138

139139
[Test]
140140
public void SetScrollDirectionHorizontalAddsCorrectCallToStatement()
141141
{
142142
var statement = _sut.SetScrollDirection(ListDirection.Horizontal).Build();
143-
Assert.AreEqual(ScrollableCtor + ".setAsHorizontalList()", statement);
143+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".setAsHorizontalList()"));
144144
}
145145

146146
[Test]
147147
public void SetMaxSearchSwipesAddsCorrectCallToStatement()
148148
{
149149
var statement = _sut.SetMaxSearchSwipes(80).Build();
150-
Assert.AreEqual(ScrollableCtor + ".setMaxSearchSwipes(80)", statement);
150+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".setMaxSearchSwipes(80)"));
151151
}
152152

153153
[Test]
154154
public void SetSwipeDeadZonePercentageAddsCorrectCallToStatement()
155155
{
156156
var statement = _sut.SetSwipeDeadZonePercentage(.67).Build();
157-
Assert.AreEqual(ScrollableCtor + ".setSwipeDeadZonePercentage(0.67)", statement);
157+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".setSwipeDeadZonePercentage(0.67)"));
158158
}
159159

160160
[TestCase(1.1)]
@@ -172,22 +172,22 @@ public void SomeStatementsCanBeChained()
172172
.SetSwipeDeadZonePercentage(0.11)
173173
.SetMaxSearchSwipes(44)
174174
.Build();
175-
Assert.AreEqual(ScrollableCtor + ".setSwipeDeadZonePercentage(0.11).setMaxSearchSwipes(44)", statement);
175+
Assert.That(statement, Is.EqualTo(ScrollableCtor + ".setSwipeDeadZonePercentage(0.11).setMaxSearchSwipes(44)"));
176176
}
177177

178178
[Test]
179179
public void AddRawTextAppendsText()
180180
{
181181
var statment = _sut.AddRawText("@").Build();
182-
Assert.AreEqual(ScrollableCtor + "@", statment);
182+
Assert.That(statment, Is.EqualTo(ScrollableCtor + "@"));
183183
}
184184

185185
[Test]
186186
public void RequestingStatementTerminationOnBuildAppendsSemicolon()
187187
{
188188
var statement = _sut.SetSwipeDeadZonePercentage(.67).Build(true);
189189
var lastCharOfStatement = statement[statement.Length - 1];
190-
Assert.AreEqual(';', lastCharOfStatement);
190+
Assert.That(lastCharOfStatement, Is.EqualTo(';'));
191191
}
192192
}
193193
}

0 commit comments

Comments
 (0)