Prevent bug with empty options (EnumSet.copyOf needs at least one ele…

…ment)
policeman-tools · Aug 23, 2015 · 947da61 · 947da61
1 parent f00539a
commit 947da61
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/de/thetaphi/forbiddenapis/Checker.java b/src/main/java/de/thetaphi/forbiddenapis/Checker.java
@@ -94,9 +94,8 @@ public static enum Option {
   protected abstract void logWarn(String msg);
   protected abstract void logInfo(String msg);
 
-  //public Checker(ClassLoader loader, boolean internalRuntimeForbidden, boolean failOnMissingClasses, boolean failOnViolation, boolean defaultFailOnUnresolvableSignatures) {
   public Checker(ClassLoader loader, Option... options) {
-    this(loader, EnumSet.copyOf(Arrays.asList(options)));
+    this(loader, (options.length == 0) ? EnumSet.noneOf(Option.class) : EnumSet.copyOf(Arrays.asList(options)));
   }
 
   public Checker(ClassLoader loader, EnumSet<Option> options) {

diff --git a/src/test/java/de/thetaphi/forbiddenapis/CheckerSetupTest.java b/src/test/java/de/thetaphi/forbiddenapis/CheckerSetupTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assume.assumeTrue;
 
 import java.util.Collections;
+import java.util.EnumSet;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -55,6 +56,7 @@ protected void logInfo(String msg) {
   public void setUp() {
     checker = new MyChecker();
     assumeTrue("This test only works with a supported JDK (see docs)", checker.isSupportedJDK);
+    assertEquals(EnumSet.of(INTERNAL_RUNTIME_FORBIDDEN, FAIL_ON_MISSING_CLASSES, FAIL_ON_VIOLATION, FAIL_ON_UNRESOLVABLE_SIGNATURES), checker.options);
   }
 
   @Test
@@ -101,4 +103,14 @@ public void testMethodSignature() throws Exception {
     assertEquals(Collections.singletonMap("java/lang/Object\000toString()Ljava/lang/String;", "java.lang.Object#toString() [Foobar]"), checker.forbiddenMethods);
   }
 
+  @Test
+  public void testEmptyCtor() throws Exception {
+    Checker chk = new Checker(ClassLoader.getSystemClassLoader()) {
+      @Override protected void logError(String msg) { }
+      @Override protected void logWarn(String msg) { }
+      @Override protected void logInfo(String msg) { }
+    };
+    assertEquals(EnumSet.noneOf(Checker.Option.class), chk.options);
+  }
+
 }