Skip to content

Commit cd4f610

Browse files
angalbiatiangalbiati
committed
Improved Assertion syntax, using Has.Count, Has.Length when possible, using Multiple assertions
1 parent 40c79a0 commit cd4f610

11 files changed

+815
-431
lines changed

‎DbcParserLib.Tests/DbcBuilderTests.cs

+190-106
Large diffs are not rendered by default.

‎DbcParserLib.Tests/EnvironmentVariableLineParserTests.cs

+37-25
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,16 @@ public void EnvironmentVariableDefinitionLineIsParsedTest()
5252
dbcBuilderMock.Setup(mock => mock.AddEnvironmentVariable("EnvKlemme45", It.IsAny<EnvironmentVariable>()))
5353
.Callback<string, EnvironmentVariable>((_, envVariable) =>
5454
{
55-
Assert.That(envVariable.Name, Is.EqualTo("EnvKlemme45"));
56-
Assert.That(envVariable.Unit, Is.EqualTo(""));
57-
Assert.That(envVariable.Access, Is.EqualTo(EnvAccessibility.Unrestricted));
58-
Assert.That(envVariable.Type, Is.EqualTo(EnvDataType.Integer));
59-
Assert.That(envVariable.IntegerEnvironmentVariable.Minimum, Is.EqualTo(0));
60-
Assert.That(envVariable.IntegerEnvironmentVariable.Maximum, Is.EqualTo(1));
61-
Assert.That(envVariable.IntegerEnvironmentVariable.Default, Is.EqualTo(0));
55+
Assert.Multiple(() =>
56+
{
57+
Assert.That(envVariable.Name, Is.EqualTo("EnvKlemme45"));
58+
Assert.That(envVariable.Unit, Is.EqualTo(""));
59+
Assert.That(envVariable.Access, Is.EqualTo(EnvAccessibility.Unrestricted));
60+
Assert.That(envVariable.Type, Is.EqualTo(EnvDataType.Integer));
61+
Assert.That(envVariable.IntegerEnvironmentVariable.Minimum, Is.EqualTo(0));
62+
Assert.That(envVariable.IntegerEnvironmentVariable.Maximum, Is.EqualTo(1));
63+
Assert.That(envVariable.IntegerEnvironmentVariable.Default, Is.EqualTo(0));
64+
});
6265
}
6366
);
6467
dbcBuilderMock.Setup(mock => mock.AddNodeEnvironmentVariable("ENTtest", "EnvKlemme45"));
@@ -77,10 +80,13 @@ public void EnvironmentVariableAlwaysStringDefinitionLineIsParsedTest()
7780
dbcBuilderMock.Setup(mock => mock.AddEnvironmentVariable("EnvKlemme45", It.IsAny<EnvironmentVariable>()))
7881
.Callback<string, EnvironmentVariable>((_, envVariable) =>
7982
{
80-
Assert.That(envVariable.Name, Is.EqualTo("EnvKlemme45"));
81-
Assert.That(envVariable.Unit, Is.EqualTo(""));
82-
Assert.That(envVariable.Access, Is.EqualTo(EnvAccessibility.Unrestricted));
83-
Assert.That(envVariable.Type, Is.EqualTo(EnvDataType.String));
83+
Assert.Multiple(() =>
84+
{
85+
Assert.That(envVariable.Name, Is.EqualTo("EnvKlemme45"));
86+
Assert.That(envVariable.Unit, Is.EqualTo(""));
87+
Assert.That(envVariable.Access, Is.EqualTo(EnvAccessibility.Unrestricted));
88+
Assert.That(envVariable.Type, Is.EqualTo(EnvDataType.String));
89+
});
8490
}
8591
);
8692
dbcBuilderMock.Setup(mock => mock.AddNodeEnvironmentVariable("ENTtest", "EnvKlemme45"));
@@ -99,13 +105,16 @@ public void EnvironmentVariableFloatDefinitionLineIsParsedTest()
99105
dbcBuilderMock.Setup(mock => mock.AddEnvironmentVariable("EnvKlemme45", It.IsAny<EnvironmentVariable>()))
100106
.Callback<string, EnvironmentVariable>((_, envVariable) =>
101107
{
102-
Assert.That(envVariable.Name, Is.EqualTo("EnvKlemme45"));
103-
Assert.That(envVariable.Unit, Is.EqualTo(""));
104-
Assert.That(envVariable.Access, Is.EqualTo(EnvAccessibility.Unrestricted));
105-
Assert.That(envVariable.Type, Is.EqualTo(EnvDataType.Float));
106-
Assert.That(envVariable.FloatEnvironmentVariable.Minimum, Is.EqualTo(0));
107-
Assert.That(envVariable.FloatEnvironmentVariable.Maximum, Is.EqualTo(10));
108-
Assert.That(envVariable.FloatEnvironmentVariable.Default, Is.EqualTo(5));
108+
Assert.Multiple(() =>
109+
{
110+
Assert.That(envVariable.Name, Is.EqualTo("EnvKlemme45"));
111+
Assert.That(envVariable.Unit, Is.EqualTo(""));
112+
Assert.That(envVariable.Access, Is.EqualTo(EnvAccessibility.Unrestricted));
113+
Assert.That(envVariable.Type, Is.EqualTo(EnvDataType.Float));
114+
Assert.That(envVariable.FloatEnvironmentVariable.Minimum, Is.EqualTo(0));
115+
Assert.That(envVariable.FloatEnvironmentVariable.Maximum, Is.EqualTo(10));
116+
Assert.That(envVariable.FloatEnvironmentVariable.Default, Is.EqualTo(5));
117+
});
109118
}
110119
);
111120
dbcBuilderMock.Setup(mock => mock.AddNodeEnvironmentVariable("ENTtest", "EnvKlemme45"));
@@ -124,13 +133,16 @@ public void EnvironmentVariableFloatScientificNotationDefinitionLineIsParsedTest
124133
dbcBuilderMock.Setup(mock => mock.AddEnvironmentVariable("EnvKlemme45", It.IsAny<EnvironmentVariable>()))
125134
.Callback<string, EnvironmentVariable>((_, envVariable) =>
126135
{
127-
Assert.That(envVariable.Name, Is.EqualTo("EnvKlemme45"));
128-
Assert.That(envVariable.Unit, Is.EqualTo(""));
129-
Assert.That(envVariable.Access, Is.EqualTo(EnvAccessibility.Unrestricted));
130-
Assert.That(envVariable.Type, Is.EqualTo(EnvDataType.Float));
131-
Assert.That(envVariable.FloatEnvironmentVariable.Minimum, Is.EqualTo(0));
132-
Assert.That(envVariable.FloatEnvironmentVariable.Maximum, Is.EqualTo(10));
133-
Assert.That(envVariable.FloatEnvironmentVariable.Default, Is.EqualTo(5));
136+
Assert.Multiple(() =>
137+
{
138+
Assert.That(envVariable.Name, Is.EqualTo("EnvKlemme45"));
139+
Assert.That(envVariable.Unit, Is.EqualTo(""));
140+
Assert.That(envVariable.Access, Is.EqualTo(EnvAccessibility.Unrestricted));
141+
Assert.That(envVariable.Type, Is.EqualTo(EnvDataType.Float));
142+
Assert.That(envVariable.FloatEnvironmentVariable.Minimum, Is.EqualTo(0));
143+
Assert.That(envVariable.FloatEnvironmentVariable.Maximum, Is.EqualTo(10));
144+
Assert.That(envVariable.FloatEnvironmentVariable.Default, Is.EqualTo(5));
145+
});
134146
}
135147
);
136148
dbcBuilderMock.Setup(mock => mock.AddNodeEnvironmentVariable("ENTtest", "EnvKlemme45"));

‎DbcParserLib.Tests/ExtensionMethodsTests.cs

+64-28
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ public void MotorolaTest()
1515
ByteOrder = 0, // 0 = Big Endian (Motorola), 1 = Little Endian (Intel)
1616
};
1717

18-
Assert.That(sig.Motorola(), Is.True);
19-
Assert.That(sig.Msb(), Is.True);
20-
Assert.That(sig.Intel(), Is.False);
21-
Assert.That(sig.Lsb(), Is.False);
18+
Assert.Multiple(() =>
19+
{
20+
Assert.That(sig.Motorola(), Is.True);
21+
Assert.That(sig.Msb(), Is.True);
22+
Assert.That(sig.Intel(), Is.False);
23+
Assert.That(sig.Lsb(), Is.False);
24+
});
2225
}
2326

2427
[Test]
@@ -29,10 +32,13 @@ public void IntelTest()
2932
ByteOrder = 1, // 0 = Big Endian (Motorola), 1 = Little Endian (Intel)
3033
};
3134

32-
Assert.That(sig.Motorola(), Is.False);
33-
Assert.That(sig.Msb(), Is.False);
34-
Assert.That(sig.Intel(), Is.True);
35-
Assert.That(sig.Lsb(), Is.True);
35+
Assert.Multiple(() =>
36+
{
37+
Assert.That(sig.Motorola(), Is.False);
38+
Assert.That(sig.Msb(), Is.False);
39+
Assert.That(sig.Intel(), Is.True);
40+
Assert.That(sig.Lsb(), Is.True);
41+
});
3642
}
3743

3844
[Test]
@@ -44,8 +50,11 @@ public void NoMultiplexingTest()
4450
};
4551

4652
var multiplexing = sig.MultiplexingInfo();
47-
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.None));
48-
Assert.That(multiplexing.Group, Is.EqualTo(0));
53+
Assert.Multiple(() =>
54+
{
55+
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.None));
56+
Assert.That(multiplexing.Group, Is.EqualTo(0));
57+
});
4958
}
5059

5160
[Test]
@@ -57,8 +66,11 @@ public void MultiplexorTest()
5766
};
5867

5968
var multiplexing = sig.MultiplexingInfo();
60-
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.Multiplexor));
61-
Assert.That(multiplexing.Group, Is.EqualTo(0));
69+
Assert.Multiple(() =>
70+
{
71+
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.Multiplexor));
72+
Assert.That(multiplexing.Group, Is.EqualTo(0));
73+
});
6274
}
6375

6476
[Test]
@@ -70,8 +82,11 @@ public void MultiplexedSingleDigitTest()
7082
};
7183

7284
var multiplexing = sig.MultiplexingInfo();
73-
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.Multiplexed));
74-
Assert.That(multiplexing.Group, Is.EqualTo(3));
85+
Assert.Multiple(() =>
86+
{
87+
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.Multiplexed));
88+
Assert.That(multiplexing.Group, Is.EqualTo(3));
89+
});
7590
}
7691

7792
[Test]
@@ -83,8 +98,11 @@ public void ExtendedMultiplexingIsPartiallySupportedTest()
8398
};
8499

85100
var multiplexing = sig.MultiplexingInfo();
86-
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.Multiplexed));
87-
Assert.That(multiplexing.Group, Is.EqualTo(3));
101+
Assert.Multiple(() =>
102+
{
103+
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.Multiplexed));
104+
Assert.That(multiplexing.Group, Is.EqualTo(3));
105+
});
88106
}
89107

90108
[Test]
@@ -96,8 +114,11 @@ public void MultiplexedDoubleDigitTest()
96114
};
97115

98116
var multiplexing = sig.MultiplexingInfo();
99-
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.Multiplexed));
100-
Assert.That(multiplexing.Group, Is.EqualTo(12));
117+
Assert.Multiple(() =>
118+
{
119+
Assert.That(multiplexing.Role, Is.EqualTo(MultiplexingRole.Multiplexed));
120+
Assert.That(multiplexing.Group, Is.EqualTo(12));
121+
});
101122
}
102123

103124
[Test]
@@ -170,8 +191,11 @@ public void FsmNoSpacesParsedTest()
170191
{ 3, "Third" }
171192
};
172193

173-
Assert.That(operation, Is.True);
174-
Assert.That(dict, Is.EqualTo(expectedDict));
194+
Assert.Multiple(() =>
195+
{
196+
Assert.That(operation, Is.True);
197+
Assert.That(dict, Is.EqualTo(expectedDict));
198+
});
175199
}
176200

177201
[Test]
@@ -186,8 +210,11 @@ public void FsmWithSpacesParsedTest()
186210
{ 3, " T h i r d " }
187211
};
188212

189-
Assert.That(operation, Is.True);
190-
Assert.That(dict, Is.EqualTo(expectedDict));
213+
Assert.Multiple(() =>
214+
{
215+
Assert.That(operation, Is.True);
216+
Assert.That(dict, Is.EqualTo(expectedDict));
217+
});
191218
}
192219

193220
[Test]
@@ -201,8 +228,11 @@ public void FsmWithEmptyStringParsedTest()
201228
{ 2, " " }
202229
};
203230

204-
Assert.That(operation, Is.True);
205-
Assert.That(dict, Is.EqualTo(expectedDict));
231+
Assert.Multiple(() =>
232+
{
233+
Assert.That(operation, Is.True);
234+
Assert.That(dict, Is.EqualTo(expectedDict));
235+
});
206236
}
207237

208238
[Test]
@@ -216,8 +246,11 @@ public void FsmWithIntegerStringParsedTest()
216246
{ 2, "2" }
217247
};
218248

219-
Assert.That(operation, Is.True);
220-
Assert.That(dict, Is.EqualTo(expectedDict));
249+
Assert.Multiple(() =>
250+
{
251+
Assert.That(operation, Is.True);
252+
Assert.That(dict, Is.EqualTo(expectedDict));
253+
});
221254
}
222255

223256
[Test]
@@ -226,8 +259,11 @@ public void FsmErrorTest()
226259
var text = "1 \"First with spaces\" 2 \" Second \" 3 T h i r d \"";
227260
var operation = text.TryParseToDict(out var dict);
228261

229-
Assert.That(operation, Is.False);
230-
Assert.That(dict, Is.Null);
262+
Assert.Multiple(() =>
263+
{
264+
Assert.That(operation, Is.False);
265+
Assert.That(dict, Is.Null);
266+
});
231267
}
232268
}
233269
}

‎DbcParserLib.Tests/MessageLineParserTests.cs

+16-10
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,14 @@ public void FullLineIsParsed()
7474
dbcBuilderMock.Setup(mock => mock.AddMessage(It.IsAny<Message>()))
7575
.Callback<Message>(message =>
7676
{
77-
Assert.That(message.ID, Is.EqualTo(1041));
78-
Assert.That(message.Name, Is.EqualTo("DOORS_SEATBELTS"));
79-
Assert.That(message.DLC, Is.EqualTo(8));
80-
Assert.That(message.Transmitter, Is.EqualTo("TRX"));
81-
Assert.That(message.IsExtID, Is.False);
77+
Assert.Multiple(() =>
78+
{
79+
Assert.That(message.ID, Is.EqualTo(1041));
80+
Assert.That(message.Name, Is.EqualTo("DOORS_SEATBELTS"));
81+
Assert.That(message.DLC, Is.EqualTo(8));
82+
Assert.That(message.Transmitter, Is.EqualTo("TRX"));
83+
Assert.That(message.IsExtID, Is.False);
84+
});
8285
});
8386

8487
var messageLineParser = CreateParser();
@@ -94,11 +97,14 @@ public void FullLineWithSomeRamdomSpacesIsParsed()
9497
dbcBuilderMock.Setup(mock => mock.AddMessage(It.IsAny<Message>()))
9598
.Callback<Message>(message =>
9699
{
97-
Assert.That(message.ID, Is.EqualTo(1041));
98-
Assert.That(message.Name, Is.EqualTo("DOORS_SEATBELTS"));
99-
Assert.That(message.DLC, Is.EqualTo(8));
100-
Assert.That(message.Transmitter, Is.EqualTo("TRX"));
101-
Assert.That(message.IsExtID, Is.False);
100+
Assert.Multiple(() =>
101+
{
102+
Assert.That(message.ID, Is.EqualTo(1041));
103+
Assert.That(message.Name, Is.EqualTo("DOORS_SEATBELTS"));
104+
Assert.That(message.DLC, Is.EqualTo(8));
105+
Assert.That(message.Transmitter, Is.EqualTo("TRX"));
106+
Assert.That(message.IsExtID, Is.False);
107+
});
102108
});
103109

104110
var messageLineParser = CreateParser();

‎DbcParserLib.Tests/NodeLineParserTests.cs

+10-4
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,22 @@ public void FullLineIsParsed()
9191
dbcBuilderMock.Setup(mock => mock.AddNode(It.IsAny<Node>()))
9292
.Callback<Node>(node =>
9393
{
94-
Assert.That(string.IsNullOrWhiteSpace(node.Name), Is.False);
95-
Assert.That(string.IsNullOrWhiteSpace(node.Comment), Is.True);
94+
Assert.Multiple(() =>
95+
{
96+
Assert.That(string.IsNullOrWhiteSpace(node.Name), Is.False);
97+
Assert.That(string.IsNullOrWhiteSpace(node.Comment), Is.True);
98+
});
9699
results.Add(node.Name);
97100
});
98101

99102
var nodeLineParser = CreateParser();
100103
var nextLineProviderMock = m_repository.Create<INextLineProvider>();
101104

102-
Assert.That(nodeLineParser.TryParse(@"BU_: NODE_1 NODE_2 NODE_4 ", dbcBuilderMock.Object, nextLineProviderMock.Object), Is.True);
103-
Assert.That(results, Is.EquivalentTo(expectations));
105+
Assert.Multiple(() =>
106+
{
107+
Assert.That(nodeLineParser.TryParse(@"BU_: NODE_1 NODE_2 NODE_4 ", dbcBuilderMock.Object, nextLineProviderMock.Object), Is.True);
108+
Assert.That(results, Is.EquivalentTo(expectations));
109+
});
104110
}
105111

106112
[TestCase("BU_: 0nodeName")]

0 commit comments

Comments
 (0)