Skip to content

Commit d3afa3f

Browse files
sebjulliandsebjulliand
authored
Merge pull request #5 from strangelookingnerd/mirgate_to_junit5
Migrate tests to JUnit5
2 parents 930f03d + f5c12c4 commit d3afa3f

File tree

3 files changed

+82
-89
lines changed

3 files changed

+82
-89
lines changed

‎src/main/java/org/jenkinsci/plugins/ibmisteps/configuration/IBMiServerConfiguration.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.ByteArrayOutputStream;
44
import java.io.PrintStream;
5+
import java.nio.charset.StandardCharsets;
56
import java.util.Collections;
67
import java.util.Objects;
78
import java.util.logging.Level;
@@ -161,8 +162,8 @@ public final FormValidation doTestConnection(@QueryParameter(required = true) fi
161162
CredentialsMatchers.withId(credentialsId));
162163
final IBMiServerConfiguration config = new IBMiServerConfiguration("", host, credentialsId, ccsid, secure);
163164
final ByteArrayOutputStream output = new ByteArrayOutputStream();
164-
try (PrintStream stream = new PrintStream(output);
165-
IBMi ibmi = new IBMi(stream, host, credentials, config.getCcsidInt(), secure, false)) {
165+
try (PrintStream stream = new PrintStream(output, false, StandardCharsets.UTF_8);
166+
IBMi ibmi = new IBMi(stream, host, credentials, config.getCcsidInt(), secure, false)) {
166167
return FormValidation.ok(Messages.IBMiServer_ConnectionOk(host, ibmi.getOSVersion()));
167168
} catch (final Exception e) {
168169
LOGGER.log(Level.SEVERE, Messages.IBMiServer_ConnectionFailed(e.getLocalizedMessage()), e);

‎src/test/java/org/jenkinsci/plugins/ibmisteps/configuration/IBMiGlobalConfigurationTests.java‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,37 @@
11
package org.jenkinsci.plugins.ibmisteps.configuration;
22

3-
import org.junit.Rule;
4-
import org.junit.Test;
5-
import org.jvnet.hudson.test.JenkinsRule;
6-
import org.jvnet.hudson.test.recipes.LocalData;
7-
8-
import static org.junit.Assert.assertNotNull;
9-
import static org.junit.Assert.assertNull;
103
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertNotNull;
5+
import static org.junit.jupiter.api.Assertions.assertNull;
116

12-
public class IBMiGlobalConfigurationTests {
7+
import org.junit.jupiter.api.Test;
8+
import org.jvnet.hudson.test.JenkinsRule;
9+
import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
10+
import org.jvnet.hudson.test.recipes.LocalData;
1311

14-
@Rule
15-
public JenkinsRule jenkins = new JenkinsRule();
12+
@WithJenkins
13+
class IBMiGlobalConfigurationTests {
1614

1715
@Test
1816
@LocalData
19-
public void loadConfigurationTest() {
17+
void loadConfigurationTest(JenkinsRule jenkins) {
2018
final IBMiGlobalConfiguration configuration = IBMiGlobalConfiguration.get();
2119
assertNotNull(configuration);
2220

2321
final IBMiServerConfiguration server1 = configuration.getServer("IBMi 1");
24-
assertNotNull("Server IBMi 1 must exist", server1);
25-
assertEquals(new IBMiServerConfiguration("IBMi 1",
26-
"ibmi1.sebjulliand.github.com",
27-
"a6d5ecee-c167-4ec5-8b5e-ee39ddb5c96e",
28-
"",
29-
true),
22+
assertNotNull(server1, "Server IBMi 1 must exist");
23+
assertEquals(
24+
new IBMiServerConfiguration(
25+
"IBMi 1", "ibmi1.sebjulliand.github.com", "a6d5ecee-c167-4ec5-8b5e-ee39ddb5c96e", "", true),
3026
server1);
3127

3228
final IBMiServerConfiguration server2 = configuration.getServer("IBMi 2");
33-
assertNotNull("Server IBMi 2 must exist", server2);
34-
assertEquals(new IBMiServerConfiguration("IBMi 2",
35-
"ibmi2.sebjulliand.github.com",
36-
"hello-world",
37-
"37",
38-
false),
29+
assertNotNull(server2, "Server IBMi 2 must exist");
30+
assertEquals(
31+
new IBMiServerConfiguration("IBMi 2", "ibmi2.sebjulliand.github.com", "hello-world", "37", false),
3932
server2);
4033

4134
final IBMiServerConfiguration notFoundServer = configuration.getServer("NotFound");
42-
assertNull("Server 'NotFound' doesn't exist", notFoundServer);
35+
assertNull(notFoundServer, "Server 'NotFound' doesn't exist");
4336
}
4437
}

‎src/test/java/org/jenkinsci/plugins/ibmisteps/configuration/IBMiServerConfigurationTests.java‎

Lines changed: 62 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,75 @@
11
package org.jenkinsci.plugins.ibmisteps.configuration;
22

3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertNotEquals;
5-
6-
import org.jenkinsci.plugins.ibmisteps.configuration.IBMiServerConfiguration.DescriptorImpl;
7-
import org.junit.Test;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
85

96
import hudson.util.FormValidation;
7+
import org.jenkinsci.plugins.ibmisteps.configuration.IBMiServerConfiguration.DescriptorImpl;
8+
import org.junit.jupiter.api.Test;
109

11-
public class IBMiServerConfigurationTests {
10+
class IBMiServerConfigurationTests {
1211

13-
@Test
14-
public void testChecks() {
15-
final DescriptorImpl serverDescriptor = new IBMiServerConfiguration.DescriptorImpl();
12+
@Test
13+
void testChecks() {
14+
final DescriptorImpl serverDescriptor = new IBMiServerConfiguration.DescriptorImpl();
1615

17-
final IBMiServerConfiguration validServer = new IBMiServerConfiguration("An IBMi server", "server.address",
18-
"1234567890", "0", false);
19-
assertEquals("CCSID must be a number", FormValidation.Kind.OK,
20-
serverDescriptor.doCheckCcsid(validServer.getCcsid()).kind);
21-
assertEquals("credentials are mandatory", FormValidation.Kind.OK,
22-
serverDescriptor.doCheckCredentialsId(validServer.getCredentialsId()).kind);
16+
final IBMiServerConfiguration validServer =
17+
new IBMiServerConfiguration("An IBMi server", "server.address", "1234567890", "0", false);
18+
assertEquals(
19+
FormValidation.Kind.OK,
20+
serverDescriptor.doCheckCcsid(validServer.getCcsid()).kind,
21+
"CCSID must be a number");
22+
assertEquals(
23+
FormValidation.Kind.OK,
24+
serverDescriptor.doCheckCredentialsId(validServer.getCredentialsId()).kind,
25+
"credentials are mandatory");
2326

24-
final IBMiServerConfiguration invalidServer = new IBMiServerConfiguration("", "", "", "NaN", false);
25-
assertEquals("CCSID must be a number", FormValidation.Kind.ERROR,
26-
serverDescriptor.doCheckCcsid(invalidServer.getCcsid()).kind);
27-
assertEquals("credentials are mandatory", FormValidation.Kind.ERROR,
28-
serverDescriptor.doCheckCredentialsId(invalidServer.getCredentialsId()).kind);
27+
final IBMiServerConfiguration invalidServer = new IBMiServerConfiguration("", "", "", "NaN", false);
28+
assertEquals(
29+
FormValidation.Kind.ERROR,
30+
serverDescriptor.doCheckCcsid(invalidServer.getCcsid()).kind,
31+
"CCSID must be a number");
32+
assertEquals(
33+
FormValidation.Kind.ERROR,
34+
serverDescriptor.doCheckCredentialsId(invalidServer.getCredentialsId()).kind,
35+
"credentials are mandatory");
2936

30-
assertEquals("CCSID must be a number", FormValidation.Kind.ERROR,
31-
serverDescriptor.doCheckCcsid("X").kind);
32-
assertEquals("CCSID must be positive", FormValidation.Kind.ERROR,
33-
serverDescriptor.doCheckCcsid("-1").kind);
34-
assertEquals("CCSID must be < 65535", FormValidation.Kind.ERROR,
35-
serverDescriptor.doCheckCcsid("666666").kind);
36-
assertEquals("CCSID cannot be 5026", FormValidation.Kind.ERROR,
37-
serverDescriptor.doCheckCcsid("5026").kind);
38-
}
37+
assertEquals(FormValidation.Kind.ERROR, serverDescriptor.doCheckCcsid("X").kind, "CCSID must be a number");
38+
assertEquals(FormValidation.Kind.ERROR, serverDescriptor.doCheckCcsid("-1").kind, "CCSID must be positive");
39+
assertEquals(FormValidation.Kind.ERROR, serverDescriptor.doCheckCcsid("666666").kind, "CCSID must be < 65535");
40+
assertEquals(FormValidation.Kind.ERROR, serverDescriptor.doCheckCcsid("5026").kind, "CCSID cannot be 5026");
41+
}
3942

40-
@Test
41-
public void testEquals() {
42-
final IBMiServerConfiguration server = new IBMiServerConfiguration("An IBMi server", "server.address",
43-
"1234567890", "37", true);
44-
final IBMiServerConfiguration serverEquals = new IBMiServerConfiguration("An IBMi server", "server.address",
45-
"1234567890", "37", true);
46-
final IBMiServerConfiguration serverNotEquals1 = new IBMiServerConfiguration("Another IBMi server",
47-
"server.address", "1234567890", "37",
48-
true);
49-
final IBMiServerConfiguration serverNotEquals2 = new IBMiServerConfiguration("An IBMi server",
50-
"server.address.else", "1234567890", "37",
51-
true);
52-
final IBMiServerConfiguration serverNotEquals3 = new IBMiServerConfiguration("An IBMi server", "server.address",
53-
"a6d5ecee", "37", true);
54-
final IBMiServerConfiguration serverNotEquals4 = new IBMiServerConfiguration("An IBMi server", "server.address",
55-
"1234567890", "5026",
56-
true);
57-
final IBMiServerConfiguration serverNotEquals5 = new IBMiServerConfiguration("An IBMi server", "server.address",
58-
"1234567890", "37",
59-
false);
43+
@Test
44+
void testEquals() {
45+
final IBMiServerConfiguration server =
46+
new IBMiServerConfiguration("An IBMi server", "server.address", "1234567890", "37", true);
47+
final IBMiServerConfiguration serverEquals =
48+
new IBMiServerConfiguration("An IBMi server", "server.address", "1234567890", "37", true);
49+
final IBMiServerConfiguration serverNotEquals1 =
50+
new IBMiServerConfiguration("Another IBMi server", "server.address", "1234567890", "37", true);
51+
final IBMiServerConfiguration serverNotEquals2 =
52+
new IBMiServerConfiguration("An IBMi server", "server.address.else", "1234567890", "37", true);
53+
final IBMiServerConfiguration serverNotEquals3 =
54+
new IBMiServerConfiguration("An IBMi server", "server.address", "a6d5ecee", "37", true);
55+
final IBMiServerConfiguration serverNotEquals4 =
56+
new IBMiServerConfiguration("An IBMi server", "server.address", "1234567890", "5026", true);
57+
final IBMiServerConfiguration serverNotEquals5 =
58+
new IBMiServerConfiguration("An IBMi server", "server.address", "1234567890", "37", false);
6059

61-
assertEquals("Servers are equal", server, serverEquals);
62-
assertNotEquals("name is different", server, serverNotEquals1);
63-
assertNotEquals("host is different", server, serverNotEquals2);
64-
assertNotEquals("credentials are different", server, serverNotEquals3);
65-
assertNotEquals("CCSID is different", server, serverNotEquals4);
66-
assertNotEquals("secure is different", server, serverNotEquals5);
67-
}
60+
assertEquals(server, serverEquals, "Servers are equal");
61+
assertNotEquals(server, serverNotEquals1, "name is different");
62+
assertNotEquals(server, serverNotEquals2, "host is different");
63+
assertNotEquals(server, serverNotEquals3, "credentials are different");
64+
assertNotEquals(server, serverNotEquals4, "CCSID is different");
65+
assertNotEquals(server, serverNotEquals5, "secure is different");
66+
}
6867

69-
@Test
70-
public void testCCSIDConversion() {
71-
assertEquals(37, new IBMiServerConfiguration("", "", "", "37", false).getCcsidInt());
72-
assertEquals(0, new IBMiServerConfiguration("", "", "", "0", false).getCcsidInt());
73-
assertEquals(0, new IBMiServerConfiguration("", "", "", "", false).getCcsidInt());
74-
assertEquals(-1, new IBMiServerConfiguration("", "", "", "nope", false).getCcsidInt());
75-
}
68+
@Test
69+
void testCCSIDConversion() {
70+
assertEquals(37, new IBMiServerConfiguration("", "", "", "37", false).getCcsidInt());
71+
assertEquals(0, new IBMiServerConfiguration("", "", "", "0", false).getCcsidInt());
72+
assertEquals(0, new IBMiServerConfiguration("", "", "", "", false).getCcsidInt());
73+
assertEquals(-1, new IBMiServerConfiguration("", "", "", "nope", false).getCcsidInt());
74+
}
7675
}

0 commit comments

Comments
 (0)