Adapt incremental tests to use InputJackLibary

(cherry picked from commit 097b5d6e807b250847ec9ff27f4a7ac7a336620f)

Change-Id: I954bb80fe35fcc59043665400dd8331e2153427b

6 files changed, 24 insertions, 32 deletions

diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest008.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest008.java
index 0d7a7da..895c3e8 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest008.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest008.java
@@ -53,7 +53,7 @@ public class DependenciesTest008 {
         " public static void main(String[] args) {new B().m();} } \n");
 
       ite.incrementalBuildFromFolder();
-      Assert.assertEquals(2, ite.getJackFiles().size());
+      Assert.assertEquals(2, ite.getJayceCount());
 
       ite.addJavaFile("jack.incremental", "A.java",
           "package jack.incremental; \n" +
@@ -65,7 +65,7 @@ public class DependenciesTest008 {
         Assert.fail();
       } catch (FrontendCompilationException e)  {
         // Error is ok
-        Assert.assertEquals(0, ite.getJackFiles().size());
+        Assert.assertEquals(0, ite.getJayceCount());
       }
   }
 
@@ -83,14 +83,14 @@ public class DependenciesTest008 {
         "class B { } \n");
 
       ite.incrementalBuildFromFolder();
-      Assert.assertEquals(2, ite.getJackFiles().size());
+      Assert.assertEquals(2, ite.getJayceCount());
 
       ite.addJavaFile("jack.incremental", "A.java",
           "package jack.incremental; \n" +
           "public class A { }\n");
 
       ite.incrementalBuildFromFolder();
-      Assert.assertEquals(1, ite.getJackFiles().size());
+      Assert.assertEquals(1, ite.getJayceCount());
   }
 
   /**
@@ -113,7 +113,7 @@ public class DependenciesTest008 {
         "public class C { public void test() {new B();} } \n");
 
       ite.incrementalBuildFromFolder();
-      Assert.assertEquals(3, ite.getJackFiles().size());
+      Assert.assertEquals(3, ite.getJayceCount());
 
       ite.addJavaFile("jack.incremental", "A.java",
           "package jack.incremental; \n" +
@@ -124,7 +124,7 @@ public class DependenciesTest008 {
         Assert.fail();
       } catch (FrontendCompilationException e)  {
         // Error is ok
-        Assert.assertEquals(0, ite.getJackFiles().size());
+        Assert.assertEquals(0, ite.getJayceCount());
       }
   }
 }
diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest011.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest011.java
index 3307d35..4fefa29 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest011.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest011.java
@@ -60,7 +60,7 @@ public class DependenciesTest011 {
 
     ite.incrementalBuildFromFolder();
     ite.snapshotJackFilesModificationDate();
-    Assert.assertEquals(2, ite.getJackFiles().size());
+    Assert.assertEquals(2, ite.getJayceCount());
 
     ite.deleteJavaFile(f);
 
diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest012.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest012.java
index 639ae8d..d19a243 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest012.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest012.java
@@ -61,7 +61,7 @@ public class DependenciesTest012 {
 
     ite.incrementalBuildFromFolder();
     ite.snapshotJackFilesModificationDate();
-    Assert.assertEquals(2, ite.getJackFiles().size());
+    Assert.assertEquals(2, ite.getJayceCount());
 
     ite.deleteJavaFile(f);
 
diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest013.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest013.java
index 5d958d0..b29ca2a 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest013.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest013.java
@@ -62,7 +62,7 @@ public class DependenciesTest013 {
 
     ite.incrementalBuildFromFolder();
     ite.snapshotJackFilesModificationDate();
-    Assert.assertEquals(2, ite.getJackFiles().size());
+    Assert.assertEquals(2, ite.getJayceCount());
 
     ite.deleteJavaFile(f);
 
@@ -107,7 +107,7 @@ public class DependenciesTest013 {
 
     ite.incrementalBuildFromFolder();
     ite.snapshotJackFilesModificationDate();
-    Assert.assertEquals(3, ite.getJackFiles().size());
+    Assert.assertEquals(3, ite.getJayceCount());
 
     ite.deleteJavaFile(f);
 
@@ -152,7 +152,7 @@ public class DependenciesTest013 {
 
     ite.incrementalBuildFromFolder();
     ite.snapshotJackFilesModificationDate();
-    Assert.assertEquals(3, ite.getJackFiles().size());
+    Assert.assertEquals(3, ite.getJayceCount());
 
     ite.deleteJavaFile(f);
 
diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest014.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest014.java
index 5a932a6..1d8ac8e 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest014.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest014.java
@@ -55,7 +55,7 @@ public class DependenciesTest014 {
 
     ite.incrementalBuildFromFolder();
     ite.snapshotJackFilesModificationDate();
-    Assert.assertEquals(2, ite.getJackFiles().size());
+    Assert.assertEquals(2, ite.getJayceCount());
 
     ite.deleteJavaFile(f);
     ite.incrementalBuildFromFolder();
@@ -86,7 +86,7 @@ public class DependenciesTest014 {
 
     ite.incrementalBuildFromFolder();
     ite.snapshotJackFilesModificationDate();
-    Assert.assertEquals(3, ite.getJackFiles().size());
+    Assert.assertEquals(3, ite.getJayceCount());
 
     ite.deleteJavaFile(fB);
     ite.deleteJavaFile(fC);
diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java
index cd06a73..35c351f 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java
@@ -26,14 +26,12 @@ import com.android.jack.test.toolchain.JackBasedToolchain.MultiDexKind;
 import junit.framework.Assert;
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * JUnit test checking incremental support.
@@ -60,8 +58,7 @@ public class DependenciesTest015 {
 
     iteLib.incrementalBuildFromFolder();
     iteLib.snapshotJackFilesModificationDate();
-    List<File> jackFilesLib = iteLib.getJackFiles();
-    Assert.assertEquals(1, jackFilesLib.size());
+    Assert.assertEquals(1, iteLib.getJayceCount());
 
 
     IncrementalTestHelper iteProg =
@@ -74,15 +71,14 @@ public class DependenciesTest015 {
 
     iteProg.incrementalBuildFromFolder(new File[]{iteLib.getCompilerStateFolder()});
     iteProg.snapshotJackFilesModificationDate();
-    Assert.assertEquals(1, iteProg.getJackFiles().size());
+    Assert.assertEquals(1, iteProg.getJayceCount());
 
     iteLib.deleteJavaFile(f);
     iteLib.addJavaFile("jack.incremental", "A.java", "package jack.incremental; \n"
         + "public abstract class A { \n" + "public abstract int m(); }");
     iteLib.incrementalBuildFromFolder();
     iteLib.snapshotJackFilesModificationDate();
-    jackFilesLib = iteLib.getJackFiles();
-    Assert.assertEquals(1, jackFilesLib.size());
+    Assert.assertEquals(1, iteLib.getJayceCount());
 
     ByteArrayOutputStream err = new ByteArrayOutputStream();
     iteProg.setErr(err);
@@ -108,8 +104,7 @@ public class DependenciesTest015 {
 
     iteLib.incrementalBuildFromFolder();
     iteLib.snapshotJackFilesModificationDate();
-    List<File> jackFilesLib = iteLib.getJackFiles();
-    Assert.assertEquals(1, jackFilesLib.size());
+    Assert.assertEquals(1, iteLib.getJayceCount());
 
 
     IncrementalTestHelper iteProg =
@@ -121,7 +116,7 @@ public class DependenciesTest015 {
     iteProg.incrementalBuildFromFolder(null /* classpath */,
         Arrays.asList(iteLib.getCompilerStateFolder()));
     iteProg.snapshotJackFilesModificationDate();
-    Assert.assertEquals(1, iteProg.getJackFiles().size());
+    Assert.assertEquals(1, iteProg.getJayceCount());
 
     DexBuffer db = new DexBuffer(new FileInputStream(iteProg.getDexFile()));
     Assert.assertTrue(db.typeNames().contains("Ljack/incremental/A;"));
@@ -131,13 +126,12 @@ public class DependenciesTest015 {
         + "public class C { \n" + "public void m() {} }");
     iteLib.incrementalBuildFromFolder();
     iteLib.snapshotJackFilesModificationDate();
-    jackFilesLib = iteLib.getJackFiles();
-    Assert.assertEquals(2, jackFilesLib.size());
+    Assert.assertEquals(2, iteLib.getJayceCount());
 
 
     iteProg.incrementalBuildFromFolder(null, Arrays.asList(iteLib.getCompilerStateFolder()));
     iteProg.snapshotJackFilesModificationDate();
-    Assert.assertEquals(1, iteProg.getJackFiles().size());
+    Assert.assertEquals(1, iteProg.getJayceCount());
 
     db = new DexBuffer(new FileInputStream(iteProg.getDexFile()));
     Assert.assertTrue(db.typeNames().contains("Ljack/incremental/A;"));
@@ -159,8 +153,7 @@ public class DependenciesTest015 {
 
     iteLib.incrementalBuildFromFolder();
     iteLib.snapshotJackFilesModificationDate();
-    List<File> jackFilesLib = iteLib.getJackFiles();
-    Assert.assertEquals(1, jackFilesLib.size());
+    Assert.assertEquals(1, iteLib.getJayceCount());
 
 
     IncrementalTestHelper iteProg =
@@ -172,7 +165,7 @@ public class DependenciesTest015 {
     iteProg.incrementalBuildFromFolder(null /* classpath */,
         Arrays.asList(iteLib.getCompilerStateFolder()), MultiDexKind.NATIVE);
     iteProg.snapshotJackFilesModificationDate();
-    Assert.assertEquals(1, iteProg.getJackFiles().size());
+    Assert.assertEquals(1, iteProg.getJayceCount());
 
     DexBuffer db = new DexBuffer(new FileInputStream(iteProg.getDexFile()));
     Assert.assertTrue(db.typeNames().contains("Ljack/incremental/A;"));
@@ -182,13 +175,12 @@ public class DependenciesTest015 {
         + "public class C { \n" + "public void m() {} }");
     iteLib.incrementalBuildFromFolder();
     iteLib.snapshotJackFilesModificationDate();
-    jackFilesLib = iteLib.getJackFiles();
-    Assert.assertEquals(2, jackFilesLib.size());
+    Assert.assertEquals(2, iteLib.getJayceCount());
 
 
     iteProg.incrementalBuildFromFolder(null, Arrays.asList(iteLib.getCompilerStateFolder()));
     iteProg.snapshotJackFilesModificationDate();
-    Assert.assertEquals(1, iteProg.getJackFiles().size());
+    Assert.assertEquals(1, iteProg.getJayceCount());
 
     db = new DexBuffer(new FileInputStream(iteProg.getDexFile()));
     Assert.assertTrue(db.typeNames().contains("Ljack/incremental/A;"));