diff options
| author |  corysmith <corysmith@google.com> | 2018-08-06 12:53:14 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-06 12:54:37 -0700 |
| commit | 157b917a453ae8ce610accbbad2e292ad649557b (patch) | |
| tree | 4cf8e8711fe39910aacce7ae8c35ffab35a4c087 /src/test | |
| parent | 29b57c3afcfeb8e3fedcc2edcb0f28f13c784179 (diff) | |
Add configuration for android data binding v2.
RELNOTES: None
PiperOrigin-RevId: 207592136
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java index d1f9db8166..d60f365b71 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java @@ -145,13 +145,14 @@ public class AndroidResourcesTest extends ResourceTestBase { ImmutableList<Artifact> unfilteredResources, ImmutableList<Artifact> filteredResources) throws Exception { RuleContext ruleContext = getRuleContext(); + final AndroidDataContext dataContext = AndroidDataContext.forNative(ruleContext); ValidatedAndroidResources unfiltered = new AndroidResources(unfilteredResources, getResourceRoots(unfilteredResources)) .process( ruleContext, - AndroidDataContext.forNative(ruleContext), + dataContext, getManifest(), - DataBinding.contextFrom(ruleContext), + DataBinding.contextFrom(ruleContext, dataContext.getAndroidConfig()), /* neverlink = */ false); Optional<? extends AndroidResources> maybeFiltered = assertFilter(unfiltered, filteredResources, /* isDependency = */ true); @@ -227,7 +228,11 @@ public class AndroidResourcesTest extends ResourceTestBase { RuleContext ruleContext = getRuleContext(); ParsedAndroidResources parsed = - assertParse(ruleContext, DataBinding.asEnabledDataBindingContextFrom(ruleContext)); + assertParse( + ruleContext, + DataBinding.contextFrom( + ruleContext, + ruleContext.getConfiguration().getFragment(AndroidConfiguration.class))); // Since we are not using aapt2, there should be no compiled symbols assertThat(parsed.getCompiledSymbols()).isNull(); @@ -498,7 +503,7 @@ public class AndroidResourcesTest extends ResourceTestBase { false, null, null, - DataBinding.contextFrom(ruleContext)) + DataBinding.contextFrom(ruleContext, dataContext.getAndroidConfig())) .generateRClass(dataContext, AndroidAaptVersion.AUTO); assertThat(resourceApk.getResourceProguardConfig()).isNotNull(); @@ -510,7 +515,10 @@ public class AndroidResourcesTest extends ResourceTestBase { * for further validation. */ private ParsedAndroidResources assertParse(RuleContext ruleContext) throws Exception { - return assertParse(ruleContext, DataBinding.contextFrom(ruleContext)); + return assertParse( + ruleContext, + DataBinding.contextFrom( + ruleContext, ruleContext.getConfiguration().getFragment(AndroidConfiguration.class))); } private ParsedAndroidResources assertParse( |