diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-11-23 11:53:58 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2015-11-24 14:40:41 +0000 |
| commit | 2419e6469b6c1f1e4ebbc0f05e1b5f33292f692d (patch) | |
| tree | bfa63ea61cd383e10f1672ae99f87f3de0847e5b /src/test/java/com/google/devtools/build/lib/ideinfo | |
| parent | 7f5834d41233830814f8748a6b126e74f297c013 (diff) | |
Require that the Android manifest be called AndroidManifest.xml
aapt requires this.
Also eliminate a few places where the unchecked RuleConfigurationException is thrown.
--
MOS_MIGRATED_REVID=108491660
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/ideinfo')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java index df30f4c200..bb8de48bf3 100644 --- a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java +++ b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java @@ -435,7 +435,7 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase "com/google/example/BUILD", "android_library(", " name = 'l1',", - " manifest = 'Manifesto.xml',", + " manifest = 'AndroidManifest.xml',", " custom_package = 'com.google.example',", " resource_files = ['r1/values/a.xml'],", ")", @@ -443,7 +443,7 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase " name = 'l',", " srcs = ['Main.java'],", " deps = [':l1'],", - " manifest = 'Abracadabra.xml',", + " manifest = 'AndroidManifest.xml',", " custom_package = 'com.google.example',", " resource_files = ['res/drawable/a.png', 'res/drawable/b.png'],", ")"); @@ -462,7 +462,7 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase ruleInfo.getAndroidRuleIdeInfo().getResourcesList(), ARTIFACT_TO_RELATIVE_PATH)) .containsExactly("com/google/example/res"); assertThat(ruleInfo.getAndroidRuleIdeInfo().getManifest().getRelativePath()) - .isEqualTo("com/google/example/Abracadabra.xml"); + .isEqualTo("com/google/example/AndroidManifest.xml"); assertThat(ruleInfo.getAndroidRuleIdeInfo().getJavaPackage()).isEqualTo("com.google.example"); assertThat(ruleInfo.getDependenciesList()).containsExactly("//com/google/example:l1"); @@ -486,7 +486,7 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase "com/google/example/BUILD", "android_library(", " name = 'l1',", - " manifest = 'Manifesto.xml',", + " manifest = 'AndroidManifest.xml',", " custom_package = 'com.google.example',", " resource_files = ['r1/values/a.xml'],", ")", @@ -494,7 +494,7 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase " name = 'b',", " srcs = ['Main.java'],", " deps = [':l1'],", - " manifest = 'Abracadabra.xml',", + " manifest = 'AndroidManifest.xml',", " custom_package = 'com.google.example',", " resource_files = ['res/drawable/a.png', 'res/drawable/b.png'],", ")"); @@ -513,7 +513,7 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase ruleInfo.getAndroidRuleIdeInfo().getResourcesList(), ARTIFACT_TO_RELATIVE_PATH)) .containsExactly("com/google/example/res"); assertThat(ruleInfo.getAndroidRuleIdeInfo().getManifest().getRelativePath()) - .isEqualTo("com/google/example/Abracadabra.xml"); + .isEqualTo("com/google/example/AndroidManifest.xml"); assertThat(ruleInfo.getAndroidRuleIdeInfo().getJavaPackage()).isEqualTo("com.google.example"); assertThat(ruleInfo.getAndroidRuleIdeInfo().getApk().getRelativePath()) .isEqualTo("com/google/example/b.apk"); @@ -540,13 +540,13 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase "java/com/google/example/BUILD", "android_library(", " name = 'l',", - " manifest = 'Manifesto.xml',", + " manifest = 'AndroidManifest.xml',", ")", "android_binary(", " name = 'b',", " srcs = ['Main.java'],", " deps = [':l'],", - " manifest = 'Abracadabra.xml',", + " manifest = 'AndroidManifest.xml',", ")"); Map<String, RuleIdeInfo> ruleIdeInfos = buildRuleIdeInfo("//java/com/google/example:b"); RuleIdeInfo lRuleInfo = getRuleInfoAndVerifyLabel("//java/com/google/example:l", ruleIdeInfos); |