Skip to content

Commit 44cfbc0

Browse files
Migrate tests to JUnit5 (#121)
* Migrate annotations and imports * Migrate assertions * Remove public visibility for test classes and methods * Minor code cleanup
1 parent 78980c4 commit 44cfbc0

13 files changed

+696
-762
lines changed

src/test/java/jp/ikedam/jenkins/plugins/extensible_choice_parameter/ExtensibleChoiceParameterDefinitionJenkinsTest.java

Lines changed: 167 additions & 207 deletions
Large diffs are not rendered by default.

src/test/java/jp/ikedam/jenkins/plugins/extensible_choice_parameter/ExtensibleChoiceParameterDefinitionSimpleTest.java

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,108 +23,109 @@
2323
*/
2424
package jp.ikedam.jenkins.plugins.extensible_choice_parameter;
2525

26-
import static org.junit.Assert.*;
26+
import static org.junit.jupiter.api.Assertions.assertEquals;
2727

28-
import org.junit.Test;
28+
import org.junit.jupiter.api.Test;
2929

3030
/**
3131
* Test for ExtensibleChoiceParameterDefinition, not corresponding to Jenkins.
3232
*/
33-
public class ExtensibleChoiceParameterDefinitionSimpleTest {
33+
class ExtensibleChoiceParameterDefinitionSimpleTest {
34+
3435
@Test
35-
public void testExtensibleChoiceParameterDefinition_name() {
36+
void testExtensibleChoiceParameterDefinition_name() {
3637
// Simple value
3738
{
3839
ExtensibleChoiceParameterDefinition target =
3940
new ExtensibleChoiceParameterDefinition("name", null, false, "Some text");
40-
assertEquals("Simple value", "name", target.getName());
41+
assertEquals("name", target.getName(), "Simple value");
4142
}
4243
// value surrounded with spaces.
4344
{
4445
ExtensibleChoiceParameterDefinition target =
4546
new ExtensibleChoiceParameterDefinition(" name ", null, false, "Some text");
46-
assertEquals("value surrounded with spaces.", "name", target.getName());
47+
assertEquals("name", target.getName(), "value surrounded with spaces.");
4748
}
4849
}
4950

5051
@Test
51-
public void testExtensibleChoiceParameterDefinition_nameWithInvalidValue() {
52+
void testExtensibleChoiceParameterDefinition_nameWithInvalidValue() {
5253
// empty
5354
{
5455
ExtensibleChoiceParameterDefinition target =
5556
new ExtensibleChoiceParameterDefinition("", null, false, "Some text");
56-
assertEquals("Empty", "", target.getName());
57+
assertEquals("", target.getName(), "Empty");
5758
}
5859
// blank.
5960
{
6061
ExtensibleChoiceParameterDefinition target =
6162
new ExtensibleChoiceParameterDefinition(" ", null, false, "Some text");
62-
assertEquals("blank", "", target.getName());
63+
assertEquals("", target.getName(), "blank");
6364
}
6465
}
6566

6667
@Test
67-
public void testExtensibleChoiceParameterDefinition_description() {
68+
void testExtensibleChoiceParameterDefinition_description() {
6869
// Simple value
6970
{
7071
String description = "Some text";
7172
ExtensibleChoiceParameterDefinition target =
7273
new ExtensibleChoiceParameterDefinition("name", null, false, description);
73-
assertEquals("Simple value", description, target.getDescription());
74+
assertEquals(description, target.getDescription(), "Simple value");
7475
}
7576

7677
// value surrounded with blank letters
7778
{
7879
String description = " \nSome\n text ";
7980
ExtensibleChoiceParameterDefinition target =
8081
new ExtensibleChoiceParameterDefinition("name", null, false, description);
81-
assertEquals("value surrounded with blank letters", description, target.getDescription());
82+
assertEquals(description, target.getDescription(), "value surrounded with blank letters");
8283
}
8384

8485
// null
8586
{
8687
String description = null;
8788
ExtensibleChoiceParameterDefinition target =
8889
new ExtensibleChoiceParameterDefinition("name", null, false, description);
89-
assertEquals("null", description, target.getDescription());
90+
assertEquals(description, target.getDescription(), "null");
9091
}
9192
}
9293

9394
@Test
94-
public void testExtensibleChoiceParameterDefinition_choiceListProvider() {
95+
void testExtensibleChoiceParameterDefinition_choiceListProvider() {
9596
// Simple value
9697
{
9798
ChoiceListProvider provider = new TextareaChoiceListProvider("a\nb\nc\n", null, false, null);
9899
ExtensibleChoiceParameterDefinition target =
99100
new ExtensibleChoiceParameterDefinition("name", provider, false, "Some Text");
100-
assertEquals("Simple value", provider, target.getChoiceListProvider());
101+
assertEquals(provider, target.getChoiceListProvider(), "Simple value");
101102
}
102103

103104
// null
104105
{
105106
ChoiceListProvider provider = null;
106107
ExtensibleChoiceParameterDefinition target =
107108
new ExtensibleChoiceParameterDefinition("name", provider, false, "Some Text");
108-
assertEquals("null", provider, target.getChoiceListProvider());
109+
assertEquals(provider, target.getChoiceListProvider(), "null");
109110
}
110111
}
111112

112113
@Test
113-
public void testExtensibleChoiceParameterDefinition_editable() {
114+
void testExtensibleChoiceParameterDefinition_editable() {
114115
// editable
115116
{
116117
boolean editable = true;
117118
ExtensibleChoiceParameterDefinition target =
118119
new ExtensibleChoiceParameterDefinition("name", null, editable, "Some Text");
119-
assertEquals("editable", editable, target.isEditable());
120+
assertEquals(editable, target.isEditable(), "editable");
120121
}
121122

122123
// noneditable
123124
{
124125
boolean editable = false;
125126
ExtensibleChoiceParameterDefinition target =
126127
new ExtensibleChoiceParameterDefinition("name", null, editable, "Some Text");
127-
assertEquals("noneditable", editable, target.isEditable());
128+
assertEquals(editable, target.isEditable(), "noneditable");
128129
}
129130
}
130131
}

src/test/java/jp/ikedam/jenkins/plugins/extensible_choice_parameter/ExtensibleChoiceParameterJenkinsRule.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)