2 files changed, 17 insertions, 13 deletions
diff --git a/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java b/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java
index 7bccd6e4..1cf1c875 100644
--- a/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java
+++ b/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java
@@ -466,13 +466,6 @@ public class ExprModelTest {
         assertEquals(2, mExprModel.getInvalidateableFieldLimit());
     }
 
-    @Test
-    public void testPartialNeededRead() {
-        throw new NotImplementedException("create a test that has a variable which can be read for "
-                + "some flags and also may be read for some condition. Try both must match and"
-                + " partial match and none-match in conditionals");
-    }
-
     private void assertFlags(Expr a, int... flags) {
         BitSet bitset = new BitSet();
         for (int flag : flags) {
diff --git a/compiler/src/test/java/android/databinding/tool/SdkVersionTest.java b/compiler/src/test/java/android/databinding/tool/reflection/SdkVersionTest.java
index 70db3a77..00456645 100644
--- a/compiler/src/test/java/android/databinding/tool/SdkVersionTest.java
+++ b/compiler/src/test/java/android/databinding/tool/reflection/SdkVersionTest.java
@@ -11,15 +11,11 @@
  * limitations under the License.
  */
 
-package android.databinding.tool;
+package android.databinding.tool.reflection;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import android.databinding.tool.reflection.ModelAnalyzer;
-import android.databinding.tool.reflection.ModelClass;
-import android.databinding.tool.reflection.ModelMethod;
-import android.databinding.tool.reflection.SdkUtil;
 import android.databinding.tool.reflection.java.JavaAnalyzer;
 
 import static org.junit.Assert.assertEquals;
@@ -32,6 +28,21 @@ public class SdkVersionTest {
     }
 
     @Test
+    public void testApiVersionsFromResources() {
+        SdkUtil.ApiChecker apiChecker = SdkUtil.sApiChecker;
+        int minSdk = SdkUtil.sMinSdk;
+        try {
+            SdkUtil.sApiChecker = new SdkUtil.ApiChecker(null);
+            ModelClass view = ModelAnalyzer.getInstance().findClass("android.widget.TextView", null);
+            ModelMethod isSuggestionsEnabled = view.getMethods("isSuggestionsEnabled", 0)[0];
+            assertEquals(14, SdkUtil.getMinApi(isSuggestionsEnabled));
+        } finally {
+            SdkUtil.sMinSdk = minSdk;
+            SdkUtil.sApiChecker = apiChecker;
+        }
+    }
+
+    @Test
     public void testNewApiMethod() {
         ModelClass view = ModelAnalyzer.getInstance().findClass("android.view.View", null);
         ModelMethod setElevation = view.getMethods("setElevation", 1)[0];
@@ -41,7 +52,7 @@ public class SdkVersionTest {
     @Test
     public void testCustomCode() {
         ModelClass view = ModelAnalyzer.getInstance()
-                .findClass("android.databinding.tool.SdkVersionTest", null);
+                .findClass("android.databinding.tool.reflection.SdkVersionTest", null);
         ModelMethod setElevation = view.getMethods("testCustomCode", 0)[0];
         assertEquals(1, SdkUtil.getMinApi(setElevation));
     }