Fix problem where root View\'s style is used instead of bound View\'s

am: 78dc9ae6d6

* commit '78dc9ae6d67ae94bf3f637eeea0848e4f700b7a3':
  Fix problem where root View's style is used instead of bound View's

Change-Id: I34f57b2a34becba6dee1f42fa770a99329b15260

4 files changed, 10 insertions, 10 deletions

diff --git a/compiler/src/test/java/android/databinding/tool/ExpressionVisitorTest.java b/compiler/src/test/java/android/databinding/tool/ExpressionVisitorTest.java
index 84b032af..3d3d8fed 100644
--- a/compiler/src/test/java/android/databinding/tool/ExpressionVisitorTest.java
+++ b/compiler/src/test/java/android/databinding/tool/ExpressionVisitorTest.java
@@ -51,7 +51,7 @@ public class ExpressionVisitorTest {
     }
 
     private <T extends Expr> T parse(String input, Class<T> klass) {
-        final Expr parsed = mParser.parse(input, null);
+        final Expr parsed = mParser.parse(input, null, null);
         assertSame(klass, parsed.getClass());
         return (T) parsed;
     }
@@ -89,7 +89,7 @@ public class ExpressionVisitorTest {
 
         @Test
         public void testComparison() {
-            final Expr res = mParser.parse("3 " + mOp + " 5", null);
+            final Expr res = mParser.parse("3 " + mOp + " 5", null, null);
             assertEquals(3, mParser.getModel().size());
             assertTrue(res instanceof ComparisonExpr);
             // 0 because they are both static
@@ -180,7 +180,7 @@ public class ExpressionVisitorTest {
         assertEquals(0, parsed.getArgs().size());
         assertEquals(1, parsed.getDependencies().size());
         final Dependency dep = parsed.getDependencies().get(0);
-        assertSame(mParser.parse("user", null), dep.getOther());
+        assertSame(mParser.parse("user", null, null), dep.getOther());
         assertFalse(dep.isConditional());
     }
 
diff --git a/compiler/src/test/java/android/databinding/tool/LayoutBinderTest.java b/compiler/src/test/java/android/databinding/tool/LayoutBinderTest.java
index c7f81ab1..564ecef4 100644
--- a/compiler/src/test/java/android/databinding/tool/LayoutBinderTest.java
+++ b/compiler/src/test/java/android/databinding/tool/LayoutBinderTest.java
@@ -77,8 +77,8 @@ public class LayoutBinderTest {
         int originalSize = mExprModel.size();
         mLayoutBinder.addVariable("user", "android.databinding.tool2.LayoutBinderTest.TestUser",
                 null);
-        mLayoutBinder.parse("user.name", null);
-        mLayoutBinder.parse("user.lastName", null);
+        mLayoutBinder.parse("user.name", null, null);
+        mLayoutBinder.parse("user.lastName", null, null);
         assertEquals(originalSize + 3, mExprModel.size());
         final List<Expr> bindingExprs = mExprModel.getBindingExpressions();
         assertEquals(2, bindingExprs.size());
@@ -94,7 +94,7 @@ public class LayoutBinderTest {
     public void testParseWithMethods() {
         mLayoutBinder.addVariable("user", "android.databinding.tool.LayoutBinderTest.TestUser",
                 null);
-        mLayoutBinder.parse("user.fullName", null);
+        mLayoutBinder.parse("user.fullName", null, null);
         Expr item = mExprModel.getBindingExpressions().get(0);
         assertTrue(item instanceof FieldAccessExpr);
         IdentifierExpr id = mExprModel.identifier("user");
diff --git a/compiler/src/test/java/android/databinding/tool/expr/ExecutionPathTest.java b/compiler/src/test/java/android/databinding/tool/expr/ExecutionPathTest.java
index 2bb8832f..d6fb4707 100644
--- a/compiler/src/test/java/android/databinding/tool/expr/ExecutionPathTest.java
+++ b/compiler/src/test/java/android/databinding/tool/expr/ExecutionPathTest.java
@@ -57,7 +57,7 @@ public class ExecutionPathTest {
     public void simpleExpr() {
         MockLayoutBinder lb = new MockLayoutBinder();
         ExprModel model = lb.getModel();
-        Expr parsed = lb.parse(mExpression, null);
+        Expr parsed = lb.parse(mExpression, null, null);
         List<ExecutionPath> paths = new ArrayList<ExecutionPath>();
         ExecutionPath root = ExecutionPath.createRoot();
         paths.add(root);
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 e20dea74..a661c30f 100644
--- a/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java
+++ b/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java
@@ -154,7 +154,7 @@ public class ExprModelTest {
         IdentifierExpr a = lb.addVariable("a", "java.lang.String", null);
         IdentifierExpr b = lb.addVariable("b", "java.lang.String", null);
         IdentifierExpr c = lb.addVariable("c", "java.lang.String", null);
-        lb.parse("a == null ? b : c", null);
+        lb.parse("a == null ? b : c", null, null);
         mExprModel.comparison("==", a, mExprModel.symbol("null", Object.class));
         lb.getModel().seal();
         List<Expr> shouldRead = getShouldRead();
@@ -303,7 +303,7 @@ public class ExprModelTest {
         IdentifierExpr c = lb.addVariable("c", "java.lang.String", null);
         IdentifierExpr d = lb.addVariable("d", "java.lang.String", null);
         IdentifierExpr e = lb.addVariable("e", "java.lang.String", null);
-        final Expr aTernary = lb.parse("a == null ? b == null ? c : d : e", null);
+        final Expr aTernary = lb.parse("a == null ? b == null ? c : d : e", null, null);
         assertTrue(aTernary instanceof TernaryExpr);
         final Expr bTernary = ((TernaryExpr) aTernary).getIfTrue();
         assertTrue(bTernary instanceof TernaryExpr);
@@ -1132,7 +1132,7 @@ public class ExprModelTest {
     }
 
     private <T extends Expr> T parse(LayoutBinder binder, String input, Class<T> klass) {
-        final Expr parsed = binder.parse(input, null);
+        final Expr parsed = binder.parse(input, null, null);
         assertTrue(klass.isAssignableFrom(parsed.getClass()));
         return (T) parsed;
     }