Skip to content

Commit dbeef84

Browse files
josesimoesjosesimoes
committed
Migrate Unit Tests to new API
- Move runsettings to common location and update AZDO yaml.
1 parent cf67ffc commit dbeef84

File tree

8 files changed

+261
-245
lines changed

8 files changed

+261
-245
lines changed

‎.runsettings‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RunSettings>
3+
<!-- Configurations that affect the Test Framework -->
4+
<RunConfiguration>
5+
<MaxCpuCount>1</MaxCpuCount>
6+
<ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
7+
<TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
8+
<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
9+
<TargetFrameworkVersion>net48</TargetFrameworkVersion>
10+
<TargetPlatform>x64</TargetPlatform>
11+
</RunConfiguration>
12+
<nanoFrameworkAdapter>
13+
<Logging>None</Logging>
14+
<IsRealHardware>False</IsRealHardware>
15+
</nanoFrameworkAdapter>
16+
</RunSettings>

‎Tests/HashtableTests/HashtableTests.cs‎

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

‎Tests/HashtableTests/HashtableTests.nfproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4040
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
4141
</Reference>
42-
<Reference Include="nanoFramework.TestFramework, Version=2.1.112.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
42+
<Reference Include="nanoFramework.TestFramework">
4343
<HintPath>..\..\packages\nanoFramework.TestFramework.2.1.112\lib\nanoFramework.TestFramework.dll</HintPath>
4444
</Reference>
45-
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45+
<Reference Include="nanoFramework.UnitTestLauncher">
4646
<HintPath>..\..\packages\nanoFramework.TestFramework.2.1.112\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
4747
</Reference>
4848
</ItemGroup>

‎Tests/QueueTests/QueueTests.cs‎

Lines changed: 86 additions & 86 deletions
Large diffs are not rendered by default.

‎Tests/QueueTests/QueueTests.nfproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3838
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
3939
</Reference>
40-
<Reference Include="nanoFramework.TestFramework, Version=2.1.112.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
40+
<Reference Include="nanoFramework.TestFramework">
4141
<HintPath>..\..\packages\nanoFramework.TestFramework.2.1.112\lib\nanoFramework.TestFramework.dll</HintPath>
4242
</Reference>
43-
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
43+
<Reference Include="nanoFramework.UnitTestLauncher">
4444
<HintPath>..\..\packages\nanoFramework.TestFramework.2.1.112\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
4545
</Reference>
4646
</ItemGroup>

‎Tests/StackTests/StackTests.cs‎

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -40,48 +40,48 @@ public void PushPopPeekTest1()
4040
stack.Push(TestObjects.nul);
4141
stack.Push(TestObjects.en);
4242

43-
Assert.True(19 == stack.Count, "Stack.Count is incorrect");
44-
45-
Assert.True(TestObjects.en.Equals(stack.Peek()), " Peek failed");
46-
Assert.True(TestObjects.en.Equals(stack.Pop()));
47-
Assert.True(TestObjects.nul.Equals(stack.Peek()), " Peek failed");
48-
Assert.True(TestObjects.nul.Equals(stack.Pop()));
49-
Assert.True(TestObjects.o.Equals(stack.Peek()), " Peek failed");
50-
Assert.True(TestObjects.o.Equals(stack.Pop()));
51-
Assert.True(TestObjects.cl.Equals(stack.Peek()), " Peek failed");
52-
Assert.True(TestObjects.cl.Equals(stack.Pop()));
53-
Assert.True(TestObjects.st.Equals(stack.Peek()), " Peek failed");
54-
Assert.True(TestObjects.st.Equals(stack.Pop()));
55-
Assert.True(TestObjects.ts.Equals(stack.Peek()), " Peek failed");
56-
Assert.True(TestObjects.ts.Equals(stack.Pop()));
57-
Assert.True(TestObjects.dt.Equals(stack.Peek()), " Peek failed");
58-
Assert.True(TestObjects.dt.Equals(stack.Pop()));
59-
Assert.True(TestObjects.str.Equals(stack.Peek()), " Peek failed");
60-
Assert.True(TestObjects.str.Equals(stack.Pop()));
61-
Assert.True(TestObjects.c2.Equals(stack.Peek()), " Peek failed");
62-
Assert.True(TestObjects.c2.Equals(stack.Pop()));
63-
Assert.True(TestObjects.f8.Equals(stack.Peek()), " Peek failed");
64-
Assert.True(TestObjects.f8.Equals(stack.Pop()));
65-
Assert.True(TestObjects.f4.Equals(stack.Peek()), " Peek failed");
66-
Assert.True(TestObjects.f4.Equals(stack.Pop()));
67-
Assert.True(TestObjects.s8.Equals(stack.Peek()), " Peek failed");
68-
Assert.True(TestObjects.s8.Equals(stack.Pop()));
69-
Assert.True(TestObjects.u8.Equals(stack.Peek()), " Peek failed");
70-
Assert.True(TestObjects.u8.Equals(stack.Pop()));
71-
Assert.True(TestObjects.s4.Equals(stack.Peek()), " Peek failed");
72-
Assert.True(TestObjects.s4.Equals(stack.Pop()));
73-
Assert.True(TestObjects.u4.Equals(stack.Peek()), " Peek failed");
74-
Assert.True(TestObjects.u4.Equals(stack.Pop()));
75-
Assert.True(TestObjects.s2.Equals(stack.Peek()), " Peek failed");
76-
Assert.True(TestObjects.s2.Equals(stack.Pop()));
77-
Assert.True(TestObjects.u2.Equals(stack.Peek()), " Peek failed");
78-
Assert.True(TestObjects.u2.Equals(stack.Pop()));
79-
Assert.True(TestObjects.s1.Equals(stack.Peek()), " Peek failed");
80-
Assert.True(TestObjects.s1.Equals(stack.Pop()));
81-
Assert.True(TestObjects.u1.Equals(stack.Peek()), " Peek failed");
82-
Assert.True(TestObjects.u1.Equals(stack.Pop()));
83-
84-
Assert.True(0 == stack.Count, "Stack.Count is incorrect");
43+
Assert.IsTrue(19 == stack.Count, "Stack.Count is incorrect");
44+
45+
Assert.IsTrue(TestObjects.en.Equals(stack.Peek()), " Peek failed");
46+
Assert.IsTrue(TestObjects.en.Equals(stack.Pop()));
47+
Assert.IsTrue(TestObjects.nul.Equals(stack.Peek()), " Peek failed");
48+
Assert.IsTrue(TestObjects.nul.Equals(stack.Pop()));
49+
Assert.IsTrue(TestObjects.o.Equals(stack.Peek()), " Peek failed");
50+
Assert.IsTrue(TestObjects.o.Equals(stack.Pop()));
51+
Assert.IsTrue(TestObjects.cl.Equals(stack.Peek()), " Peek failed");
52+
Assert.IsTrue(TestObjects.cl.Equals(stack.Pop()));
53+
Assert.IsTrue(TestObjects.st.Equals(stack.Peek()), " Peek failed");
54+
Assert.IsTrue(TestObjects.st.Equals(stack.Pop()));
55+
Assert.IsTrue(TestObjects.ts.Equals(stack.Peek()), " Peek failed");
56+
Assert.IsTrue(TestObjects.ts.Equals(stack.Pop()));
57+
Assert.IsTrue(TestObjects.dt.Equals(stack.Peek()), " Peek failed");
58+
Assert.IsTrue(TestObjects.dt.Equals(stack.Pop()));
59+
Assert.IsTrue(TestObjects.str.Equals(stack.Peek()), " Peek failed");
60+
Assert.IsTrue(TestObjects.str.Equals(stack.Pop()));
61+
Assert.IsTrue(TestObjects.c2.Equals(stack.Peek()), " Peek failed");
62+
Assert.IsTrue(TestObjects.c2.Equals(stack.Pop()));
63+
Assert.IsTrue(TestObjects.f8.Equals(stack.Peek()), " Peek failed");
64+
Assert.IsTrue(TestObjects.f8.Equals(stack.Pop()));
65+
Assert.IsTrue(TestObjects.f4.Equals(stack.Peek()), " Peek failed");
66+
Assert.IsTrue(TestObjects.f4.Equals(stack.Pop()));
67+
Assert.IsTrue(TestObjects.s8.Equals(stack.Peek()), " Peek failed");
68+
Assert.IsTrue(TestObjects.s8.Equals(stack.Pop()));
69+
Assert.IsTrue(TestObjects.u8.Equals(stack.Peek()), " Peek failed");
70+
Assert.IsTrue(TestObjects.u8.Equals(stack.Pop()));
71+
Assert.IsTrue(TestObjects.s4.Equals(stack.Peek()), " Peek failed");
72+
Assert.IsTrue(TestObjects.s4.Equals(stack.Pop()));
73+
Assert.IsTrue(TestObjects.u4.Equals(stack.Peek()), " Peek failed");
74+
Assert.IsTrue(TestObjects.u4.Equals(stack.Pop()));
75+
Assert.IsTrue(TestObjects.s2.Equals(stack.Peek()), " Peek failed");
76+
Assert.IsTrue(TestObjects.s2.Equals(stack.Pop()));
77+
Assert.IsTrue(TestObjects.u2.Equals(stack.Peek()), " Peek failed");
78+
Assert.IsTrue(TestObjects.u2.Equals(stack.Pop()));
79+
Assert.IsTrue(TestObjects.s1.Equals(stack.Peek()), " Peek failed");
80+
Assert.IsTrue(TestObjects.s1.Equals(stack.Pop()));
81+
Assert.IsTrue(TestObjects.u1.Equals(stack.Peek()), " Peek failed");
82+
Assert.IsTrue(TestObjects.u1.Equals(stack.Pop()));
83+
84+
Assert.IsTrue(0 == stack.Count, "Stack.Count is incorrect");
8585
}
8686
catch (Exception e)
8787
{
@@ -103,17 +103,17 @@ public void PushPopPeekTest2()
103103

104104
// in stack [ 7, 6, 5, 4, 3, 2, 1, 0 ]
105105

106-
Assert.True(8 == stack.Count, "Stack.Count is incorrect");
106+
Assert.IsTrue(8 == stack.Count, "Stack.Count is incorrect");
107107

108108
for (int i = 7; i >= 4; i--)
109109
{
110-
Assert.True(i.Equals(stack.Peek()), " Peek failed");
111-
Assert.True(i.Equals(stack.Pop()));
110+
Assert.IsTrue(i.Equals(stack.Peek()), " Peek failed");
111+
Assert.IsTrue(i.Equals(stack.Pop()));
112112
}
113113

114114
// in stack [ 3, 2, 1, 0 ]
115115

116-
Assert.True(4 == stack.Count, "Stack.Count is incorrect");
116+
Assert.IsTrue(4 == stack.Count, "Stack.Count is incorrect");
117117

118118
for (int i = 8; i < 12; i++)
119119
{
@@ -122,17 +122,17 @@ public void PushPopPeekTest2()
122122

123123
// in stack [ 11, 10, 9, 8, 3, 2, 1, 0 ]
124124

125-
Assert.True(8 == stack.Count, "Stack.Count is incorrect");
125+
Assert.IsTrue(8 == stack.Count, "Stack.Count is incorrect");
126126

127127
for (int i = 11; i >= 10; i--)
128128
{
129-
Assert.True(i.Equals(stack.Peek()), " Peek failed");
130-
Assert.True(i.Equals(stack.Pop()));
129+
Assert.IsTrue(i.Equals(stack.Peek()), " Peek failed");
130+
Assert.IsTrue(i.Equals(stack.Pop()));
131131
}
132132

133133
// in stack [ 9, 8, 3, 2, 1, 0 ]
134134

135-
Assert.True(6 == stack.Count, "Stack.Count is incorrect");
135+
Assert.IsTrue(6 == stack.Count, "Stack.Count is incorrect");
136136

137137
for (int i = 12; i < 16; i++)
138138
{
@@ -141,25 +141,25 @@ public void PushPopPeekTest2()
141141

142142
// in stack [ 15, 14, 13, 12, 9, 8, 3, 2, 1, 0 ]
143143

144-
Assert.True(10 == stack.Count, "Stack.Count is incorrect");
144+
Assert.IsTrue(10 == stack.Count, "Stack.Count is incorrect");
145145

146146
for (int i = 15; i >= 12; i--)
147147
{
148-
Assert.True(i.Equals(stack.Peek()), " Peek failed");
149-
Assert.True(i.Equals(stack.Pop()));
148+
Assert.IsTrue(i.Equals(stack.Peek()), " Peek failed");
149+
Assert.IsTrue(i.Equals(stack.Pop()));
150150
}
151151
for (int i = 9; i >= 8; i--)
152152
{
153-
Assert.True(i.Equals(stack.Peek()), " Peek failed");
154-
Assert.True(i.Equals(stack.Pop()));
153+
Assert.IsTrue(i.Equals(stack.Peek()), " Peek failed");
154+
Assert.IsTrue(i.Equals(stack.Pop()));
155155
}
156156
for (int i = 3; i >= 0; i--)
157157
{
158-
Assert.True(i.Equals(stack.Peek()), " Peek failed");
159-
Assert.True(i.Equals(stack.Pop()));
158+
Assert.IsTrue(i.Equals(stack.Peek()), " Peek failed");
159+
Assert.IsTrue(i.Equals(stack.Pop()));
160160
}
161161

162-
Assert.True(0 == stack.Count, "Stack.Count is incorrect");
162+
Assert.IsTrue(0 == stack.Count, "Stack.Count is incorrect");
163163
}
164164
catch (Exception e)
165165
{
@@ -179,11 +179,11 @@ public void PushPopNullTest()
179179
stack.Push(null);
180180
}
181181

182-
Assert.True(20 == stack.Count, "Stack.Count is incorrect");
182+
Assert.IsTrue(20 == stack.Count, "Stack.Count is incorrect");
183183

184184
for (int i = 0; i < 20; i++)
185185
{
186-
Assert.Null(stack.Pop());
186+
Assert.IsNull(stack.Pop());
187187
}
188188
}
189189
catch (Exception e)
@@ -201,7 +201,7 @@ public void ClearTest()
201201

202202
stack.Clear();
203203

204-
Assert.True(0 == stack.Count, "Stack.Count is incorrect");
204+
Assert.IsTrue(0 == stack.Count, "Stack.Count is incorrect");
205205
}
206206
catch (Exception e)
207207
{
@@ -229,20 +229,20 @@ public void CloneTest()
229229
Stack stack = BuildStack();
230230
Stack clone = (Stack)stack.Clone();
231231

232-
Assert.True(10 == stack.Count, "Stack.Count is incorrect");
233-
Assert.True(10 == clone.Count, "Stack.Count is incorrect");
232+
Assert.IsTrue(10 == stack.Count, "Stack.Count is incorrect");
233+
Assert.IsTrue(10 == clone.Count, "Stack.Count is incorrect");
234234

235235
for (int i = 9; i >= 0; i--)
236236
{
237-
Assert.True(i.Equals(stack.Pop()));
237+
Assert.IsTrue(i.Equals(stack.Pop()));
238238
}
239239

240-
Assert.True(0 == stack.Count, "Stack.Count is incorrect");
241-
Assert.True(10 == clone.Count, "Stack.Count is incorrect");
240+
Assert.IsTrue(0 == stack.Count, "Stack.Count is incorrect");
241+
Assert.IsTrue(10 == clone.Count, "Stack.Count is incorrect");
242242

243243
for (int i = 9; i >= 0; i--)
244244
{
245-
Assert.True(i.Equals(clone.Pop()));
245+
Assert.IsTrue(i.Equals(clone.Pop()));
246246
}
247247
}
248248
catch (Exception e)
@@ -265,8 +265,8 @@ public void CopyToTest()
265265

266266
for (int i = 0; i < 10; i++)
267267
{
268-
Assert.True(9 - i == intArray[i]);
269-
Assert.True(9 - i == (int)objArray[i]);
268+
Assert.IsTrue(9 - i == intArray[i]);
269+
Assert.IsTrue(9 - i == (int)objArray[i]);
270270
}
271271
}
272272
catch (Exception e)
@@ -286,7 +286,7 @@ public void EnumeratorTest()
286286

287287
foreach (int i in stack)
288288
{
289-
Assert.True(j-- == i);
289+
Assert.IsTrue(j-- == i);
290290
}
291291
}
292292
catch (Exception e)
@@ -305,19 +305,19 @@ public void ContainsTest()
305305

306306
for (i = 0; i < 10; i++)
307307
{
308-
Assert.True(stack.Contains(i));
308+
Assert.IsTrue(stack.Contains(i));
309309
}
310310

311311
for (; i < 20; i++)
312312
{
313-
Assert.False(stack.Contains(i));
313+
Assert.IsFalse(stack.Contains(i));
314314
}
315315

316-
Assert.False(stack.Contains(null));
316+
Assert.IsFalse(stack.Contains(null));
317317

318318
stack.Push(null);
319319

320-
Assert.True(stack.Contains(null));
320+
Assert.IsTrue(stack.Contains(null));
321321
}
322322
catch (Exception e)
323323
{
@@ -335,7 +335,7 @@ public void ToArrayTest()
335335
int i = 9;
336336
foreach (Object o in objArray)
337337
{
338-
Assert.True(i-- == (int)o);
338+
Assert.IsTrue(i-- == (int)o);
339339
}
340340
}
341341
catch (Exception e)

‎Tests/StackTests/StackTests.nfproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4040
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
4141
</Reference>
42-
<Reference Include="nanoFramework.TestFramework, Version=2.1.112.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
42+
<Reference Include="nanoFramework.TestFramework">
4343
<HintPath>..\..\packages\nanoFramework.TestFramework.2.1.112\lib\nanoFramework.TestFramework.dll</HintPath>
4444
</Reference>
45-
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45+
<Reference Include="nanoFramework.UnitTestLauncher">
4646
<HintPath>..\..\packages\nanoFramework.TestFramework.2.1.112\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
4747
</Reference>
4848
</ItemGroup>

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ steps:
5555
parameters:
5656
sonarCloudProject: 'nanoframework_lib-nanoFramework.System.Collections'
5757
runUnitTests: true
58-
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Tests\HashtableTests\nano.runsettings'
58+
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
5959

6060
# update dependencies
6161
# update dependents

0 commit comments

Comments
 (0)