Skip to content

Commit 6932cec

Browse files
authored
JUnit5 assertThrows OptionTest (apache#140)
* JUnit5 Api Dependency * JUnit5 assertThrows OptionTest
1 parent c89c385 commit 6932cec

1 file changed

Lines changed: 20 additions & 12 deletions

File tree

src/test/java/org/apache/commons/cli/OptionTest.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.commons.cli;
1919

20+
import static org.junit.jupiter.api.Assertions.assertThrows;
2021
import static org.junit.Assert.assertEquals;
2122
import static org.junit.Assert.assertFalse;
2223
import static org.junit.Assert.assertNotEquals;
@@ -27,6 +28,7 @@
2728
import org.junit.Test;
2829

2930
public class OptionTest {
31+
3032
private static class DefaultOption extends Option {
3133
private static final long serialVersionUID = 1L;
3234

@@ -71,34 +73,40 @@ private static void checkOption(final Option option, final String opt, final Str
7173
assertEquals(cls, option.getType());
7274
}
7375

74-
@Test(expected = IllegalArgumentException.class)
76+
@Test
7577
public void testBuilderInsufficientParams1() {
76-
Option.builder().desc("desc").build();
78+
assertThrows(IllegalArgumentException.class, () ->
79+
Option.builder().desc("desc").build());
7780
}
7881

79-
@Test(expected = IllegalArgumentException.class)
82+
@Test
8083
public void testBuilderInsufficientParams2() {
81-
Option.builder(null).desc("desc").build();
84+
assertThrows(IllegalArgumentException.class, () ->
85+
Option.builder(null).desc("desc").build());
8286
}
8387

84-
@Test(expected = IllegalArgumentException.class)
88+
@Test
8589
public void testBuilderInvalidOptionName1() {
86-
Option.builder().option("invalid?");
90+
assertThrows(IllegalArgumentException.class, () ->
91+
Option.builder().option("invalid?"));
8792
}
8893

89-
@Test(expected = IllegalArgumentException.class)
94+
@Test
9095
public void testBuilderInvalidOptionName2() {
91-
Option.builder().option("invalid@");
96+
assertThrows(IllegalArgumentException.class, () ->
97+
Option.builder().option("invalid@"));
9298
}
9399

94-
@Test(expected = IllegalArgumentException.class)
100+
@Test
95101
public void testBuilderInvalidOptionName3() {
96-
Option.builder("invalid?");
102+
assertThrows(IllegalArgumentException.class, () ->
103+
Option.builder("invalid?"));
97104
}
98105

99-
@Test(expected = IllegalArgumentException.class)
106+
@Test
100107
public void testBuilderInvalidOptionName4() {
101-
Option.builder("invalid@");
108+
assertThrows(IllegalArgumentException.class, () ->
109+
Option.builder("invalid@"));
102110
}
103111

104112
@Test

0 commit comments

Comments
 (0)