Skip to content

Commit b99f6be

Browse files
slawekjaranowskislawekjaranowski
committed
Remove public modifiers from JUnit 5 tests
1 parent f21a027 commit b99f6be

File tree

2 files changed

+33
-32
lines changed

2 files changed

+33
-32
lines changed

‎src/test/java/org/codehaus/mojo/buildhelper/ParseVersionTest.java

+30-29
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,28 @@
3232

3333
import static org.junit.jupiter.api.Assertions.assertEquals;
3434

35-
public class ParseVersionTest {
36-
public static class TestParseVersionMojo extends ParseVersionMojo {
35+
class ParseVersionTest {
36+
static class TestParseVersionMojo extends ParseVersionMojo {
3737
private final Properties properties;
3838

39-
public TestParseVersionMojo(Properties properties) {
39+
TestParseVersionMojo(Properties properties) {
4040
this.properties = properties;
4141
}
4242

43+
@Override
4344
protected void defineProperty(String name, String value) {
4445
properties.put(name, value);
4546
}
4647
}
4748

4849
@Nested
49-
public class TestParseVersion {
50+
class TestParseVersion {
5051
private Properties props;
5152

5253
private ParseVersionMojo mojo;
5354

5455
@BeforeEach
55-
public void beforeClass() {
56+
void beforeClass() {
5657
props = new Properties();
5758
mojo = new TestParseVersionMojo(props);
5859
mojo.setPropertyPrefix("parsed");
@@ -67,7 +68,7 @@ public void beforeClass() {
6768
}
6869

6970
@Test
70-
public void checkJunkVersion() {
71+
void checkJunkVersion() {
7172
// Test a junk version string
7273
mojo.parseVersion("junk");
7374

@@ -80,7 +81,7 @@ public void checkJunkVersion() {
8081
}
8182

8283
@Test
83-
public void checkBasicMavenVersionString() {
84+
void checkBasicMavenVersionString() {
8485
// Test a basic maven version string
8586
mojo.parseVersion("1.0.0");
8687

@@ -93,7 +94,7 @@ public void checkBasicMavenVersionString() {
9394
}
9495

9596
@Test
96-
public void checkVersionStringWithQualifier() {
97+
void checkVersionStringWithQualifier() {
9798
// Test a version string with qualifier
9899
mojo.parseVersion("2.3.4-beta-5");
99100

@@ -106,7 +107,7 @@ public void checkVersionStringWithQualifier() {
106107
}
107108

108109
@Test
109-
public void checkOSGiVersionStringWithQualifier() {
110+
void checkOSGiVersionStringWithQualifier() {
110111
// Test an osgi version string
111112
mojo.parseVersion("2.3.4.beta_5");
112113

@@ -119,7 +120,7 @@ public void checkOSGiVersionStringWithQualifier() {
119120
}
120121

121122
@Test
122-
public void checkSnapshotVersion() {
123+
void checkSnapshotVersion() {
123124
// Test a snapshot version string
124125
mojo.parseVersion("1.2.3-SNAPSHOT");
125126

@@ -132,7 +133,7 @@ public void checkSnapshotVersion() {
132133
}
133134

134135
@Test
135-
public void checkSnapshotVersion2() {
136+
void checkSnapshotVersion2() {
136137
// Test a snapshot version string
137138
mojo.parseVersion("2.0.17-SNAPSHOT");
138139

@@ -145,7 +146,7 @@ public void checkSnapshotVersion2() {
145146
}
146147

147148
@Test
148-
public void checkVersionStringWithBuildNumber() {
149+
void checkVersionStringWithBuildNumber() {
149150
// Test a version string with a build number
150151
mojo.parseVersion("1.2.3-4");
151152

@@ -158,7 +159,7 @@ public void checkVersionStringWithBuildNumber() {
158159
}
159160

160161
@Test
161-
public void checkSnapshotVersionStringWithBuildNumber() {
162+
void checkSnapshotVersionStringWithBuildNumber() {
162163
// Test a version string with a build number
163164
mojo.parseVersion("1.2.3-4-SNAPSHOT");
164165

@@ -178,7 +179,7 @@ class TestParseNextVersion {
178179
private ParseVersionMojo mojo;
179180

180181
@BeforeEach
181-
public void beforeClass() {
182+
void beforeClass() {
182183
props = new Properties();
183184
mojo = new TestParseVersionMojo(props);
184185
mojo.setPropertyPrefix("parsed");
@@ -192,7 +193,7 @@ public void beforeClass() {
192193
}
193194

194195
@Test
195-
public void checkJunkVersion() {
196+
void checkJunkVersion() {
196197
mojo.parseVersion("junk");
197198

198199
assertEquals("1", props.getProperty("parsed.nextMajorVersion"));
@@ -202,7 +203,7 @@ public void checkJunkVersion() {
202203
}
203204

204205
@Test
205-
public void testBasicMavenVersion() {
206+
void testBasicMavenVersion() {
206207
mojo.parseVersion("1.0.0");
207208

208209
assertEquals("2", props.getProperty("parsed.nextMajorVersion"));
@@ -212,7 +213,7 @@ public void testBasicMavenVersion() {
212213
}
213214

214215
@Test
215-
public void testVersionStringWithQualifier() {
216+
void testVersionStringWithQualifier() {
216217
mojo.parseVersion("2.3.4-beta-5");
217218

218219
assertEquals("3", props.getProperty("parsed.nextMajorVersion"));
@@ -222,7 +223,7 @@ public void testVersionStringWithQualifier() {
222223
}
223224

224225
@Test
225-
public void testOSGiVersion() {
226+
void testOSGiVersion() {
226227
mojo.parseVersion("2.3.4.beta_5");
227228

228229
assertEquals("3", props.getProperty("parsed.nextMajorVersion"));
@@ -232,7 +233,7 @@ public void testOSGiVersion() {
232233
}
233234

234235
@Test
235-
public void testSnapshotVersion() {
236+
void testSnapshotVersion() {
236237
// Test a snapshot version string
237238
mojo.parseVersion("1.2.3-SNAPSHOT");
238239

@@ -243,7 +244,7 @@ public void testSnapshotVersion() {
243244
}
244245

245246
@Test
246-
public void testSnapshotVersion2() {
247+
void testSnapshotVersion2() {
247248
// Test a snapshot version string
248249
mojo.parseVersion("2.0.17-SNAPSHOT");
249250

@@ -254,7 +255,7 @@ public void testSnapshotVersion2() {
254255
}
255256

256257
@Test
257-
public void testVersionStringWithBuildNumber() {
258+
void testVersionStringWithBuildNumber() {
258259
mojo.parseVersion("1.2.3-4");
259260

260261
assertEquals("2", props.getProperty("parsed.nextMajorVersion"));
@@ -271,7 +272,7 @@ class TestFormattedVersion {
271272
private ParseVersionMojo mojo;
272273

273274
@BeforeEach
274-
public void beforeClass() {
275+
void beforeClass() {
275276
props = new Properties();
276277
mojo = new TestParseVersionMojo(props);
277278
mojo.setPropertyPrefix("parsed");
@@ -285,7 +286,7 @@ public void beforeClass() {
285286
}
286287

287288
@Test
288-
public void testJunkVersion() {
289+
void testJunkVersion() {
289290
mojo.parseVersion("junk");
290291

291292
assertEquals("00", props.getProperty("formatted.majorVersion"));
@@ -300,7 +301,7 @@ public void testJunkVersion() {
300301
}
301302

302303
@Test
303-
public void testBasicMavenVersion() {
304+
void testBasicMavenVersion() {
304305
mojo.parseVersion("1.0.0");
305306

306307
assertEquals("01", props.getProperty("formatted.majorVersion"));
@@ -315,7 +316,7 @@ public void testBasicMavenVersion() {
315316
}
316317

317318
@Test
318-
public void testVersionStringWithQualifier() {
319+
void testVersionStringWithQualifier() {
319320
mojo.parseVersion("2.3.4-beta-5");
320321

321322
assertEquals("02", props.getProperty("formatted.majorVersion"));
@@ -330,7 +331,7 @@ public void testVersionStringWithQualifier() {
330331
}
331332

332333
@Test
333-
public void testOSGiVersion() {
334+
void testOSGiVersion() {
334335
mojo.parseVersion("2.3.4.beta_5");
335336

336337
assertEquals("02", props.getProperty("formatted.majorVersion"));
@@ -345,7 +346,7 @@ public void testOSGiVersion() {
345346
}
346347

347348
@Test
348-
public void testSnapshotVersion() {
349+
void testSnapshotVersion() {
349350
// Test a snapshot version string
350351
mojo.parseVersion("1.2.3-SNAPSHOT");
351352

@@ -361,7 +362,7 @@ public void testSnapshotVersion() {
361362
}
362363

363364
@Test
364-
public void testSnapshotVersion2() {
365+
void testSnapshotVersion2() {
365366
// Test a snapshot version string
366367
mojo.parseVersion("2.0.17-SNAPSHOT");
367368

@@ -377,7 +378,7 @@ public void testSnapshotVersion2() {
377378
}
378379

379380
@Test
380-
public void testVersionStringWithBuildNumber() {
381+
void testVersionStringWithBuildNumber() {
381382
mojo.parseVersion("1.2.3-4");
382383

383384
assertEquals("01", props.getProperty("formatted.majorVersion"));

‎src/test/java/org/codehaus/mojo/buildhelper/versioning/VersionInformationTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/**
3030
* @author Karl Heinz Marbaise <a href="mailto:[email protected]">[email protected]</a>
3131
*/
32-
public class VersionInformationTest {
32+
class VersionInformationTest {
3333
// @formatter:off
3434
private static Object[][] createVersions() {
3535
return new Object[][] {
@@ -71,7 +71,7 @@ private static Object[][] createVersions() {
7171

7272
@ParameterizedTest
7373
@MethodSource("createVersions")
74-
public void checkVersions(String version, int major, int minor, int patch, long buildNumber, String qualifier) {
74+
void checkVersions(String version, int major, int minor, int patch, long buildNumber, String qualifier) {
7575
VersionInformation vi = new VersionInformation(version);
7676
assertEquals(vi.getMajor(), major);
7777
assertEquals(vi.getMinor(), minor);
@@ -81,7 +81,7 @@ public void checkVersions(String version, int major, int minor, int patch, long
8181
}
8282

8383
@Test
84-
public void shouldFaileWithNumberFormatException() {
84+
void shouldFaileWithNumberFormatException() {
8585
assertThrows(NumberFormatException.class, () -> new VersionInformation("999999999999.12345678.12.beta_5"));
8686
}
8787
}

0 commit comments

Comments
 (0)