Skip to content

Commit e1fef35

Browse files
author
Psilo
committed
bump parent pom version
1 parent 9d3ba21 commit e1fef35

File tree

3 files changed

+71
-31
lines changed

3 files changed

+71
-31
lines changed

‎pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
<parent>
66
<groupId>info.unterrainer.commons</groupId>
77
<artifactId>parent-pom</artifactId>
8-
<version>0.0.24</version>
8+
<version>0.1.1</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>cli-utils</artifactId>
13-
<version>0.2.4</version>
13+
<version>0.2.5</version>
1414
<name>CliUtils</name>
1515
<packaging>jar</packaging>
1616

1717
<dependencies>
18-
<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
1918
<dependency>
2019
<groupId>commons-cli</groupId>
2120
<artifactId>commons-cli</artifactId>

‎src/main/java/info/unterrainer/commons/parentpom/Information.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package info.unterrainer.commons.parentpom;
2+
3+
public class Information {
4+
public static final String name = "Parent-POM";
5+
public static final String buildTime = "2020-10-22T05:49:32Z";
6+
public static final String pomVersion = "0.2.5";
7+
}

‎src/test/java/info/unterrainer/commons/cliutils/BuilderTests.java

Lines changed: 62 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package info.unterrainer.commons.cliutils;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.junit.Assert.assertThrows;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
55

6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
public class BuilderTests {
99

@@ -12,7 +12,8 @@ public void exampleCheckForHelpAndDisplayIt() {
1212
Cli cli = CliParser.cliFor(args, "test", "a test program")
1313
.addFlag(Flag.builder("test").description("a test flag"))
1414
.addArg(Arg.String("source").description("the source file").defaultValue("testsource"))
15-
.addArg(Arg.Float("float").description("testfloat").defaultValue(3.2F)).addArg(Arg.String("arg"))
15+
.addArg(Arg.Float("float").description("testfloat").defaultValue(3.2F))
16+
.addArg(Arg.String("arg"))
1617
.create();
1718

1819
if (cli.isHelpSet())
@@ -25,7 +26,8 @@ public void example() {
2526
Cli cli = CliParser.cliFor(args, "test", "a test program")
2627
.addFlag(Flag.builder("test").description("a test flag"))
2728
.addArg(Arg.String("source").description("the source file").defaultValue("testsource"))
28-
.addArg(Arg.Float("float").description("testfloat").defaultValue(3.2F)).addArg(Arg.String("arg"))
29+
.addArg(Arg.Float("float").description("testfloat").defaultValue(3.2F))
30+
.addArg(Arg.String("arg"))
2931
.create();
3032

3133
assertThat((String) cli.getArgValue("source")).isEqualTo("testsource");
@@ -38,7 +40,8 @@ public void example() {
3840
public void addedFlagCanBeRetrieved() {
3941
String[] args = "--flag".split(" ");
4042
Cli cli = CliParser.cliFor(args, "test", "a test program")
41-
.addFlag(Flag.builder("flag").description("a test flag")).create();
43+
.addFlag(Flag.builder("flag").description("a test flag"))
44+
.create();
4245

4346
assertThat(cli.isFlagSet("flag")).isTrue();
4447
}
@@ -68,9 +71,12 @@ public void notAddedFlagThrowsRuntimeException() {
6871
@Test
6972
public void addingArgsWithDefaultValuesReturnsDefaultValues() {
7073
String[] args = "".split(" ");
71-
Cli cli = CliParser.cliFor(args, "test", "a test program").addArg(Arg.String("string").defaultValue("test"))
72-
.addArg(Arg.Float("float").defaultValue(3.2F)).addArg(Arg.Double("double").defaultValue(3.3D))
73-
.addArg(Arg.Integer("integer").defaultValue(2)).create();
74+
Cli cli = CliParser.cliFor(args, "test", "a test program")
75+
.addArg(Arg.String("string").defaultValue("test"))
76+
.addArg(Arg.Float("float").defaultValue(3.2F))
77+
.addArg(Arg.Double("double").defaultValue(3.3D))
78+
.addArg(Arg.Integer("integer").defaultValue(2))
79+
.create();
7480

7581
assertThat((String) cli.getArgValue("string")).isEqualTo("test");
7682
assertThat((Float) cli.getArgValue("float")).isEqualByComparingTo(3.2F);
@@ -81,9 +87,12 @@ public void addingArgsWithDefaultValuesReturnsDefaultValues() {
8187
@Test
8288
public void addingAndSettingArgsWithDefaultValuesReturnsSetValues() {
8389
String[] args = "--string blah --float=1.9 --double 2.3 --integer 3".split(" ");
84-
Cli cli = CliParser.cliFor(args, "test", "a test program").addArg(Arg.String("string").defaultValue("test"))
85-
.addArg(Arg.Float("float").defaultValue(3.2F)).addArg(Arg.Double("double").defaultValue(3.3D))
86-
.addArg(Arg.Integer("integer").defaultValue(2)).create();
90+
Cli cli = CliParser.cliFor(args, "test", "a test program")
91+
.addArg(Arg.String("string").defaultValue("test"))
92+
.addArg(Arg.Float("float").defaultValue(3.2F))
93+
.addArg(Arg.Double("double").defaultValue(3.3D))
94+
.addArg(Arg.Integer("integer").defaultValue(2))
95+
.create();
8796

8897
assertThat((String) cli.getArgValue("string")).isEqualTo("blah");
8998
assertThat((Float) cli.getArgValue("float")).isEqualByComparingTo(1.9F);
@@ -95,45 +104,65 @@ public void addingAndSettingArgsWithDefaultValuesReturnsSetValues() {
95104
public void addingExactlyConstraintAndViolatingItThrowsException() {
96105
String[] args = "--flat --row".split(" ");
97106
assertThrows(RuntimeException.class,
98-
() -> CliParser.cliFor(args, "test", "a test program").addFlag(Flag.builder("flat"))
99-
.addFlag(Flag.builder("row")).addExactlyRequired(1, "flat", "row").create());
107+
() -> CliParser.cliFor(args, "test", "a test program")
108+
.addFlag(Flag.builder("flat"))
109+
.addFlag(Flag.builder("row"))
110+
.addExactlyRequired(1, "flat", "row")
111+
.create());
100112
}
101113

102114
@Test
103115
public void addingExactlyConstraintAndNotViolatingItWorks() {
104116
String[] args = "--flat".split(" ");
105-
Cli cli = CliParser.cliFor(args, "test", "a test program").addFlag(Flag.builder("flat"))
106-
.addFlag(Flag.builder("row")).addExactlyRequired(1, "flat", "row").create();
117+
Cli cli = CliParser.cliFor(args, "test", "a test program")
118+
.addFlag(Flag.builder("flat"))
119+
.addFlag(Flag.builder("row"))
120+
.addExactlyRequired(1, "flat", "row")
121+
.create();
107122
assertThat(cli.isFlagSet("flat")).isTrue();
108123
}
109124

110125
@Test
111126
public void addingMinConstraintAndViolatingItThrowsException() {
112127
String[] args = "".split(" ");
113-
assertThrows(RuntimeException.class, () -> CliParser.cliFor(args, "test", "a test program")
114-
.addFlag(Flag.builder("flat")).addFlag(Flag.builder("row")).addMinRequired(1, "flat", "row").create());
128+
assertThrows(RuntimeException.class,
129+
() -> CliParser.cliFor(args, "test", "a test program")
130+
.addFlag(Flag.builder("flat"))
131+
.addFlag(Flag.builder("row"))
132+
.addMinRequired(1, "flat", "row")
133+
.create());
115134
}
116135

117136
@Test
118137
public void addingMinConstraintAndNotViolatingItWorks() {
119138
String[] args = "--row".split(" ");
120-
Cli cli = CliParser.cliFor(args, "test", "a test program").addFlag(Flag.builder("flat"))
121-
.addFlag(Flag.builder("row")).addMinRequired(1, "flat", "row").create();
139+
Cli cli = CliParser.cliFor(args, "test", "a test program")
140+
.addFlag(Flag.builder("flat"))
141+
.addFlag(Flag.builder("row"))
142+
.addMinRequired(1, "flat", "row")
143+
.create();
122144
assertThat(cli.isFlagSet("row")).isTrue();
123145
}
124146

125147
@Test
126148
public void addingMaxConstraintAndViolatingItThrowsException() {
127149
String[] args = "--flat --row".split(" ");
128-
assertThrows(RuntimeException.class, () -> CliParser.cliFor(args, "test", "a test program")
129-
.addFlag(Flag.builder("flat")).addFlag(Flag.builder("row")).addMaxRequired(1, "flat", "row").create());
150+
assertThrows(RuntimeException.class,
151+
() -> CliParser.cliFor(args, "test", "a test program")
152+
.addFlag(Flag.builder("flat"))
153+
.addFlag(Flag.builder("row"))
154+
.addMaxRequired(1, "flat", "row")
155+
.create());
130156
}
131157

132158
@Test
133159
public void addingMaxConstraintAndNotViolatingItWorks() {
134160
String[] args = "--flat".split(" ");
135-
Cli cli = CliParser.cliFor(args, "test", "a test program").addFlag(Flag.builder("flat"))
136-
.addFlag(Flag.builder("row")).addMaxRequired(1, "flat", "row").create();
161+
Cli cli = CliParser.cliFor(args, "test", "a test program")
162+
.addFlag(Flag.builder("flat"))
163+
.addFlag(Flag.builder("row"))
164+
.addMaxRequired(1, "flat", "row")
165+
.create();
137166
assertThat(cli.isFlagSet("flat")).isTrue();
138167
}
139168

@@ -148,7 +177,8 @@ public void quotedArgumentsWork() {
148177
@Test
149178
public void unsetArgsAreUnsetEvenIfTheyHaveDefaultValues() {
150179
String[] args = "".split(" ");
151-
Cli cli = CliParser.cliFor(args, "test", "a test program").addArg(Arg.String("string").defaultValue("blah"))
180+
Cli cli = CliParser.cliFor(args, "test", "a test program")
181+
.addArg(Arg.String("string").defaultValue("blah"))
152182
.create();
153183

154184
assertThat(cli.isArgSet("string")).isFalse();
@@ -176,8 +206,10 @@ public void argsSetByShortNameAreSet() {
176206
@Test
177207
public void argsShortNamesAreCaseSensitive1() {
178208
String[] args = new String[] { "-r", "\"ns=3;s=Honeywell_OPC\"" };
179-
Cli cli = CliParser.cliFor(args, "test", "a test program").addArg(Arg.String("result").shortName("r"))
180-
.addArg(Arg.String("recursive").shortName("R")).create();
209+
Cli cli = CliParser.cliFor(args, "test", "a test program")
210+
.addArg(Arg.String("result").shortName("r"))
211+
.addArg(Arg.String("recursive").shortName("R"))
212+
.create();
181213

182214
assertThat(cli.isArgSet("result")).isTrue();
183215
assertThat(cli.isArgSet("recursive")).isFalse();
@@ -187,8 +219,10 @@ public void argsShortNamesAreCaseSensitive1() {
187219
@Test
188220
public void flagsShortNamesAreCaseSensitive2() {
189221
String[] args = new String[] { "-R" };
190-
Cli cli = CliParser.cliFor(args, "test", "a test program").addFlag(Flag.builder("result").shortName("r"))
191-
.addFlag(Flag.builder("recursive").shortName("R")).create();
222+
Cli cli = CliParser.cliFor(args, "test", "a test program")
223+
.addFlag(Flag.builder("result").shortName("r"))
224+
.addFlag(Flag.builder("recursive").shortName("R"))
225+
.create();
192226

193227
assertThat(cli.isFlagSet("result")).isFalse();
194228
assertThat(cli.isFlagSet("recursive")).isTrue();

0 commit comments

Comments
 (0)