diff options
Diffstat (limited to 'src')
6 files changed, 368 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixture.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixture.java new file mode 100644 index 0000000000..91075a9d54 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixture.java @@ -0,0 +1,60 @@ +// 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 com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.analysis.ConfiguredTarget; +import com.google.devtools.build.lib.analysis.FilesToRunProvider; +import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; +import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; +import com.google.devtools.build.lib.analysis.RuleContext; +import com.google.devtools.build.lib.analysis.Runfiles; +import com.google.devtools.build.lib.analysis.RunfilesProvider; +import com.google.devtools.build.lib.collect.nestedset.NestedSet; +import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; +import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; +import com.google.devtools.build.lib.syntax.Type; + +/** An implementation of the {@code android_host_service_fixture} rule. */ +public class AndroidHostServiceFixture implements RuleConfiguredTargetFactory { + + @Override + public ConfiguredTarget create(RuleContext ruleContext) + throws InterruptedException, RuleErrorException { + RuleConfiguredTargetBuilder ruleBuilder = new RuleConfiguredTargetBuilder(ruleContext); + NestedSet<Artifact> supportApks = AndroidCommon.getSupportApks(ruleContext); + FilesToRunProvider executable = ruleContext.getExecutablePrerequisite("executable", Mode.HOST); + + NestedSet<Artifact> filesToBuild = + NestedSetBuilder.<Artifact>stableOrder() + .addTransitive(supportApks) + .addAll(executable.getFilesToRun()) + .build(); + Runfiles runfiles = + new Runfiles.Builder(ruleContext.getWorkspaceName()) + .addTransitiveArtifacts(filesToBuild) + .merge(executable.getRunfilesSupport()) + .build(); + return ruleBuilder + .setFilesToBuild(filesToBuild) + .addProvider(RunfilesProvider.class, RunfilesProvider.simple(runfiles)) + .addNativeDeclaredProvider( + new AndroidHostServiceFixtureInfoProvider( + ruleContext.getTokenizedStringListAttr("service_names"), + AndroidCommon.getSupportApks(ruleContext), + ruleContext.attributes().get("provides_test_args", Type.BOOLEAN), + ruleContext.attributes().get("daemon", Type.BOOLEAN))) + .build(); + } +} diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureInfoProvider.java new file mode 100644 index 0000000000..715bfbc81b --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureInfoProvider.java @@ -0,0 +1,69 @@ +// 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 com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; +import com.google.devtools.build.lib.collect.nestedset.NestedSet; +import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; +import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; +import com.google.devtools.build.lib.packages.SkylarkClassObject; + +/** + * Information about an {@code android_host_service_fixture} to run as part of an {@code + * android_instrumentation_test}. + */ +@Immutable +public class AndroidHostServiceFixtureInfoProvider extends SkylarkClassObject + implements TransitiveInfoProvider { + + private static final String SKYLARK_NAME = "HostServiceFixtureInfo"; + static final NativeClassObjectConstructor ANDROID_HOST_SERVICE_FIXTURE_INFO = + new NativeClassObjectConstructor(SKYLARK_NAME) {}; + + private final ImmutableList<String> serviceNames; + private final NestedSet<Artifact> supportApks; + private final boolean providesTestArgs; + private final boolean isDaemon; + + AndroidHostServiceFixtureInfoProvider( + ImmutableList<String> serviceNames, + NestedSet<Artifact> supportApks, + boolean providesTestArgs, + boolean isDaemon) { + super(ANDROID_HOST_SERVICE_FIXTURE_INFO, ImmutableMap.<String, Object>of()); + this.serviceNames = serviceNames; + this.supportApks = supportApks; + this.providesTestArgs = providesTestArgs; + this.isDaemon = isDaemon; + } + + public ImmutableList<String> getServiceNames() { + return serviceNames; + } + + public NestedSet<Artifact> getSupportApks() { + return supportApks; + } + + public boolean getProvidesTestArgs() { + return providesTestArgs; + } + + public boolean getIsDaemon() { + return isDaemon; + } +} diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java new file mode 100644 index 0000000000..1777f4f792 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java @@ -0,0 +1,54 @@ +// 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.devtools.build.lib.packages.Attribute.ConfigurationTransition.HOST; +import static com.google.devtools.build.lib.packages.Attribute.attr; +import static com.google.devtools.build.lib.packages.BuildType.LABEL; +import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST; +import static com.google.devtools.build.lib.syntax.Type.BOOLEAN; +import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; + +import com.google.devtools.build.lib.analysis.BaseRuleClasses; +import com.google.devtools.build.lib.analysis.RuleDefinition; +import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; +import com.google.devtools.build.lib.packages.RuleClass; +import com.google.devtools.build.lib.packages.RuleClass.Builder; + +/** Rule definition for the {@code android_host_service_fixture} rule. */ +public class AndroidHostServiceFixtureRule implements RuleDefinition { + @Override + public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + return builder + .setUndocumented() + .add(attr("executable", LABEL).exec().cfg(HOST).mandatory().allowedFileTypes()) + .add(attr("service_names", STRING_LIST)) + .add( + attr("support_apks", LABEL_LIST) + .allowedFileTypes(AndroidRuleClasses.APK) + .allowedRuleClasses("android_binary")) + .add(attr("provides_test_args", BOOLEAN).value(false)) + .add(attr("daemon", BOOLEAN).value(false)) + .build(); + } + + @Override + public Metadata getMetadata() { + return RuleDefinition.Metadata.builder() + .name("android_host_service_fixture") + .ancestors(BaseRuleClasses.RuleBase.class) + .factoryClass(AndroidHostServiceFixture.class) + .build(); + } +} diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java index 8c3d325bd4..185f52892c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java @@ -55,6 +55,7 @@ public abstract class AndroidBuildViewTestCase extends BuildViewTestCase { return builder // TODO(b/35097211): Remove this once the new testing rules are released. .addRuleDefinition(new AndroidDeviceScriptFixtureRule()) + .addRuleDefinition(new AndroidHostServiceFixtureRule()) .addRuleDefinition(new AndroidInstrumentationRule()) .build(); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java new file mode 100644 index 0000000000..1d77e5db4f --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java @@ -0,0 +1,168 @@ +// 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.actions.util.ActionsTestUtil; +import com.google.devtools.build.lib.analysis.ConfiguredTarget; +import com.google.devtools.build.lib.analysis.RunfilesProvider; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Tests for {@link AndroidHostServiceFixture}. */ +@RunWith(JUnit4.class) +public class AndroidHostServiceFixtureTest extends AndroidBuildViewTestCase { + + @Before + public void setup() throws Exception { + scratch.file( + "java/com/server/BUILD", + "java_binary(", + " name = 'server',", + " main_class = 'does.not.exist',", + " srcs = [],", + ")"); + scratch.file( + "java/com/app/BUILD", + "android_binary(", + " name = 'support',", + " manifest = 'AndroidManifest.xml',", + ")", + "genrule(", + " name = 'genrule',", + " outs = ['generated.apk'],", + " cmd = 'touch $(OUTS)',", + ")"); + } + + @Test + public void testPropagatesExecutableRunfiles() throws Exception { + ConfiguredTarget hostServiceFixture = + scratchConfiguredTarget( + "javatests/com/app/BUILD", + "fixture", + "android_host_service_fixture(", + " name = 'fixture',", + " executable = '//java/com/server',", + ")"); + assertThat(hostServiceFixture).isNotNull(); + assertThat( + ActionsTestUtil.prettyArtifactNames( + hostServiceFixture + .getProvider(RunfilesProvider.class) + .getDefaultRunfiles() + .getArtifactsWithoutMiddlemen())) + .containsExactlyElementsIn( + ActionsTestUtil.prettyArtifactNames( + getConfiguredTarget("//java/com/server") + .getProvider(RunfilesProvider.class) + .getDefaultRunfiles() + .getArtifacts())); + } + + @Test + public void testProvidesServiceNames() throws Exception { + ConfiguredTarget hostServiceFixture = + scratchConfiguredTarget( + "javatests/com/app/BUILD", + "fixture", + "android_host_service_fixture(", + " name = 'fixture',", + " executable = '//java/com/server',", + " service_names = ['proxy', 'echo'],", + ")"); + assertThat(getHostServiceFixtureInfoProvider(hostServiceFixture).getServiceNames()) + .containsExactly("proxy", "echo") + .inOrder(); + } + + @Test + public void testProvidesSupportApks() throws Exception { + ConfiguredTarget hostServiceFixture = + scratchConfiguredTarget( + "javatests/com/app/BUILD", + "fixture", + "android_host_service_fixture(", + " name = 'fixture',", + " executable = '//java/com/server',", + " service_names = ['proxy', 'echo'],", + " support_apks = [", + " '//java/com/app:support',", + " '//java/com/app:generated.apk',", + " ],", + ")"); + assertThat( + ActionsTestUtil.prettyArtifactNames( + getHostServiceFixtureInfoProvider(hostServiceFixture).getSupportApks())) + .containsExactly("java/com/app/support.apk", "java/com/app/generated.apk") + .inOrder(); + } + + @Test + public void testProvidesProvidesTestArgs() throws Exception { + scratch.file( + "javatests/com/app/BUILD", + "android_host_service_fixture(", + " name = 'fixture_with_no_test_args',", + " executable = '//java/com/server',", + ")", + "android_host_service_fixture(", + " name = 'fixture_with_test_args',", + " executable = '//java/com/server',", + " provides_test_args = 1,", + ")"); + assertThat( + getHostServiceFixtureInfoProvider( + getConfiguredTarget("//javatests/com/app:fixture_with_no_test_args")) + .getProvidesTestArgs()) + .isFalse(); + assertThat( + getHostServiceFixtureInfoProvider( + getConfiguredTarget("//javatests/com/app:fixture_with_test_args")) + .getProvidesTestArgs()) + .isTrue(); + } + + @Test + public void testProvidesDaemon() throws Exception { + scratch.file( + "javatests/com/app/BUILD", + "android_host_service_fixture(", + " name = 'no_daemon',", + " executable = '//java/com/server',", + ")", + "android_host_service_fixture(", + " name = 'daemon',", + " executable = '//java/com/server',", + " daemon = 1,", + ")"); + assertThat( + getHostServiceFixtureInfoProvider(getConfiguredTarget("//javatests/com/app:no_daemon")) + .getIsDaemon()) + .isFalse(); + assertThat( + getHostServiceFixtureInfoProvider(getConfiguredTarget("//javatests/com/app:daemon")) + .getIsDaemon()) + .isTrue(); + } + + private AndroidHostServiceFixtureInfoProvider getHostServiceFixtureInfoProvider( + ConfiguredTarget ct) throws Exception { + return (AndroidHostServiceFixtureInfoProvider) + ct.get(AndroidHostServiceFixtureInfoProvider.ANDROID_HOST_SERVICE_FIXTURE_INFO.getKey()); + } +} 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 db8e70ecda..8e732e018e 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 @@ -95,6 +95,22 @@ java_test( ) java_test( + name = "AndroidHostServiceFixtureTest", + srcs = ["AndroidHostServiceFixtureTest.java"], + deps = [ + ":AndroidBuildViewTestCase", + "//src/main/java/com/google/devtools/build/lib:android-rules", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib/actions", + "//src/test/java/com/google/devtools/build/lib:actions_testutil", + "//src/test/java/com/google/devtools/build/lib:analysis_testutil", + "//src/test/java/com/google/devtools/build/lib:testutil", + "//third_party:junit4", + "//third_party:truth", + ], +) + +java_test( name = "AndroidInstrumentationRuleImplTest", srcs = ["AndroidInstrumentationRuleImplTest.java"], deps = [ |