Skip to content

Commit 9459d39

Browse files
committed
Changed switch to if-else to make Java 8 compatible
1 parent 9f8be15 commit 9459d39

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ buildscript {
1111
repositories {
1212
gradlePluginPortal()
1313
mavenCentral()
14+
mavenLocal()
1415
}
1516

1617
dependencies {

src/test/java/picocli/IAnnotatedElementProviderTest.java

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,36 +58,32 @@ public void testAnnotatedElementAccess() throws Exception {
5858
org.junit.Assert.assertTrue(option.getter() instanceof IAnnotatedElementProvider);
5959

6060
String optionName = option.names()[0];
61-
AnnotatedElement setterAnnotatedElement = ((IAnnotatedElementProvider) option.setter()).getAnnotatedElement();
62-
AnnotatedElement getterAnnotatedElement = ((IAnnotatedElementProvider) option.getter()).getAnnotatedElement();
63-
switch (optionName) {
64-
case "-a":
65-
case "-b":
61+
AnnotatedElement setterAnnotatedElement = ((IAnnotatedElementProvider) option.setter()).getAnnotatedElement();
62+
AnnotatedElement getterAnnotatedElement = ((IAnnotatedElementProvider) option.getter()).getAnnotatedElement();
63+
if ("-a".equals(optionName) || "-b".equals(optionName)) {
6664
org.junit.Assert.assertTrue(setterAnnotatedElement instanceof Field);
6765
org.junit.Assert.assertTrue(getterAnnotatedElement instanceof Field);
6866

6967
Field setterField = (Field) setterAnnotatedElement;
70-
org.junit.Assert.assertEquals(IAnnotatedElementProviderTestCommand.class, setterField.getDeclaringClass());
71-
org.junit.Assert.assertEquals(optionName.substring(1), setterField.getName());
68+
org.junit.Assert.assertEquals(IAnnotatedElementProviderTestCommand.class, setterField.getDeclaringClass());
69+
org.junit.Assert.assertEquals(optionName.substring(1), setterField.getName());
7270

7371
Field getterField = (Field) getterAnnotatedElement;
74-
org.junit.Assert.assertEquals(IAnnotatedElementProviderTestCommand.class, getterField.getDeclaringClass());
75-
org.junit.Assert.assertEquals(optionName.substring(1), getterField.getName());
76-
break;
77-
case "-c":
72+
org.junit.Assert.assertEquals(IAnnotatedElementProviderTestCommand.class, getterField.getDeclaringClass());
73+
org.junit.Assert.assertEquals(optionName.substring(1), getterField.getName());
74+
} else if ("-c".equals(optionName)) {
7875
org.junit.Assert.assertTrue(setterAnnotatedElement instanceof Method);
7976
org.junit.Assert.assertTrue(getterAnnotatedElement instanceof Method);
8077

8178
Method setterMethod = (Method) setterAnnotatedElement;
82-
org.junit.Assert.assertEquals(IAnnotatedElementProviderTestCommand.class, setterMethod.getDeclaringClass());
83-
org.junit.Assert.assertEquals("setC", setterMethod.getName());
79+
org.junit.Assert.assertEquals(IAnnotatedElementProviderTestCommand.class, setterMethod.getDeclaringClass());
80+
org.junit.Assert.assertEquals("setC", setterMethod.getName());
8481

8582
Method getterMethod = (Method) getterAnnotatedElement;
86-
org.junit.Assert.assertEquals(IAnnotatedElementProviderTestCommand.class, getterMethod.getDeclaringClass());
87-
org.junit.Assert.assertEquals("setC", getterMethod.getName());
88-
break;
89-
default:
90-
org.junit.Assert.fail("Unexpected option: " + optionName);
83+
org.junit.Assert.assertEquals(IAnnotatedElementProviderTestCommand.class, getterMethod.getDeclaringClass());
84+
org.junit.Assert.assertEquals("setC", getterMethod.getName());
85+
} else {
86+
org.junit.Assert.fail("Unexpected option: " + optionName);
9187
}
9288
}
9389
}

0 commit comments

Comments
 (0)