aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google
diff options
context:
space:
mode:
authorGravatar ajmichael <ajmichael@google.com>2017-10-24 17:11:26 +0200
committerGravatar Dmitry Lomov <dslomov@google.com>2017-10-25 16:45:18 +0200
commit69f5849daaa18b79d37fb9b57e32686688b36dd4 (patch)
treeed456638b9e726fa6e1de3b090acd844be3dcf77 /src/test/java/com/google
parent88157011af4ddac21e404e9deea0d78668a71a99 (diff)
Add unused, optional source_properties attribute to android_sdk.
RELNOTES: None PiperOrigin-RevId: 173258794
Diffstat (limited to 'src/test/java/com/google')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java53
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/android/BUILD12
3 files changed, 66 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java
new file mode 100644
index 0000000000..884f191612
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java
@@ -0,0 +1,53 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.rules.android;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link com.google.devtools.build.lib.rules.android.AndroidSdk}. */
+@RunWith(JUnit4.class)
+public class AndroidSdkTest extends BuildViewTestCase {
+
+ @Test
+ public void testSourcePropertiesProvided() throws Exception {
+ scratch.file(
+ "sdk/BUILD",
+ "android_sdk(",
+ " name = 'sdk',",
+ " aapt = 'static_aapt_tool',",
+ " adb = 'static_adb_tool',",
+ " aidl = 'static_aidl_tool',",
+ " framework_aidl = 'framework_aidl',",
+ " android_jar = 'android.jar',",
+ " source_properties = 'platforms/android-25/source.properties',",
+ " annotations_jar = 'annotations.jar',",
+ " apksigner = 'apksigner',",
+ " dx = 'dx',",
+ " main_dex_classes = 'mainDexClasses.rules',",
+ " main_dex_list_creator = 'main_dex_list_creator',",
+ " proguard = 'ProGuard',",
+ " shrinked_android_jar = 'android.jar',",
+ " zipalign = 'zipalign',",
+ ")");
+ AndroidSdkProvider sdkProvider =
+ getConfiguredTarget("//sdk").getProvider(AndroidSdkProvider.class);
+ assertThat(sdkProvider.getSourceProperties().toDetailString())
+ .isEqualTo("[/workspace[source]]sdk/platforms/android-25/source.properties");
+ }
+}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
index 2c68717cb3..2cc730f931 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
@@ -55,6 +55,7 @@ public class ApkManifestActionTest {
createArtifact("/workspace/androidsdk/frameworkAidl"),
null, // aidlLib, optional
createArtifact("/workspace/androidsdk/androidJar"),
+ null, // sourceProperties, optional
createArtifact("/workspace/androidsdk/shrinkedAndroidJar"),
createArtifact("/workspace/androidsdk/annotationsJar"),
createArtifact("/workspace/androidsdk/mainDexClasses"),
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
index 3c7251d464..8549fcbc81 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
@@ -303,6 +303,18 @@ java_test(
],
)
+java_test(
+ name = "AndroidSdkTest",
+ srcs = ["AndroidSdkTest.java"],
+ runtime_deps = ["//src/test/java/com/google/devtools/build/lib:testutil"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:android-rules",
+ "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
test_suite(
name = "windows_tests",
tags = [