|
17 | 17 |
|
18 | 18 | package org.apache.commons.cli; |
19 | 19 |
|
| 20 | +import static org.junit.jupiter.api.Assertions.assertThrows; |
20 | 21 | import static org.junit.Assert.assertEquals; |
21 | 22 | import static org.junit.Assert.assertFalse; |
22 | 23 | import static org.junit.Assert.assertNotEquals; |
|
27 | 28 | import org.junit.Test; |
28 | 29 |
|
29 | 30 | public class OptionTest { |
| 31 | + |
30 | 32 | private static class DefaultOption extends Option { |
31 | 33 | private static final long serialVersionUID = 1L; |
32 | 34 |
|
@@ -71,34 +73,40 @@ private static void checkOption(final Option option, final String opt, final Str |
71 | 73 | assertEquals(cls, option.getType()); |
72 | 74 | } |
73 | 75 |
|
74 | | - @Test(expected = IllegalArgumentException.class) |
| 76 | + @Test |
75 | 77 | public void testBuilderInsufficientParams1() { |
76 | | - Option.builder().desc("desc").build(); |
| 78 | + assertThrows(IllegalArgumentException.class, () -> |
| 79 | + Option.builder().desc("desc").build()); |
77 | 80 | } |
78 | 81 |
|
79 | | - @Test(expected = IllegalArgumentException.class) |
| 82 | + @Test |
80 | 83 | public void testBuilderInsufficientParams2() { |
81 | | - Option.builder(null).desc("desc").build(); |
| 84 | + assertThrows(IllegalArgumentException.class, () -> |
| 85 | + Option.builder(null).desc("desc").build()); |
82 | 86 | } |
83 | 87 |
|
84 | | - @Test(expected = IllegalArgumentException.class) |
| 88 | + @Test |
85 | 89 | public void testBuilderInvalidOptionName1() { |
86 | | - Option.builder().option("invalid?"); |
| 90 | + assertThrows(IllegalArgumentException.class, () -> |
| 91 | + Option.builder().option("invalid?")); |
87 | 92 | } |
88 | 93 |
|
89 | | - @Test(expected = IllegalArgumentException.class) |
| 94 | + @Test |
90 | 95 | public void testBuilderInvalidOptionName2() { |
91 | | - Option.builder().option("invalid@"); |
| 96 | + assertThrows(IllegalArgumentException.class, () -> |
| 97 | + Option.builder().option("invalid@")); |
92 | 98 | } |
93 | 99 |
|
94 | | - @Test(expected = IllegalArgumentException.class) |
| 100 | + @Test |
95 | 101 | public void testBuilderInvalidOptionName3() { |
96 | | - Option.builder("invalid?"); |
| 102 | + assertThrows(IllegalArgumentException.class, () -> |
| 103 | + Option.builder("invalid?")); |
97 | 104 | } |
98 | 105 |
|
99 | | - @Test(expected = IllegalArgumentException.class) |
| 106 | + @Test |
100 | 107 | public void testBuilderInvalidOptionName4() { |
101 | | - Option.builder("invalid@"); |
| 108 | + assertThrows(IllegalArgumentException.class, () -> |
| 109 | + Option.builder("invalid@")); |
102 | 110 | } |
103 | 111 |
|
104 | 112 | @Test |
|
0 commit comments