Skip to content

Commit 4b0d3fc

Browse files
garydgregorygarydgregory
committed
Use static imports only for JUnit
1 parent d09875c commit 4b0d3fc

48 files changed

Lines changed: 707 additions & 597 deletions

Some content is hidden

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

‎src/test/java/org/apache/commons/scxml2/EventDataTest.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
*/
1717
package org.apache.commons.scxml2;
1818

19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
1921
import java.util.Set;
2022

2123
import org.apache.commons.scxml2.env.Tracer;
2224
import org.apache.commons.scxml2.model.EnterableState;
2325
import org.apache.commons.scxml2.model.SCXML;
24-
import org.junit.jupiter.api.Assertions;
2526
import org.junit.jupiter.api.Test;
2627

2728
/**
@@ -53,52 +54,52 @@ void testEventdata01Sample() throws Exception {
5354
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/eventdata-01.xml");
5455
exec.go();
5556
Set<EnterableState> currentStates = exec.getStatus().getStates();
56-
Assertions.assertEquals(1, currentStates.size());
57-
Assertions.assertEquals("state1", currentStates.iterator().next().getId());
57+
assertEquals(1, currentStates.size());
58+
assertEquals("state1", currentStates.iterator().next().getId());
5859
TriggerEvent te = new EventBuilder("event.foo", TriggerEvent.SIGNAL_EVENT).data(3).build();
5960
currentStates = SCXMLTestHelper.fireEvent(exec, te);
60-
Assertions.assertEquals(1, currentStates.size());
61-
Assertions.assertEquals("state3", currentStates.iterator().next().getId());
61+
assertEquals(1, currentStates.size());
62+
assertEquals("state3", currentStates.iterator().next().getId());
6263
final TriggerEvent[] evts = { te,
6364
new EventBuilder("event.bar", TriggerEvent.SIGNAL_EVENT).data(6).build()};
6465
currentStates = SCXMLTestHelper.fireEvents(exec, evts);
65-
Assertions.assertEquals(1, currentStates.size());
66-
Assertions.assertEquals("state6", currentStates.iterator().next().getId());
66+
assertEquals(1, currentStates.size());
67+
assertEquals("state6", currentStates.iterator().next().getId());
6768
te = new EventBuilder("event.baz", TriggerEvent.SIGNAL_EVENT).data(7).build();
6869
currentStates = SCXMLTestHelper.fireEvent(exec, te);
69-
Assertions.assertEquals(1, currentStates.size());
70-
Assertions.assertEquals("state7", currentStates.iterator().next().getId());
70+
assertEquals(1, currentStates.size());
71+
assertEquals("state7", currentStates.iterator().next().getId());
7172
}
7273

7374
@Test
7475
void testEventdata02Sample() throws Exception {
7576
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/eventdata-02.xml");
7677
exec.go();
7778
Set<EnterableState> currentStates = exec.getStatus().getStates();
78-
Assertions.assertEquals(1, currentStates.size());
79-
Assertions.assertEquals("state0", currentStates.iterator().next().getId());
79+
assertEquals(1, currentStates.size());
80+
assertEquals("state0", currentStates.iterator().next().getId());
8081
final TriggerEvent te1 = new EventBuilder("connection.alerting", TriggerEvent.SIGNAL_EVENT).data("line2").build();
8182
currentStates = SCXMLTestHelper.fireEvent(exec, te1);
82-
Assertions.assertEquals(1, currentStates.size());
83-
Assertions.assertEquals("state2", currentStates.iterator().next().getId());
83+
assertEquals(1, currentStates.size());
84+
assertEquals("state2", currentStates.iterator().next().getId());
8485
final TriggerEvent te2 = new EventBuilder("connection.alerting", TriggerEvent.SIGNAL_EVENT)
8586
.data(new ConnectionAlertingPayload(4)).build();
8687
currentStates = SCXMLTestHelper.fireEvent(exec, te2);
87-
Assertions.assertEquals(1, currentStates.size());
88-
Assertions.assertEquals("state4", currentStates.iterator().next().getId());
88+
assertEquals(1, currentStates.size());
89+
assertEquals("state4", currentStates.iterator().next().getId());
8990
}
9091

9192
@Test
9293
void testEventdata03Sample() throws Exception {
9394
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/eventdata-03.xml");
9495
exec.go();
9596
Set<EnterableState> currentStates = exec.getStatus().getStates();
96-
Assertions.assertEquals(1, currentStates.size());
97-
Assertions.assertEquals("ten", currentStates.iterator().next().getId());
97+
assertEquals(1, currentStates.size());
98+
assertEquals("ten", currentStates.iterator().next().getId());
9899
final TriggerEvent te = new EventBuilder("event.foo", TriggerEvent.SIGNAL_EVENT).build();
99100
currentStates = SCXMLTestHelper.fireEvent(exec, te);
100-
Assertions.assertEquals(1, currentStates.size());
101-
Assertions.assertEquals("thirty", currentStates.iterator().next().getId());
101+
assertEquals(1, currentStates.size());
102+
assertEquals("thirty", currentStates.iterator().next().getId());
102103
}
103104

104105
@Test

‎src/test/java/org/apache/commons/scxml2/SCInstanceTest.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
*/
1717
package org.apache.commons.scxml2;
1818

19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertFalse;
21+
import static org.junit.jupiter.api.Assertions.assertTrue;
22+
1923
import java.util.HashSet;
2024
import java.util.Set;
2125

@@ -24,7 +28,6 @@
2428
import org.apache.commons.scxml2.model.EnterableState;
2529
import org.apache.commons.scxml2.model.History;
2630
import org.apache.commons.scxml2.model.State;
27-
import org.junit.jupiter.api.Assertions;
2831
import org.junit.jupiter.api.BeforeEach;
2932
import org.junit.jupiter.api.Test;
3033

@@ -49,7 +52,7 @@ void testGetContext() {
4952

5053
instance.setContext(target, context);
5154

52-
Assertions.assertEquals("value", instance.getContext(target).get("name"));
55+
assertEquals("value", instance.getContext(target).get("name"));
5356
}
5457

5558
@Test
@@ -64,8 +67,8 @@ void testGetContextNullParent() throws Exception {
6467
final Evaluator evaluator = new JexlEvaluator();
6568
executor.setEvaluator(evaluator);
6669

67-
Assertions.assertEquals("value", instance.getContext(target).get("name"));
68-
Assertions.assertEquals("value", instance.lookupContext(target).get("name"));
70+
assertEquals("value", instance.getContext(target).get("name"));
71+
assertEquals("value", instance.lookupContext(target).get("name"));
6972
}
7073

7174
@Test
@@ -85,8 +88,8 @@ void testGetContextParent() throws Exception {
8588
final Evaluator evaluator = new JexlEvaluator();
8689
executor.setEvaluator(evaluator);
8790

88-
Assertions.assertEquals("value", instance.getContext(target).get("name"));
89-
Assertions.assertEquals("value", instance.lookupContext(target).get("name"));
91+
assertEquals("value", instance.getContext(target).get("name"));
92+
assertEquals("value", instance.lookupContext(target).get("name"));
9093
}
9194

9295
@Test
@@ -104,9 +107,9 @@ void testGetLastConfiguration() {
104107

105108
final Set<EnterableState> returnConfiguration = instance.getLastConfiguration(history);
106109

107-
Assertions.assertEquals(2, returnConfiguration.size());
108-
Assertions.assertTrue(returnConfiguration.contains(tt1));
109-
Assertions.assertTrue(returnConfiguration.contains(tt2));
110+
assertEquals(2, returnConfiguration.size());
111+
assertTrue(returnConfiguration.contains(tt1));
112+
assertTrue(returnConfiguration.contains(tt2));
110113
}
111114

112115
@Test
@@ -115,7 +118,7 @@ void testGetLastConfigurationNull() {
115118

116119
final Set<EnterableState> returnConfiguration = instance.getLastConfiguration(history);
117120

118-
Assertions.assertEquals(0, returnConfiguration.size());
121+
assertEquals(0, returnConfiguration.size());
119122
}
120123

121124
@Test
@@ -124,12 +127,12 @@ void testGetRootContext() {
124127
context.set("name", "value");
125128

126129
instance.setRootContext(context);
127-
Assertions.assertEquals("value", instance.getRootContext().get("name"));
130+
assertEquals("value", instance.getRootContext().get("name"));
128131
}
129132

130133
@Test
131134
void testIsEmpty() {
132-
Assertions.assertTrue(instance.getLastConfiguration(new History()).isEmpty());
135+
assertTrue(instance.getLastConfiguration(new History()).isEmpty());
133136
}
134137

135138
@Test
@@ -143,7 +146,7 @@ void testIsEmptyFalse() {
143146

144147
instance.setLastConfiguration(history, configuration);
145148

146-
Assertions.assertFalse(instance.getLastConfiguration(history).isEmpty());
149+
assertFalse(instance.getLastConfiguration(history).isEmpty());
147150
}
148151

149152
@Test
@@ -159,7 +162,7 @@ void testReset() {
159162

160163
instance.resetConfiguration(history);
161164

162-
Assertions.assertTrue(instance.getLastConfiguration(history).isEmpty());
165+
assertTrue(instance.getLastConfiguration(history).isEmpty());
163166
}
164167

165168
}

‎src/test/java/org/apache/commons/scxml2/SCXMLExecutorTest.java‎

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616
*/
1717
package org.apache.commons.scxml2;
1818

19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertNull;
21+
import static org.junit.jupiter.api.Assertions.assertTrue;
22+
import static org.junit.jupiter.api.Assertions.fail;
23+
1924
import java.util.HashMap;
2025
import java.util.HashSet;
2126
import java.util.Map;
2227
import java.util.Set;
2328

2429
import org.apache.commons.scxml2.model.EnterableState;
2530
import org.apache.commons.scxml2.model.TransitionTarget;
26-
import org.junit.jupiter.api.Assertions;
2731
import org.junit.jupiter.api.Test;
2832

2933
/**
@@ -33,23 +37,23 @@ class SCXMLExecutorTest {
3337

3438
private void checkMicrowave01Sample(final SCXMLExecutor exec) throws Exception {
3539
final Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "turn_on");
36-
Assertions.assertEquals(1, currentStates.size());
37-
Assertions.assertEquals("cooking", currentStates.iterator().next().getId());
40+
assertEquals(1, currentStates.size());
41+
assertEquals("cooking", currentStates.iterator().next().getId());
3842
}
3943

4044
private void checkMicrowave02Sample(final SCXMLExecutor exec) throws Exception {
4145
final Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "turn_on");
42-
Assertions.assertEquals(2, currentStates.size());
46+
assertEquals(2, currentStates.size());
4347
final String id = currentStates.iterator().next().getId();
44-
Assertions.assertTrue(id.equals("closed") || id.equals("cooking"));
48+
assertTrue(id.equals("closed") || id.equals("cooking"));
4549
}
4650

4751
@Test
4852
void testSCXMLExecutorFinalDoneData() throws Exception {
4953
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/final-donedata.xml");
50-
Assertions.assertNull(exec.getFinalDoneData());
54+
assertNull(exec.getFinalDoneData());
5155
exec.go();
52-
Assertions.assertEquals("done", exec.getFinalDoneData());
56+
assertEquals("done", exec.getFinalDoneData());
5357
}
5458

5559
@Test
@@ -130,30 +134,30 @@ void testSCXMLExecutorPrefix01Sample() throws Exception {
130134
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/prefix-01.xml");
131135
exec.go();
132136
Set<EnterableState> currentStates = exec.getStatus().getStates();
133-
Assertions.assertEquals(1, currentStates.size());
134-
Assertions.assertEquals("ten", currentStates.iterator().next().getId());
137+
assertEquals(1, currentStates.size());
138+
assertEquals("ten", currentStates.iterator().next().getId());
135139
currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.ten");
136-
Assertions.assertEquals(1, currentStates.size());
137-
Assertions.assertEquals("twenty", currentStates.iterator().next().getId());
140+
assertEquals(1, currentStates.size());
141+
assertEquals("twenty", currentStates.iterator().next().getId());
138142
}
139143

140144
@Test
141145
void testSCXMLExecutorSetConfiguration() throws Exception {
142146
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/transitions-01.xml");
143147
exec.go();
144148
Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.ten");
145-
Assertions.assertEquals(1, currentStates.size());
146-
Assertions.assertEquals("twenty_one", currentStates.iterator().next().getId());
149+
assertEquals(1, currentStates.size());
150+
assertEquals("twenty_one", currentStates.iterator().next().getId());
147151
currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.twenty_one");
148-
Assertions.assertEquals(1, currentStates.size());
149-
Assertions.assertEquals("twenty_two", currentStates.iterator().next().getId());
152+
assertEquals(1, currentStates.size());
153+
assertEquals("twenty_two", currentStates.iterator().next().getId());
150154
final Set<String> stateIds = new HashSet<>();
151155
stateIds.add("twenty_one");
152156
exec.setConfiguration(stateIds);
153-
Assertions.assertEquals(1, exec.getStatus().getStates().size());
157+
assertEquals(1, exec.getStatus().getStates().size());
154158
SCXMLTestHelper.fireEvent(exec, "done.state.twenty_one");
155-
Assertions.assertEquals(1, currentStates.size());
156-
Assertions.assertEquals("twenty_two", currentStates.iterator().next().getId());
159+
assertEquals(1, currentStates.size());
160+
assertEquals("twenty_two", currentStates.iterator().next().getId());
157161
}
158162

159163
@Test
@@ -170,44 +174,44 @@ void testSCXMLExecutorTransitions01Sample() throws Exception {
170174
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/transitions-01.xml");
171175
exec.go();
172176
Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.ten");
173-
Assertions.assertEquals(1, currentStates.size());
174-
Assertions.assertEquals("twenty_one", currentStates.iterator().next().getId());
177+
assertEquals(1, currentStates.size());
178+
assertEquals("twenty_one", currentStates.iterator().next().getId());
175179
currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.twenty_one");
176-
Assertions.assertEquals(1, currentStates.size());
177-
Assertions.assertEquals("twenty_two", currentStates.iterator().next().getId());
180+
assertEquals(1, currentStates.size());
181+
assertEquals("twenty_two", currentStates.iterator().next().getId());
178182
SCXMLTestHelper.fireEvent(exec, "done.state.twenty_two");
179-
Assertions.assertEquals(3, exec.getStatus().getStates().size());
183+
assertEquals(3, exec.getStatus().getStates().size());
180184
}
181185

182186
@Test
183187
void testSCXMLExecutorTransitions02Sample() throws Exception {
184188
SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/transitions-02.xml");
185189
exec.go();
186190
Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "ten.stay");
187-
Assertions.assertEquals(1, currentStates.size());
188-
Assertions.assertEquals("ten", currentStates.iterator().next().getId());
191+
assertEquals(1, currentStates.size());
192+
assertEquals("ten", currentStates.iterator().next().getId());
189193
exec = SCXMLTestHelper.testInstanceSerializability(exec);
190194
currentStates = SCXMLTestHelper.fireEvent(exec, "ten.self");
191-
Assertions.assertEquals(1, currentStates.size());
192-
Assertions.assertEquals("ten", currentStates.iterator().next().getId());
195+
assertEquals(1, currentStates.size());
196+
assertEquals("ten", currentStates.iterator().next().getId());
193197
currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.ten");
194-
Assertions.assertEquals(1, currentStates.size());
195-
Assertions.assertEquals("twenty", currentStates.iterator().next().getId());
198+
assertEquals(1, currentStates.size());
199+
assertEquals("twenty", currentStates.iterator().next().getId());
196200
}
197201

198202
@Test
199203
void testSCXMLExecutorTransitions03Sample() throws Exception {
200204
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/transitions-03.xml");
201205
exec.go();
202206
final Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.ten");
203-
Assertions.assertEquals(3, currentStates.size());
207+
assertEquals(3, currentStates.size());
204208
final Set<String> expected = new HashSet<>();
205209
expected.add("twenty_one_2");
206210
expected.add("twenty_two_2");
207211
expected.add("twenty_three_2");
208212
for (final TransitionTarget tt : currentStates) {
209213
if (!expected.remove(tt.getId())) {
210-
Assertions.fail("'" + tt.getId()
214+
fail("'" + tt.getId()
211215
+ "' is not an expected current state ID");
212216
}
213217
}
@@ -218,20 +222,20 @@ void testSCXMLExecutorTransitions04Sample() throws Exception {
218222
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/transitions-04.xml");
219223
exec.go();
220224
Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.ten");
221-
Assertions.assertEquals(3, currentStates.size());
225+
assertEquals(3, currentStates.size());
222226
final Set<String> expected = new HashSet<>();
223227
expected.add("twenty_one_1");
224228
expected.add("twenty_two_1");
225229
expected.add("twenty_three_1");
226230
for (final TransitionTarget tt : currentStates) {
227231
if (!expected.remove(tt.getId())) {
228-
Assertions.fail("'" + tt.getId()
232+
fail("'" + tt.getId()
229233
+ "' is not an expected current state ID");
230234
}
231235
}
232236
currentStates = SCXMLTestHelper.fireEvent(exec, "bar");
233-
Assertions.assertEquals(1, currentStates.size());
234-
Assertions.assertEquals("thirty", currentStates.iterator().
237+
assertEquals(1, currentStates.size());
238+
assertEquals("thirty", currentStates.iterator().
235239
next().getId());
236240
}
237241

@@ -286,20 +290,20 @@ void testSend01Sample() throws Exception {
286290
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/send-01.xml");
287291
exec.go();
288292
Set<EnterableState> currentStates = exec.getStatus().getStates();
289-
Assertions.assertEquals(1, currentStates.size());
290-
Assertions.assertEquals("ten", currentStates.iterator().next().getId());
293+
assertEquals(1, currentStates.size());
294+
assertEquals("ten", currentStates.iterator().next().getId());
291295
currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.ten");
292-
Assertions.assertEquals(1, currentStates.size());
293-
Assertions.assertEquals("twenty", currentStates.iterator().next().getId());
296+
assertEquals(1, currentStates.size());
297+
assertEquals("twenty", currentStates.iterator().next().getId());
294298
}
295299

296300
@Test
297301
void testSend02TypeSCXMLSample() throws Exception {
298302
final SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/send-02.xml");
299303
exec.go();
300304
final Set<EnterableState> currentStates = exec.getStatus().getStates();
301-
Assertions.assertEquals(1, currentStates.size());
302-
Assertions.assertEquals("ninety", currentStates.iterator().next().getId());
303-
Assertions.assertTrue(exec.getStatus().isFinal());
305+
assertEquals(1, currentStates.size());
306+
assertEquals("ninety", currentStates.iterator().next().getId());
307+
assertTrue(exec.getStatus().isFinal());
304308
}
305309
}

0 commit comments

Comments
 (0)