diff options
2 files changed, 6 insertions, 6 deletions
diff --git a/integration-tests/MultiModuleTestApp/app/src/androidTest/java/androidx/databinding/multimoduletestapp/OldVersionDependencyTest.java b/integration-tests/MultiModuleTestApp/app/src/androidTest/java/androidx/databinding/multimoduletestapp/OldVersionDependencyTest.java index 745eac3a..c87652da 100644 --- a/integration-tests/MultiModuleTestApp/app/src/androidTest/java/androidx/databinding/multimoduletestapp/OldVersionDependencyTest.java +++ b/integration-tests/MultiModuleTestApp/app/src/androidTest/java/androidx/databinding/multimoduletestapp/OldVersionDependencyTest.java @@ -42,7 +42,7 @@ public class OldVersionDependencyTest { LayoutInflater inflater = LayoutInflater.from( InstrumentationRegistry.getTargetContext()); LayoutFrom31Binding binding = DataBindingUtil.inflate(inflater, - R.layout.layout_from_3_1, null, false); + com.example.android.support.lib.R.layout.layout_from_3_1, null, false); binding.setBar("bar"); binding.setFoo(3); binding.executePendingBindings(); @@ -59,7 +59,7 @@ public class OldVersionDependencyTest { LayoutInflater inflater = LayoutInflater.from( InstrumentationRegistry.getTargetContext()); LayoutFrom331Binding binding = DataBindingUtil.inflate(inflater, - R.layout.layout_from_3_3_1, null, false); + com.example.agp331.R.layout.layout_from_3_3_1, null, false); binding.setBar("bar"); binding.setFoo(3); binding.executePendingBindings(); diff --git a/integration-tests/MultiModuleTestApp/app/src/androidTest/java/com/androidx/databinding/multimoduletestapp/GeneratedLayoutTest.java b/integration-tests/MultiModuleTestApp/app/src/androidTest/java/com/androidx/databinding/multimoduletestapp/GeneratedLayoutTest.java index 750876cd..5d961b4d 100644 --- a/integration-tests/MultiModuleTestApp/app/src/androidTest/java/com/androidx/databinding/multimoduletestapp/GeneratedLayoutTest.java +++ b/integration-tests/MultiModuleTestApp/app/src/androidTest/java/com/androidx/databinding/multimoduletestapp/GeneratedLayoutTest.java @@ -43,7 +43,7 @@ public class GeneratedLayoutTest { public void run() { LayoutInflater inflater = LayoutInflater.from( InstrumentationRegistry.getTargetContext()); - View view = inflater.inflate(R.layout.library_layout, null); + View view = inflater.inflate(androidx.databinding.test.independentlibrary.R.layout.library_layout, null); // force override tag view.setTag("layout/library_layout_0"); ViewDataBinding bind = DataBindingUtil.bind(view); @@ -60,7 +60,7 @@ public class GeneratedLayoutTest { public void run() { LayoutInflater inflater = LayoutInflater.from( InstrumentationRegistry.getTargetContext()); - View view = inflater.inflate(R.layout.library_layout, null); + View view = inflater.inflate(androidx.databinding.test.independentlibrary.R.layout.library_layout, null); // force override tag view.setTag("layout-sw600dp-land/library_layout_0"); ViewDataBinding bind = DataBindingUtil.bind(view); @@ -77,13 +77,13 @@ public class GeneratedLayoutTest { public void run() { LayoutInflater inflater = LayoutInflater.from( InstrumentationRegistry.getTargetContext()); - View view = inflater.inflate(R.layout.layout2, null); + View view = inflater.inflate(androidx.databinding.testlibrary2.R.layout.layout2, null); Layout2Binding binding = DataBindingUtil.bind(view); TestObservable testObservable = new TestObservable(); testObservable.setCat("foo"); binding.setVar(testObservable); binding.executePendingBindings(); - TextView inherited = (TextView) view.findViewById(R.id.inherited_text); + TextView inherited = (TextView) view.findViewById(androidx.databinding.inheritedmodule.R.id.inherited_text); assertEquals("foo", inherited.getText()); } }); |