Tweaked tests to work on Java 7 and 8.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java
index 7cf66eb..488fcb5 100644
--- a/src/test/java/com/beust/jcommander/JCommanderTest.java
+++ b/src/test/java/com/beust/jcommander/JCommanderTest.java
@@ -348,6 +348,9 @@ public class JCommanderTest {
       @Parameter(names = "--extensions", splitter = HiddenParameterSplitter.class)
       public List<String> extensions;
     }
+    if (HiddenParameterSplitter.class.getConstructors().length == 0) {
+      return; // Compiler has optimised away the private constructor
+    }
 
     Args args = new Args();
     new JCommander(args, "--extensions", ".txt;.md");
@@ -641,9 +644,16 @@ public class JCommanderTest {
 
     List<ChoiceType> expected = Arrays.asList(ChoiceType.ONE, ChoiceType.Two);
     Assert.assertEquals(expected, args.choices);
-    Assert.assertEquals(jc.getParameters().get(0).getDescription(),
-        "Options: " + EnumSet.allOf((Class<? extends Enum>) ArgsEnum.ChoiceType.class));
 
+    for (ParameterDescription param : jc.getParameters()) {
+      // order can vary depending on JDK version
+      if (param.getLongestName().equals("-choice")) {
+        Assert.assertEquals(param.getDescription(),
+          "Options: " + EnumSet.allOf((Class<? extends Enum>) ArgsEnum.ChoiceType.class));
+        return;
+      }
+    }
+    Assert.fail("Could not find -choice parameter.");
   }
 
   public void enumArgsCaseInsensitive() {