Skip to content

Commit adb6df5

Browse files
Migrate tests to JUnit5 (#84)
* Migrate annotations and imports * Migrate assertions * Remove public visibility for test classes and methods * Minor code cleanup
1 parent b3288f1 commit adb6df5

17 files changed

+1679
-1605
lines changed
Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,212 +1,212 @@
11
package hudson.plugins.robot;
22

3-
import java.io.File;
3+
import org.junit.jupiter.api.Test;
44

5-
import org.junit.Test;
5+
import java.io.File;
66

7-
public class RobotParserTest {
7+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
88

9-
public void parse(String dir, String mask) {
10-
try {
11-
File directory = new File(RobotParserTest.class.getResource(dir).toURI());
12-
RobotParser.RobotParserCallable remoteOperation = new RobotParser.RobotParserCallable(mask, null, null);
13-
remoteOperation.invoke(directory, null);
14-
} catch (Exception e) {
15-
e.printStackTrace();
16-
assert (false);
17-
}
18-
}
9+
class RobotParserTest {
1910

2011
@Test
21-
public void testBasic1() {
12+
void testBasic1() {
2213
final String dir = ".";
2314
final String mask = "low_failure_output.xml";
2415
parse(dir, mask);
2516
}
2617

2718
@Test
28-
public void testBasic2() {
19+
void testBasic2() {
2920
final String dir = ".";
3021
final String mask = "rebot_output.xml";
3122
parse(dir, mask);
3223
}
3324

3425
@Test
35-
public void testBasic3() {
26+
void testBasic3() {
3627
final String dir = "blueocean";
3728
final String mask = "output.xml";
3829
parse(dir, mask);
3930
}
4031

4132
@Test
42-
public void testBasic4() {
33+
void testBasic4() {
4334
final String dir = "graph";
4435
final String mask = "output.xml";
4536
parse(dir, mask);
4637
}
4738

4839
@Test
49-
public void testBasic5() {
40+
void testBasic5() {
5041
final String dir = "model";
5142
final String mask = "collisions.xml";
5243
parse(dir, mask);
5344
}
5445

5546
@Test
56-
public void testBasic6() {
47+
void testBasic6() {
5748
final String dir = "model";
5849
final String mask = "new_critical_output.xml";
5950
parse(dir, mask);
6051
}
6152

6253
@Test
63-
public void testBasic7() {
54+
void testBasic7() {
6455
final String dir = "model";
6556
final String mask = "output.xml";
6657
parse(dir, mask);
6758
}
6859

6960
@Test
70-
public void testBasic8() {
61+
void testBasic8() {
7162
final String dir = "model";
7263
final String mask = "suite-setup-and-teardown.xml";
7364
parse(dir, mask);
7465
}
7566

7667
@Test
77-
public void testBasic9() {
68+
void testBasic9() {
7869
final String dir = "model";
7970
final String mask = "testfile.xml";
8071
parse(dir, mask);
8172
}
8273

8374
@Test
84-
public void testBasic10() {
75+
void testBasic10() {
8576
final String dir = "model";
8677
final String mask = "teardown_fail.xml";
8778
parse(dir, mask);
8879
}
8980

9081
@Test
91-
public void testBasic11() {
82+
void testBasic11() {
9283
final String dir = "model";
9384
final String mask = "testfile-001.xml";
9485
parse(dir, mask);
9586
}
9687

9788
@Test
98-
public void testBasic12() {
89+
void testBasic12() {
9990
final String dir = "model";
10091
final String mask = "testfile-002.xml";
10192
parse(dir, mask);
10293
}
10394

10495
@Test
105-
public void testBasic13() {
96+
void testBasic13() {
10697
final String dir = "RobotPublisherSystemTest/jobs/robot/workspace";
10798
final String mask = "output.xml";
10899
parse(dir, mask);
109100
}
110101

111102
@Test
112-
public void testBasic14() {
103+
void testBasic14() {
113104
final String dir = "RobotPublisherSystemTest/jobs/collisions/workspace";
114105
final String mask = "output.xml";
115106
parse(dir, mask);
116107
}
117108

118109
@Test
119-
public void testBasic15() {
110+
void testBasic15() {
120111
final String dir = "RobotPublisherSystemTest/jobs/disable-archive-output-xml/workspace";
121112
final String mask = "output.xml";
122113
parse(dir, mask);
123114
}
124115

125116
@Test
126-
public void testBasic16() {
117+
void testBasic16() {
127118
final String dir = "RobotPublisherSystemTest/jobs/dont-copy/workspace";
128119
final String mask = "output.xml";
129120
parse(dir, mask);
130121
}
131122

132123
@Test
133-
public void testBasic17() {
124+
void testBasic17() {
134125
final String dir = "RobotPublisherSystemTest/jobs/failingtests/workspace";
135126
final String mask = "output.xml";
136127
parse(dir, mask);
137128
}
138129

139130
@Test
140-
public void testBasic18() {
131+
void testBasic18() {
141132
final String dir = "RobotPublisherSystemTest/jobs/robot29output/workspace";
142133
final String mask = "output.xml";
143134
parse(dir, mask);
144135
}
145136

146137
@Test
147-
public void testBasic19() {
138+
void testBasic19() {
148139
final String dir = "RobotPublisherSystemTest/jobs/oldrobotbuild/workspace";
149140
final String mask = "output.xml";
150141
parse(dir, mask);
151142
}
152143

153144
@Test
154-
public void testNested1() {
145+
void testNested1() {
155146
final String dir = ".";
156147
final String mask = "nested_output.xml";
157148
parse(dir, mask);
158149
}
159150

160151
@Test
161-
public void testNested2() {
152+
void testNested2() {
162153
final String dir = ".";
163154
final String mask = "nested_output2.xml";
164155
parse(dir, mask);
165156
}
166157

167158
@Test
168-
public void testRobot4() {
159+
void testRobot4() {
169160
final String dir = ".";
170161
final String mask = "robot4_output.xml";
171162
parse(dir, mask);
172163
}
173164

174165
@Test
175-
public void testRobot4Nested() {
166+
void testRobot4Nested() {
176167
final String dir = ".";
177168
final String mask = "robot4_nested_output.xml";
178169
parse(dir, mask);
179170
}
180171

181172
@Test
182-
public void testRobot4If() {
173+
void testRobot4If() {
183174
final String dir = ".";
184175
final String mask = "robot4_if_output.xml";
185176
parse(dir, mask);
186177
}
187178

188-
/** Robot Framework 5.0 introduced TRY-EXCEPT, WHILE,
189-
* BREAK, and CONTINUE. The output file contains simple
190-
* test cases which use new features.
179+
/**
180+
* Robot Framework 5.0 introduced TRY-EXCEPT, WHILE,
181+
* BREAK, and CONTINUE. The output file contains simple
182+
* test cases which use new features.
191183
*/
192184
@Test
193-
public void testRobot5TryExceptFinallyWhileContinue() {
185+
void testRobot5TryExceptFinallyWhileContinue() {
194186
final String dir = "robot5";
195187
final String mask = "basic_new_features_output.xml";
196188
parse(dir, mask);
197189
}
198190

199191
@Test
200-
public void testEmptyArgTags() {
192+
void testEmptyArgTags() {
201193
final String dir = ".";
202194
final String mask = "empty_args-output.xml";
203195
parse(dir, mask);
204196
}
205197

206198
@Test
207-
public void testRF7InlineVar() {
199+
void testRF7InlineVar() {
208200
final String dir = "robot7";
209201
final String mask = "inline_var_output.xml";
210202
parse(dir, mask);
211203
}
204+
205+
private void parse(String dir, String mask) {
206+
assertDoesNotThrow(() -> {
207+
File directory = new File(RobotParserTest.class.getResource(dir).toURI());
208+
RobotParser.RobotParserCallable remoteOperation = new RobotParser.RobotParserCallable(mask, null, null);
209+
remoteOperation.invoke(directory, null);
210+
});
211+
}
212212
}

0 commit comments

Comments
 (0)