Modify AbstractTestTools api to detect error at compile time

Do for reference toolchain what's already been done for candidate toolchain.

Change-Id: I375cf829e24040cdcad1b4f79c8c436915ffd38a

2 files changed, 9 insertions, 11 deletions

diff --git a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
index dc27f78..1a5a4c2 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
@@ -185,8 +185,7 @@ public abstract class AbstractTestTools {
 
   @Nonnull
   public static final IToolchain getCandidateToolchain() {
-    IToolchain result = createToolchain("candidate.toolchain");
-    return result;
+    return createToolchain("candidate.toolchain");
   }
 
   @SuppressWarnings("unchecked")
@@ -211,18 +210,18 @@ public abstract class AbstractTestTools {
     return result;
   }
 
-  @SuppressWarnings("unchecked")
   @Nonnull
-  public static final <T extends IToolchain> T getReferenceToolchain() {
-    return (T) createToolchain("reference.toolchain");
+  public static final IToolchain getReferenceToolchain() {
+    return createToolchain("reference.toolchain");
   }
 
+  @SuppressWarnings("unchecked")
   @Nonnull
   public static final <T extends IToolchain> T getReferenceToolchain(
       @Nonnull Class<? extends IToolchain> clazz) {
-    T result = getReferenceToolchain();
+    IToolchain result = getReferenceToolchain();
     Assume.assumeTrue(clazz.isAssignableFrom(result.getClass()));
-    return result;
+    return (T) result;
   }
 
   @Nonnull
diff --git a/jack-tests/tests/com/android/jack/annotation/processor/AnnotationProcessorTests.java b/jack-tests/tests/com/android/jack/annotation/processor/AnnotationProcessorTests.java
index 2d4be98..cc65221 100644
--- a/jack-tests/tests/com/android/jack/annotation/processor/AnnotationProcessorTests.java
+++ b/jack-tests/tests/com/android/jack/annotation/processor/AnnotationProcessorTests.java
@@ -23,9 +23,8 @@ import com.android.jack.library.FileTypeDoesNotExistException;
 import com.android.jack.library.InputJackLibrary;
 import com.android.jack.library.JackLibraryFactory;
 import com.android.jack.test.toolchain.AbstractTestTools;
+import com.android.jack.test.toolchain.IToolchain;
 import com.android.jack.test.toolchain.JackBasedToolchain;
-import com.android.jack.test.toolchain.LegacyToolchain;
-import com.android.jack.test.toolchain.Toolchain;
 import com.android.sched.util.config.ConfigurationException;
 import com.android.sched.util.config.GatherConfigBuilder;
 import com.android.sched.util.config.ThreadConfig;
@@ -73,7 +72,7 @@ public class AnnotationProcessorTests {
   @Nonnull
   private static File getNoConfigProcessors() throws Exception {
     if (noConfigProcessors == null) {
-      Toolchain toolchain = AbstractTestTools.getReferenceToolchain();
+      IToolchain toolchain = AbstractTestTools.getReferenceToolchain();
       File processorsDir = AbstractTestTools.createTempDir();
       File processorsSrcDir = AbstractTestTools.getTestRootDir(
           "com.android.jack.annotation.processor.sample.processors");
@@ -89,7 +88,7 @@ public class AnnotationProcessorTests {
   @Nonnull
   private static File getAutoProcessors() throws Exception {
     if (autoProcessors == null) {
-      Toolchain toolchain = AbstractTestTools.getReferenceToolchain();
+      IToolchain toolchain = AbstractTestTools.getReferenceToolchain();
       File processorsDir = AbstractTestTools.createTempDir();
       File processorsSrcDir = AbstractTestTools.getTestRootDir(
           "com.android.jack.annotation.processor.sample.processors");