commit 911c64692dd17588126785eaec8f787df8bc6671
author Peter Xu <peterx@google.com> Fri Jan 08 14:36:36 2021 -0800
committer Peter Xu <peterx@google.com> Mon Jan 11 14:49:55 2021 -0800
tree ac59d0972dee59916c9c8034d022a24c33595019
parent 9f1cfe0585a773f23db82c7f96a62ed9833d3dec

Fix test errors when run in the IDE

Test: this is it.
Bug: 173134729
Change-Id: I970d385ed4e4e4702f4a1350b31fe90c764a815e

compilationTests/src/test/java/androidx/databinding/compilationTest/SimpleCompilationTest.java

diff --git a/compilationTests/src/test/java/androidx/databinding/compilationTest/SimpleCompilationTest.java b/compilationTests/src/test/java/androidx/databinding/compilationTest/SimpleCompilationTest.java
index eb50367..a281e80 100644
--- a/compilationTests/src/test/java/androidx/databinding/compilationTest/SimpleCompilationTest.java
+++ b/compilationTests/src/test/java/androidx/databinding/compilationTest/SimpleCompilationTest.java
@@ -30,6 +30,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -91,7 +92,7 @@
         File debugOut = new File(testFolder,
                 "app/build/intermediates/incremental/mergeDebugResources/stripped.dir");
         Collection<File> layoutFiles = FileUtils.listFiles(debugOut, new NameFileFilter("main.xml"),
-                new PrefixFileFilter("layout"));
+                                                           new PrefixFileFilter("layout"));
         assertTrue("test sanity", layoutFiles.size() > 1);
         for (File layout : layoutFiles) {
             final String contents = FileUtils.readFileToString(layout);
@@ -217,8 +218,7 @@
     @Test
     public void testInvalidSetterBinding() throws IOException, URISyntaxException,
             InterruptedException {
-        prepareProject();
-        ScopedException ex = singleFileErrorTest("/layout/invalid_setter_binding.xml",
+        singleFileErrorTest("/layout/invalid_setter_binding.xml",
                 "/app/src/main/res/layout/invalid_setter.xml", "myVariable",
                 String.format(ErrorMessages.CANNOT_FIND_SETTER_CALL, "android.widget.TextView",
                     "android:textx", String.class.getCanonicalName()));
@@ -255,8 +255,7 @@
     @Test
     public void testInvalidVariableType() throws IOException, URISyntaxException,
             InterruptedException {
-        prepareProject();
-        ScopedException ex = singleFileErrorTest("/layout/invalid_variable_type.xml",
+        singleFileErrorTest("/layout/invalid_variable_type.xml",
                 "/app/src/main/res/layout/invalid_variable.xml", "myVariable",
                 String.format(ErrorMessages.CANNOT_RESOLVE_TYPE, "myVariable"));
     }
@@ -326,7 +325,7 @@
     }
 
     // TODO: reenable this test once it works.
-    //@Test
+    @Ignore
     public void testModuleDependencyChange() throws IOException, URISyntaxException,
             InterruptedException {
         prepareApp(toMap(KEY_DEPENDENCIES, "implementation project(':module1')",