Issue-#55: Workaround javac bug in JDK 1.7.0

http://bugs.java.com/view_bug.do?bug_id=8013485 http://www.oracle.com/technetwork/java/javase/2col/7u80-bugfixes-2494167.html
dakusui · Apr 6, 2016 · 31783ab · 31783ab
1 parent 180ed37
commit 31783ab
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 deletions.
diff --git a/src/main/java/com/github/dakusui/jcunit/runners/standard/JCUnit.java b/src/main/java/com/github/dakusui/jcunit/runners/standard/JCUnit.java
@@ -200,14 +200,14 @@ public List<TestCase> generateTestCases(List<FrameworkMethod> preconditionMethod
   public static Checker getChecker(Class<?> klass) {
     GenerateCoveringArrayWith generateWith = klass.getAnnotation(GenerateCoveringArrayWith.class);
     return generateWith == null
-        ? Checker.DEFAULT
+        ? Checker.Default.INSTANCE
         : generateWith.checker();
   }
 
   public static Generator getGenerator(Class<?> klass) {
     GenerateCoveringArrayWith annotation = klass.getAnnotation(GenerateCoveringArrayWith.class);
     return annotation == null
-        ? Generator.DEFAULT
+        ? Generator.Default.INSTANCE
         : annotation.engine();
   }
 

diff --git a/src/main/java/com/github/dakusui/jcunit/runners/standard/annotations/Checker.java b/src/main/java/com/github/dakusui/jcunit/runners/standard/annotations/Checker.java
@@ -9,23 +9,25 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Checker {
-  Checker DEFAULT = new Checker() {
-
-    @Override
-    public Class<? extends Annotation> annotationType() {
-      return Checker.class;
-    }
-
-    @Override
-    public Class<? extends ConstraintChecker> value() {
-      return NullConstraintChecker.class;
-    }
-
-    @Override
-    public Value[] args() {
-      return new Value[]{};
-    }
-  };
+  class Default {
+    public static final Checker INSTANCE = new Checker() {
+
+      @Override
+      public Class<? extends Annotation> annotationType() {
+        return Checker.class;
+      }
+
+      @Override
+      public Class<? extends ConstraintChecker> value() {
+        return NullConstraintChecker.class;
+      }
+
+      @Override
+      public Value[] args() {
+        return new Value[] {};
+      }
+    };
+  }
 
   Class<? extends ConstraintChecker> value() default NullConstraintChecker.class;
 

diff --git a/src/main/java/com/github/dakusui/jcunit/runners/standard/annotations/Generator.java b/src/main/java/com/github/dakusui/jcunit/runners/standard/annotations/Generator.java
@@ -10,23 +10,25 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Generator {
-  Generator DEFAULT= new Generator() {
-
-    @Override
-    public Class<? extends Annotation> annotationType() {
-      return Generator.class;
-    }
-
-    @Override
-    public Class<? extends CoveringArrayEngine> value() {
-      return StandardCoveringArrayEngine.class;
-    }
-
-    @Override
-    public Value[] args() {
-      return new Value[] { new Value.Builder().add("2").build()};
-    }
-  };
+  class Default {
+    public static final Generator INSTANCE = new Generator() {
+
+      @Override
+      public Class<? extends Annotation> annotationType() {
+        return Generator.class;
+      }
+
+      @Override
+      public Class<? extends CoveringArrayEngine> value() {
+        return StandardCoveringArrayEngine.class;
+      }
+
+      @Override
+      public Value[] args() {
+        return new Value[] { new Value.Builder().add("2").build() };
+      }
+    };
+  }
   Class<? extends CoveringArrayEngine> value() default IPO2CoveringArrayEngine.class;
 
   Value[] args() default {};