diff options
author | cparsons <cparsons@google.com> | 2017-07-11 20:21:23 +0200 |
---|---|---|
committer | László Csomor <laszlocsomor@google.com> | 2017-07-12 08:49:35 +0200 |
commit | b8ed52129f6884ca7b7a40b4a6f515797a7f6fa6 (patch) | |
tree | b076132eac910d81ea49d8d51a8ca2a39a68d151 /src/test/java/com/google/devtools/build | |
parent | 990622b2d6d2a72947ccf6ad18de7aabac49ebe8 (diff) |
Remove apple_watch1_extension and apple_watch_extension_binary rules
RELNOTES: Remove apple_watch1_extension and apple_watch_extension_binary rules. Users should be using the skylark watchos_application and watchos_extension rules. https://github.com/bazelbuild/rules_apple has details.
PiperOrigin-RevId: 161555395
Diffstat (limited to 'src/test/java/com/google/devtools/build')
7 files changed, 0 insertions, 1378 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleWatch1ExtensionTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleWatch1ExtensionTest.java deleted file mode 100644 index 9bad38b731..0000000000 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleWatch1ExtensionTest.java +++ /dev/null @@ -1,1005 +0,0 @@ -// 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.objc; - -import static com.google.common.truth.Truth.assertThat; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_BUNDLE_ID_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_ICON_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_INFOPLISTS_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_PROVISIONING_PROFILE_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchExtensionBundleRule.WATCH_EXT_BUNDLE_ID_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchExtensionBundleRule.WATCH_EXT_INFOPLISTS_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchExtensionBundleRule.WATCH_EXT_PROVISIONING_PROFILE_ATTR; - -import com.google.common.base.Joiner; -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultiset; -import com.google.common.collect.ImmutableSetMultimap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Multiset; -import com.google.devtools.build.lib.actions.Action; -import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.CommandAction; -import com.google.devtools.build.lib.actions.util.ActionsTestUtil; -import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.actions.SpawnAction; -import com.google.devtools.build.lib.analysis.config.BuildConfiguration; -import com.google.devtools.build.lib.rules.apple.AppleConfiguration.ConfigurationDistinguisher; -import com.google.devtools.build.lib.testutil.Scratch; -import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos; -import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos.BundleFile; -import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos.Control; -import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos.MergeZip; -import com.google.devtools.build.xcode.plmerge.proto.PlMergeProtos; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Test case for apple_watch1_extension. */ -@RunWith(JUnit4.class) -public class AppleWatch1ExtensionTest extends ObjcRuleTestCase { - private static final RuleType RULE_TYPE = new RuleType("apple_watch1_extension") { - @Override - Iterable<String> requiredAttributes( - Scratch scratch, String packageDir, Set<String> alreadyAdded) throws IOException { - ImmutableList.Builder<String> attributes = new ImmutableList.Builder<>(); - if (!alreadyAdded.contains("binary")) { - scratch.file(packageDir + "/extension_binary/a.m"); - scratch.file(packageDir + "/extension_binary/BUILD", - "apple_watch_extension_binary(", - " name = 'extension_binary',", - " srcs = ['a.m'],", - ")"); - attributes.add(String.format("binary = '//%s/extension_binary'", packageDir)); - } - if (!alreadyAdded.contains("app_name")) { - attributes.add("app_name = 'y'"); - } - return attributes.build(); - } - }; - - protected static final BinaryRuleTypePair RULE_TYPE_PAIR = - new BinaryRuleTypePair( - AppleWatchExtensionBinaryTest.RULE_TYPE, - RULE_TYPE, - ReleaseBundlingSupport.EXTENSION_BUNDLE_DIR_FORMAT); - - private ConfiguredTarget addMockExtensionAndLibs(String... extraExtAttributes) - throws Exception { - createLibraryTargetWriter("//lib1:lib1") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "hdr.h") - .write(); - createLibraryTargetWriter("//lib2:lib2") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "hdr.h") - .write(); - scratch.file("x/a.m"); - scratch.file("x/BUILD", - "apple_watch_extension_binary(", - " name = 'bin',", - " srcs = ['a.m'],", - " deps = ['//lib1:lib1', '//lib2:lib2'],", - ")", - "", - "apple_watch1_extension(", - " name = 'x',", - " app_name = 'y',", - " binary = ':bin',", - Joiner.on(',').join(extraExtAttributes), - ")"); - return getConfiguredTarget("//x:x"); - } - - private void addEntitlements() throws Exception { - scratch.file("x/ext_entitlements.entitlements"); - scratch.file("x/app_entitlements.entitlements"); - addMockExtensionAndLibs( - "ext_entitlements = 'ext_entitlements.entitlements'", - "app_entitlements = 'app_entitlements.entitlements'"); - } - - private Action watchApplicationIpaGeneratingAction() throws Exception { - return getGeneratingAction(getBinArtifact("_watch/x/y.ipa", - "//x:x")); - } - - @Test - public void testExtensionSigningAction() throws Exception { - useConfiguration("--cpu=ios_armv7"); - addEntitlements(); - SpawnAction action = (SpawnAction) getGeneratingActionForLabel("//x:x.ipa"); - assertRequiresDarwin(action); - assertThat(ActionsTestUtil.baseArtifactNames(action.getInputs())) - .containsExactly("x.entitlements", "foo.mobileprovision", "x.unprocessed.ipa"); - assertThat(Artifact.toRootRelativePaths(action.getOutputs())).containsExactly("x/x.ipa"); - } - - @Test - public void testApplicationSigningAction() throws Exception { - useConfiguration("--cpu=ios_armv7"); - addEntitlements(); - SpawnAction action = (SpawnAction) watchApplicationIpaGeneratingAction(); - assertRequiresDarwin(action); - assertThat(ActionsTestUtil.baseArtifactNames(action.getInputs())) - .containsExactly("x-y.entitlements", "foo.mobileprovision", "x-y.unprocessed.ipa"); - assertThat(Artifact.toRootRelativePaths(action.getOutputs())) - .containsExactly("x/_watch/x/y.ipa"); - } - - @Test - public void testExtensionSigningWithCertName() throws Exception { - useConfiguration("--cpu=ios_armv7", "--ios_signing_cert_name=Foo Bar"); - addEntitlements(); - SpawnAction action = (SpawnAction) getGeneratingActionForLabel("//x:x.ipa"); - assertThat(ActionsTestUtil.baseArtifactNames(action.getInputs())) - .containsExactly("x.entitlements", "foo.mobileprovision", "x.unprocessed.ipa"); - assertThat(Joiner.on(' ').join(action.getArguments())).contains("--sign \"Foo Bar\""); - assertThat(Artifact.toRootRelativePaths(action.getOutputs())).containsExactly("x/x.ipa"); - } - - @Test - public void testApplicationSigningWithCertName() throws Exception { - useConfiguration("--cpu=ios_armv7", "--ios_signing_cert_name=Foo Bar"); - addEntitlements(); - SpawnAction action = (SpawnAction) watchApplicationIpaGeneratingAction(); - assertThat(ActionsTestUtil.baseArtifactNames(action.getInputs())) - .containsExactly("x-y.entitlements", "foo.mobileprovision", "x-y.unprocessed.ipa"); - assertThat(Joiner.on(' ').join(action.getArguments())).contains("--sign \"Foo Bar\""); - - assertThat(Artifact.toRootRelativePaths(action.getOutputs())) - .containsExactly("x/_watch/x/y.ipa"); - } - - @Test - public void testSigning_simulatorBuild() throws Exception { - checkSigningSimulatorBuild(RULE_TYPE_PAIR, false); - } - - @Test - public void testSigning_simulatorBuild_multiCpu() throws Exception { - checkSigningSimulatorBuild(RULE_TYPE_PAIR, true); - } - - @Test - public void testProvisioningProfile_deviceBuild() throws Exception { - checkProvisioningProfileDeviceBuild(RULE_TYPE_PAIR, false); - } - - @Test - public void testProvisioningProfile_deviceBuild_multiCpu() throws Exception { - checkProvisioningProfileDeviceBuild(RULE_TYPE_PAIR, true); - } - - @Test - public void testUserSpecifiedExtensionProvisioningProfile_deviceBuild() throws Exception { - checkProvisioningProfileUserSpecified(RULE_TYPE_PAIR, false, - WATCH_EXT_PROVISIONING_PROFILE_ATTR); - } - - @Test - public void testUserSpecifiedApplicationProvisioningProfile_deviceBuild() throws Exception { - checkSpecifiedApplicationProvisioningProfile(false); - } - - @Test - public void testUserSpecifiedExtensionProvisioningProfile_deviceBuild_multiCpu() - throws Exception { - checkProvisioningProfileUserSpecified(RULE_TYPE_PAIR, true, - WATCH_EXT_PROVISIONING_PROFILE_ATTR); - } - - @Test - public void testUserSpecifiedApplicationProvisioningProfile_deviceBuild_multiCpu() - throws Exception { - checkSpecifiedApplicationProvisioningProfile(true); - } - - private void checkSpecifiedApplicationProvisioningProfile(boolean useMultiCpu) throws Exception { - setArtifactPrefix("y"); - if (useMultiCpu) { - useConfiguration("--ios_multi_cpus=armv7,arm64", "--cpu=ios_i386"); - } else { - useConfiguration("--cpu=ios_armv7"); - } - - addCustomProvisioningProfile(RULE_TYPE_PAIR, WATCH_APP_PROVISIONING_PROFILE_ATTR); - getConfiguredTarget("//x:x"); - - Artifact defaultProvisioningProfile = - getFileConfiguredTarget("//tools/objc:foo.mobileprovision").getArtifact(); - Artifact customProvisioningProfile = - getFileConfiguredTarget("//custom:pp.mobileprovision").getArtifact(); - Action signingAction = watchApplicationIpaGeneratingAction(); - assertThat(signingAction.getInputs()).contains(customProvisioningProfile); - assertThat(signingAction.getInputs()).doesNotContain(defaultProvisioningProfile); - - BundleMergeProtos.Control control = bundleMergeControl("//x:x"); - Map<String, String> profiles = mobileProvisionProfiles(control); - Map<String, String> expectedProfiles = ImmutableMap.of( - customProvisioningProfile.getExecPathString(), - ReleaseBundlingSupport.PROVISIONING_PROFILE_BUNDLE_FILE); - assertThat(profiles).isEqualTo(expectedProfiles); - } - - @Test - public void testExtensionMergeControlAction() throws Exception { - addMockExtensionAndLibs("ext_infoplists = ['Info.plist']"); - Action mergeAction = bundleMergeAction("//x:x"); - Action action = bundleMergeControlAction("//x:x"); - assertThat(action.getInputs()).isEmpty(); - assertThat(Artifact.toRootRelativePaths(action.getOutputs())).containsExactly( - "x/x.ipa-control"); - assertThat(bundleMergeControl("//x:x")) - .isEqualTo( - BundleMergeProtos.Control.newBuilder() - .addBundleFile( - BundleFile.newBuilder() - .setSourceFile(execPathEndingWith(mergeAction.getInputs(), "x_lipobin")) - .setBundlePath("x") - .setExternalFileAttribute(BundleableFile.EXECUTABLE_EXTERNAL_FILE_ATTRIBUTE) - .build()) - .setBundleRoot("PlugIns/x.appex") - .addMergeZip( - MergeZip.newBuilder() - .setEntryNamePrefix("PlugIns/x.appex/") - .setSourcePath( - execPathEndingWith(mergeAction.getInputs(), "_watch/x/y.zip")) - .build()) - .setBundleInfoPlistFile( - getMergedInfoPlist(getConfiguredTarget("//x:x")).getExecPathString()) - .setOutFile(execPathEndingWith(mergeAction.getOutputs(), "x.unprocessed.ipa")) - .setMinimumOsVersion(DEFAULT_IOS_SDK_VERSION.toString()) - .setSdkVersion(DEFAULT_IOS_SDK_VERSION.toString()) - .setPlatform("IOS_SIMULATOR") - .setFallbackBundleIdentifier("example.ext.x") - .build()); - } - - @Test - public void testApplicationMergeControlAction() throws Exception { - setArtifactPrefix("y"); - addMockExtensionAndLibs("app_infoplists = ['Info.plist']"); - Action mergeAction = bundleMergeAction("//x:x"); - Action action = bundleMergeControlAction("//x:x"); - assertThat(action.getInputs()).isEmpty(); - assertThat(Artifact.toRootRelativePaths(action.getOutputs())).containsExactly( - "x/x-y.ipa-control"); - assertThat(bundleMergeControl("//x:x")) - .isEqualTo( - BundleMergeProtos.Control.newBuilder() - .setBundleRoot("Payload/y.app") - .addMergeZip( - MergeZip.newBuilder() - .setEntryNamePrefix("Payload/y.app/") - .setSourcePath( - getBinArtifact("_watch/x/WatchKitStub.zip", "//x:x") - .getExecPathString()) - .build()) - .setBundleInfoPlistFile( - getMergedInfoPlist(getConfiguredTarget("//x:x")).getExecPathString()) - .setOutFile(execPathEndingWith(mergeAction.getOutputs(), "x-y.unprocessed.ipa")) - .setMinimumOsVersion(DEFAULT_IOS_SDK_VERSION.toString()) - .setSdkVersion(DEFAULT_IOS_SDK_VERSION.toString()) - .setPlatform("IOS_SIMULATOR") - .setFallbackBundleIdentifier("example.app.y") - .build()); - } - - @Test - public void testMergeExtensionBundleAction() throws Exception { - RULE_TYPE_PAIR.scratchTargets(scratch, - "ext_infoplists", "['Info.plist']"); - SpawnAction action = bundleMergeAction("//x:x"); - assertThat(Artifact.toRootRelativePaths(action.getInputs())) - .containsExactly( - MOCK_BUNDLEMERGE_PATH, - "x/x_lipobin", - "x/x.ipa-control", - "x/x-MergedInfo.plist", - "x/_watch/x/y.zip"); - assertThat(Artifact.toRootRelativePaths(action.getOutputs())) - .containsExactly("x/x.unprocessed.ipa"); - assertNotRequiresDarwin(action); - assertThat(action.getEnvironment()).isEmpty(); - assertThat(action.getArguments()) - .containsExactly( - MOCK_BUNDLEMERGE_PATH, - execPathEndingWith(action.getInputs(), "x.ipa-control")) - .inOrder(); - } - - @Test - public void testMergeApplicationBundleAction() throws Exception { - RULE_TYPE_PAIR.scratchTargets(scratch, - "app_infoplists", "['Info.plist']"); - setArtifactPrefix("y"); - SpawnAction action = bundleMergeAction("//x:x"); - assertThat(Artifact.toRootRelativePaths(action.getInputs())) - .containsExactly( - MOCK_BUNDLEMERGE_PATH, - "x/x-y.ipa-control", - "x/x-y-MergedInfo.plist", - "x/_watch/x/WatchKitStub.zip"); - assertThat(Artifact.toRootRelativePaths(action.getOutputs())) - .containsExactly("x/x-y.unprocessed.ipa"); - assertNotRequiresDarwin(action); - assertThat(action.getEnvironment()).isEmpty(); - assertThat(action.getArguments()) - .containsExactly( - MOCK_BUNDLEMERGE_PATH, - execPathEndingWith(action.getInputs(), "x-y.ipa-control")) - .inOrder(); - } - - protected List<BuildConfiguration> getExtensionConfigurations() throws InterruptedException { - return getSplitConfigurations(getTargetConfiguration(), - AppleWatch1Extension.MINIMUM_OS_AND_SPLIT_ARCH_TRANSITION); - } - - @Test - public void testErrorForAppIconGivenWithNoAssetCatalog() throws Exception { - checkAssetCatalogAttributeError(RULE_TYPE, WATCH_APP_ICON_ATTR, WATCH_EXT_INFOPLISTS_ATTR, - "['pl.plist']"); - } - - @Override - protected void checkCollectsAssetCatalogsTransitively(BinaryRuleTypePair ruleTypePair) - throws Exception { - scratch.file("lib/ac.xcassets/foo"); - scratch.file("lib/ac.xcassets/bar"); - createLibraryTargetWriter("//lib:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .set("asset_catalogs", "glob(['ac.xcassets/**'])") - .write(); - - scratch.file("x/ac.xcassets/baz"); - scratch.file("x/ac.xcassets/42"); - ruleTypePair.scratchTargets(scratch, - "deps", "['//lib:lib']", - "app_asset_catalogs", "glob(['ac.xcassets/**'])"); - - // Test that the actoolzip Action for extension has arguments and inputs obtained from - // dependencies. - SpawnAction extensionActoolZipAction = actoolZipActionForIpa("//x:x"); - assertThat(Artifact.toExecPaths(extensionActoolZipAction.getInputs())).containsExactly( - "lib/ac.xcassets/foo", "lib/ac.xcassets/bar", - MOCK_ACTOOLWRAPPER_PATH); - assertContainsSublist(extensionActoolZipAction.getArguments(), - ImmutableList.of("lib/ac.xcassets")); - - // Test that the actoolzip Action for application has arguments and inputs obtained from - // dependencies. - SpawnAction applicationActoolZipAction = (SpawnAction) getGeneratingAction( - getBinArtifact("x-y.actool.zip", "//x:x")); - assertThat(Artifact.toExecPaths(applicationActoolZipAction.getInputs())).containsExactly( - "x/ac.xcassets/baz", "x/ac.xcassets/42", - MOCK_ACTOOLWRAPPER_PATH); - assertContainsSublist(applicationActoolZipAction.getArguments(), - ImmutableList.of("x/ac.xcassets")); - } - - @Test - public void testCollectsAssetCatalogsTransitively() throws Exception { - checkCollectsAssetCatalogsTransitively(RULE_TYPE_PAIR); - } - - private void addTargetWithAssetCatalogs() throws IOException { - scratch.file("x/foo.xcassets/foo"); - scratch.file("x/foo.xcassets/bar"); - scratch.file("x/a.m"); - scratch.file("x/BUILD", - "apple_watch_extension_binary(", - " name = 'bin',", - " srcs = ['a.m'],", - ")", - "", - "apple_watch1_extension(", - " name = 'x',", - " app_name = 'y',", - " app_asset_catalogs = ['foo.xcassets/foo', 'bar.xcassets/bar'],", - " binary = ':bin',", - ")"); - } - - @Test - public void testActoolActionCorrectness() throws Exception { - addTargetWithAssetCatalogs(); - setArtifactPrefix("y"); - checkActoolActionCorrectness(DEFAULT_IOS_SDK_VERSION, - TargetDeviceFamily.WATCH.getNameInRule().toLowerCase(), "iphonesimulator"); - } - - @Test - public void testPassesFamiliesToActool() throws Exception { - checkPassesFamiliesToActool(RULE_TYPE_PAIR, AppleWatch1ExtensionRule.WATCH_EXT_FAMILIES_ATTR); - } - - @Test - public void testPassesFamiliesToIbtool() throws Exception { - checkPassesFamiliesToIbtool(RULE_TYPE_PAIR, AppleWatch1ExtensionRule.WATCH_EXT_FAMILIES_ATTR); - } - - @Test - public void testReportsErrorsForInvalidFamiliesAttribute() throws Exception { - checkReportsErrorsForInvalidFamiliesAttribute(RULE_TYPE, - AppleWatch1ExtensionRule.WATCH_EXT_FAMILIES_ATTR); - } - - @Test - public void testMergeActionsWithAssetCatalog() throws Exception { - addTargetWithAssetCatalogs(); - setArtifactPrefix("y"); - Artifact actoolZipOut = getBinArtifact("x-y.actool.zip", "//x:x"); - assertThat(bundleMergeAction("//x:x").getInputs()).contains(actoolZipOut); - - BundleMergeProtos.Control mergeControl = bundleMergeControl("//x:x"); - assertThat(mergeControl.getMergeZipList()) - .containsExactly( - MergeZip.newBuilder() - .setEntryNamePrefix("Payload/y.app/") - .setSourcePath(actoolZipOut.getExecPathString()) - .build(), - MergeZip.newBuilder() - .setEntryNamePrefix("Payload/y.app/") - .setSourcePath(getBinArtifact("_watch/x/WatchKitStub.zip", "//x:x") - .getExecPathString()) - .build()); - } - - private void addBinAndLibWithRawResources() throws Exception { - addBinAndLibWithResources( - "resources", "resource1.txt", "ja.lproj/resource2.txt", "apple_watch_extension_binary"); - scratch.file("app_resource.txt"); - scratch.file("ext_resource.txt"); - scratch.file("x/BUILD", - "apple_watch1_extension(", - " name = 'x',", - " app_name = 'y',", - " binary = '//bin:bin',", - " app_resources = ['app_resource.txt'],", - " ext_resources = ['ext_resource.txt'],", - ")"); - } - - private void addBinAndLibWithStrings() throws Exception { - addBinAndLibWithResources( - "strings", "foo.strings", "ja.lproj/bar.strings", "apple_watch_extension_binary"); - scratch.file("app.strings"); - scratch.file("x/BUILD", - "apple_watch1_extension(", - " name = 'x',", - " app_name = 'y',", - " binary = '//bin:bin',", - " app_strings = ['app.strings'],", - ")"); - } - - @Test - public void testCollectsRawResourceFilesTransitively() throws Exception { - addBinAndLibWithRawResources(); - checkCollectsResourceFilesTransitively( - "//x:x", - ImmutableList.of("lib/resource1.txt", "bin/ja.lproj/resource2.txt"), - ImmutableList.of("lib/resource1.txt"), - ImmutableSetMultimap.<String, Multiset<String>>of( - "bin_bin", ImmutableMultiset.of("bin/ja.lproj/resource2.txt", "lib/resource1.txt"), - "x_x", ImmutableMultiset.of("bin/ja.lproj/resource2.txt", "lib/resource1.txt", - "x/ext_resource.txt"), - "lib_lib", ImmutableMultiset.of("lib/resource1.txt"), - "y__x", ImmutableMultiset.of("x/app_resource.txt"))); - } - - @Test - public void testCollectsStringsFilesTransitively() throws Exception { - addBinAndLibWithStrings(); - checkCollectsResourceFilesTransitively( - "//x:x", - ImmutableList.of("x/lib/foo.strings.binary", "x/bin/ja.lproj/bar.strings.binary"), - ImmutableList.of("lib/foo.strings.binary"), - ImmutableSetMultimap.<String, Multiset<String>>of( - "bin_bin", ImmutableMultiset.of("bin/ja.lproj/bar.strings", "lib/foo.strings"), - "x_x", ImmutableMultiset.of("bin/ja.lproj/bar.strings", "lib/foo.strings"), - "lib_lib", ImmutableMultiset.of("lib/foo.strings"), - "y__x", ImmutableMultiset.of("x/app.strings"))); - } - - @Test - public void testResourceFilesMergedInBundle() throws Exception { - addBinAndLibWithRawResources(); - checkBundleablesAreMerged("//x:x", - ImmutableListMultimap.of( - "resource1.txt", "resource1.txt", - "ja.lproj/resource2.txt", "ja.lproj/resource2.txt")); - } - - @Test - public void testStringsFilesMergedInBundle() throws Exception { - addBinAndLibWithStrings(); - checkBundleablesAreMerged("//x:x", - ImmutableListMultimap.of( - "foo.strings.binary", "foo.strings", - "ja.lproj/bar.strings.binary", "ja.lproj/bar.strings")); - } - - @Test - public void testPlistRequiresDotInName() throws Exception { - String errorMessage = "'//x:Infoplist' does not produce any apple_watch1_extension " - + "ext_infoplists files (expected .plist)"; - checkError("x", "x", - errorMessage, - "apple_watch_extension_binary(", - " name = 'bin',", - " srcs = ['a.m'],", - ")", - "", - "apple_watch1_extension(", - " name = 'x',", - " app_name = 'y',", - " ext_infoplists = ['Infoplist'],", - " binary = ':bin',", - ")"); - } - - @Test - public void testIncludesStoryboardOutputZipsAsMergeZipsForApplication() throws Exception { - addStoryboards(); - setArtifactPrefix("y"); - Artifact libsbOutputZip = getBinArtifact("x-y/libsb.storyboard.zip", "//x:x"); - - Control mergeControl = bundleMergeControl("//x:x"); - assertThat(mergeControl.getMergeZipList()).containsExactly( - MergeZip.newBuilder() - .setEntryNamePrefix("Payload/y.app/") - .setSourcePath(libsbOutputZip.getExecPathString()) - .build(), - MergeZip.newBuilder() - .setEntryNamePrefix("Payload/y.app/") - .setSourcePath(getBinArtifact("_watch/x/WatchKitStub.zip", "//x:x") - .getExecPathString()) - .build()); - } - - protected void addStoryboards() throws Exception { - scratch.file("lib/libsb.storyboard"); - createLibraryTargetWriter("//lib:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setList("storyboards", "libsb.storyboard") - .write(); - - scratch.file("bndl/bndlsb.storyboard"); - scratch.file("bndl/BUILD", - "objc_bundle_library(", - " name = 'bndl',", - " storyboards = ['ext_bndlsb.storyboard'],", - ")"); - - scratch.file("x/xsb.storyboard"); - RULE_TYPE_PAIR.scratchTargets(scratch, - "storyboards", "['ext.storyboard']", - "app_deps", "['//lib:lib']", - "bundles", "['//bndl:bndl']"); - getConfiguredTarget("//x:x"); - } - - @Test - public void testMergesPartialInfoplists() throws Exception { - scratch.file("x/primary-Info.plist"); - setArtifactPrefix("y"); - RULE_TYPE_PAIR.scratchTargets(scratch, - "app_asset_catalogs", "['foo.xcassets/bar']", - "app_infoplists", "['primary-Info.plist']"); - - String targetName = "//x:x"; - ConfiguredTarget target = getConfiguredTarget(targetName); - PlMergeProtos.Control control = plMergeControl(targetName); - - Artifact merged = getBinArtifact("x-y-MergedInfo.plist", target); - Artifact actoolPartial = getBinArtifact("x-y.actool-PartialInfo.plist", "//x:x"); - - Artifact versionInfoplist = getBinArtifact("plists/x-y-version.plist", target); - Artifact environmentInfoplist = getBinArtifact("plists/x-y-environment.plist", target); - Artifact automaticInfoplist = getBinArtifact("plists/x-y-automatic.plist", target); - - assertPlistMergeControlUsesSourceFiles( - control, - ImmutableList.<String>of( - "x/primary-Info.plist", - versionInfoplist.getExecPathString(), - environmentInfoplist.getExecPathString(), - automaticInfoplist.getExecPathString(), - actoolPartial.getExecPathString())); - assertThat(control.getOutFile()).isEqualTo(merged.getExecPathString()); - assertThat(control.getVariableSubstitutionMapMap()) - .containsExactlyEntriesIn(variableSubstitutionsForWatchApplication()); - assertThat(control.getFallbackBundleId()).isEqualTo("example.app.y"); - } - - @Test - public void testNibZipsMergedIntoBundle() throws Exception { - checkNibZipsMergedIntoBundle(RULE_TYPE_PAIR); - } - - @Test - public void testPassesExtensionFallbackBundleIdToBundleMerging() throws Exception { - scratch.file("bin/a.m"); - scratch.file("bin/Ext-Info.plist"); - - RULE_TYPE.scratchTarget(scratch, - WATCH_EXT_INFOPLISTS_ATTR, "['Ext-Info.plist']"); - - BundleMergeProtos.Control control = bundleMergeControl("//x:x"); - - assertThat(control.hasPrimaryBundleIdentifier()).isFalse(); - assertThat(control.getFallbackBundleIdentifier()).isEqualTo("example.ext.x"); - } - - @Test - public void testPassesApplicationFallbackBundleIdToBundleMerging() throws Exception { - setArtifactPrefix("y"); - scratch.file("bin/a.m"); - scratch.file("bin/App-Info.plist"); - - RULE_TYPE.scratchTarget(scratch, - WATCH_APP_INFOPLISTS_ATTR, "['App-Info.plist']"); - - BundleMergeProtos.Control control = bundleMergeControl("//x:x"); - - assertThat(control.hasPrimaryBundleIdentifier()).isFalse(); - assertThat(control.getFallbackBundleIdentifier()).isEqualTo("example.app.y"); - } - - @Test - public void testPassesExtensionPrimaryBundleIdToBundleMerging() throws Exception { - scratch.file("bin/a.m"); - scratch.file("bin/Ext-Info.plist"); - - RULE_TYPE.scratchTarget(scratch, - WATCH_EXT_INFOPLISTS_ATTR, "['Ext-Info.plist']", - WATCH_EXT_BUNDLE_ID_ATTR, "'com.bundle.ext.id'"); - - BundleMergeProtos.Control control = bundleMergeControl("//x:x"); - - assertThat(control.getPrimaryBundleIdentifier()).isEqualTo("com.bundle.ext.id"); - assertThat(control.hasFallbackBundleIdentifier()).isFalse(); - } - - @Test - public void testPassesApplicationPrimaryBundleIdToBundleMerging() throws Exception { - setArtifactPrefix("y"); - scratch.file("bin/a.m"); - scratch.file("bin/App-Info.plist"); - - RULE_TYPE.scratchTarget(scratch, - WATCH_APP_INFOPLISTS_ATTR, "['App-Info.plist']", - WATCH_APP_BUNDLE_ID_ATTR, "'com.bundle.app.id'"); - - BundleMergeProtos.Control control = bundleMergeControl("//x:x"); - - assertThat(control.getPrimaryBundleIdentifier()).isEqualTo("com.bundle.app.id"); - assertThat(control.hasFallbackBundleIdentifier()).isFalse(); - } - - @Test - public void testMultiPlatformBuild_fails() throws Exception { - checkBinaryActionMultiPlatform_fails(RULE_TYPE_PAIR); - } - - @Test - public void testMultiArchitectureResources() throws Exception { - useConfiguration("--ios_multi_cpus=i386,x86_64"); - RULE_TYPE_PAIR.scratchTargets(scratch, "resources", "['foo.png']"); - - assertThat(Artifact.toRootRelativePaths(bundleMergeAction("//x:x").getInputs())) - .containsExactly( - "x/foo.png", - "x/x_lipobin", - "tools/objc/bundlemerge", - "x/x.ipa-control", - "x/x-MergedInfo.plist", - "x/_watch/x/y.zip"); - } - - @Override - protected void addCommonResources(BinaryRuleTypePair ruleTypePair) throws Exception { - ruleTypePair.scratchTargets(scratch, - "strings", "['foo.strings']", - "storyboards", "['baz.storyboard']"); - } - - @Test - public void testMultiCpuCompiledResources() throws Exception { - checkMultiCpuCompiledResources(RULE_TYPE_PAIR); - } - - @Test - public void testConvertStringsActions() throws Exception { - checkConvertStringsAction(RULE_TYPE_PAIR); - } - - @Test - public void testCompileXibActions() throws Exception { - checkCompileXibActions(RULE_TYPE_PAIR, DEFAULT_IOS_SDK_VERSION, "iphone"); - } - - @Test - public void testRegistersStoryboardCompileActions() throws Exception { - checkRegistersStoryboardCompileActions(RULE_TYPE_PAIR, DEFAULT_IOS_SDK_VERSION, "iphone"); - } - - @Test - public void testMultiCpuCompiledResourcesFromGenrule() throws Exception { - checkMultiCpuCompiledResourcesFromGenrule(RULE_TYPE_PAIR); - } - - @Test - public void testMultiCpuGeneratedResourcesFromGenrule() throws Exception { - checkMultiCpuGeneratedResourcesFromGenrule(RULE_TYPE_PAIR); - } - - @Test - public void testTwoStringsOneBundlePath() throws Exception { - checkTwoStringsOneBundlePath(RULE_TYPE_PAIR, "x"); - } - - @Test - public void testTwoResourcesOneBundlePath() throws Exception { - checkTwoResourcesOneBundlePath(RULE_TYPE_PAIR, "x"); - } - - @Test - public void testSameStringsTwice() throws Exception { - checkSameStringsTwice(RULE_TYPE_PAIR, "x"); - } - - @Test - public void testExtensionReplacesMinimumOsInBundleMerge() throws Exception { - useConfiguration("--ios_minimum_os=7.1"); - addMockExtensionAndLibs("ext_infoplists = ['Info.plist']"); - - assertThat(bundleMergeControl("//x:x").getMinimumOsVersion()) - .isEqualTo(WatchUtils.MINIMUM_OS_VERSION.toString()); - } - - @Test - public void testExtensionReplacesMinimumOsVersionInBundleMergeAtMost82() throws Exception { - useConfiguration("--ios_minimum_os=8.3"); - addMockExtensionAndLibs("ext_infoplists = ['Info.plist']"); - - assertThat(bundleMergeControl("//x:x").getMinimumOsVersion()) - .isEqualTo("8.3"); - } - - @Test - public void testCheckExtensionPrimaryBundleIdInMergedPlist() throws Exception { - RULE_TYPE_PAIR.scratchTargets(scratch, - WATCH_EXT_INFOPLISTS_ATTR, "['Info.plist']", - WATCH_EXT_BUNDLE_ID_ATTR, "'com.ext.bundle.id'"); - scratch.file("ext/Info.plist"); - - checkBundleIdFlagsInPlistMergeAction( - Optional.of("com.ext.bundle.id"), - getVariableSubstitutionArguments(RULE_TYPE_PAIR), - "example.ext.x"); - } - - @Test - public void testCheckApplicationPrimaryBundleIdInMergedPlist() throws Exception { - setArtifactPrefix("y"); - RULE_TYPE_PAIR.scratchTargets(scratch, - WATCH_APP_INFOPLISTS_ATTR, "['Info.plist']", - WATCH_APP_BUNDLE_ID_ATTR, "'com.app.bundle.id'"); - scratch.file("app/Info.plist"); - - checkBundleIdFlagsInPlistMergeAction( - Optional.of("com.app.bundle.id"), - variableSubstitutionsForWatchApplication(), - "example.app.y"); - } - - @Test - public void testCheckExtensionFallbackBundleIdInMergedPlist() throws Exception { - RULE_TYPE_PAIR.scratchTargets(scratch, - WATCH_EXT_INFOPLISTS_ATTR, "['Info.plist']"); - scratch.file("ext/Info.plist"); - - checkBundleIdFlagsInPlistMergeAction( - Optional.<String>absent(), - getVariableSubstitutionArguments(RULE_TYPE_PAIR), - "example.ext.x"); - } - - @Test - public void testCheckApplicationFallbackBundleIdInMergedPlist() throws Exception { - setArtifactPrefix("y"); - RULE_TYPE_PAIR.scratchTargets(scratch, - WATCH_APP_INFOPLISTS_ATTR, "['Info.plist']"); - scratch.file("app/Info.plist"); - - checkBundleIdFlagsInPlistMergeAction( - Optional.<String>absent(), - variableSubstitutionsForWatchApplication(), - "example.app.y"); - } - - private ImmutableMap<String, String> variableSubstitutionsForWatchApplication() { - return new ImmutableMap.Builder<String, String>() - .put("EXECUTABLE_NAME", "y") - .put("BUNDLE_NAME", "y.app") - .put("PRODUCT_NAME", "y") - .build(); - } - - protected void checkExtensionReplacesMinimumOsInCompilation() throws Exception { - addMockExtensionAndLibs("ext_infoplists = ['Info.plist']"); - - Action lipoAction = lipoBinAction("//x:x"); - - for (Artifact bin : lipoAction.getInputs()) { - CommandAction action = (CommandAction) getGeneratingAction(bin); - if (action == null) { - continue; - } - assertThat(generatingArgumentsToString(action)) - .contains("-mios-simulator-version-min=" + WatchUtils.MINIMUM_OS_VERSION); - assertThat(generatingArgumentsToString(action)) - .doesNotContain("-mios-simulator-version-min=7.1"); - } - } - - private String generatingArgumentsToString(CommandAction generatingAction) { - return Joiner.on(' ').join(generatingAction.getArguments()); - } - - protected void checkExtensionDoesNotReplaceMinimumOsInCompilation() throws Exception { - addMockExtensionAndLibs("ext_infoplists = ['Info.plist']"); - - Action lipoAction = lipoBinAction("//x:x"); - - for (Artifact bin : lipoAction.getInputs()) { - CommandAction action = (CommandAction) getGeneratingAction(bin); - if (action == null) { - continue; - } - assertThat(generatingArgumentsToString(action)).contains("-mios-simulator-version-min=8.3"); - assertThat(generatingArgumentsToString(action)) - .doesNotContain("-mios-simulator-version-min=" + DEFAULT_IOS_SDK_VERSION); - } - } - - @Test - public void testGenruleWithoutJavaCcDeps() throws Exception { - checkGenruleWithoutJavaCcDependency(RULE_TYPE_PAIR); - } - - @Test - public void testCcDependencyWithProtoDependencyMultiArch() throws Exception { - checkCcDependencyWithProtoDependencyMultiArch( - RULE_TYPE_PAIR, ConfigurationDistinguisher.WATCH_OS1_EXTENSION); - } - - @Test - public void testAutomaticPlistEntries() throws Exception { - checkAutomaticPlistEntries(RULE_TYPE); - } - - @Test - public void testBundleMergeInputContainsPlMergeOutput() throws Exception { - checkBundleMergeInputContainsPlMergeOutput(RULE_TYPE); - } - - @Test - public void testMergeBundleActionsWithNestedBundle() throws Exception { - BuildConfiguration extensionConfiguration = - Iterables.getOnlyElement(getExtensionConfigurations()); - checkMergeBundleActionsWithNestedBundle(RULE_TYPE_PAIR, extensionConfiguration); - } - - @Test - public void testIncludesStoryboardOutputZipsAsMergeZipsForExtension() throws Exception { - BuildConfiguration configuration = Iterables.getOnlyElement(getExtensionConfigurations()); - addStoryboards(); - - Artifact extBndlsbOutputZip = - getBinArtifact( - "bndl/ext_bndlsb.storyboard.zip", getConfiguredTarget("//bndl:bndl", configuration)); - Artifact extsbOutputZip = getBinArtifact("x/ext.storyboard.zip", "//x:x"); - - String bundleDir = RULE_TYPE_PAIR.getBundleDir(); - Control mergeControl = bundleMergeControl("//x:x"); - assertThat(mergeControl.getMergeZipList()) - .containsExactly( - MergeZip.newBuilder() - .setEntryNamePrefix(bundleDir + "/") - .setSourcePath(extsbOutputZip.getExecPathString()) - .build(), - MergeZip.newBuilder() - .setEntryNamePrefix(bundleDir + "/") - .setSourcePath(getBinArtifact("_watch/x/y.zip", "//x:x").getExecPathString()) - .build()); - - Control nestedMergeControl = Iterables.getOnlyElement(mergeControl.getNestedBundleList()); - assertThat(nestedMergeControl.getMergeZipList()) - .containsExactly( - MergeZip.newBuilder() - .setEntryNamePrefix(bundleDir + "/bndl.bundle/") - .setSourcePath(extBndlsbOutputZip.getExecPathString()) - .build()); - } - - @Test - public void testCcDependency() throws Exception { - checkCcDependency(RULE_TYPE_PAIR, ConfigurationDistinguisher.WATCH_OS1_EXTENSION); - } - - @Test - public void testCcDependencyMultiArch() throws Exception { - checkCcDependencyMultiArch(RULE_TYPE_PAIR, ConfigurationDistinguisher.WATCH_OS1_EXTENSION); - } - - @Test - public void testCcDependencyWithProtoDependency() throws Exception { - checkCcDependencyWithProtoDependency( - RULE_TYPE_PAIR, ConfigurationDistinguisher.WATCH_OS1_EXTENSION); - } - - @Test - public void testCcDependencyAndJ2objcDependency() throws Exception { - checkCcDependencyAndJ2objcDependency( - RULE_TYPE_PAIR, ConfigurationDistinguisher.WATCH_OS1_EXTENSION); - } - - @Test - public void testMultiArchitectureFanOut() throws Exception { - checkBinaryLipoActionMultiCpu(RULE_TYPE_PAIR, ConfigurationDistinguisher.WATCH_OS1_EXTENSION); - } - - @Test - public void testGenruleDependencyMultiArch() throws Exception { - checkGenruleDependencyMultiArch(RULE_TYPE_PAIR, ConfigurationDistinguisher.WATCH_OS1_EXTENSION); - } - - @Test - public void testExtensionReplacesMinimumOsInCompilation() throws Exception { - useConfiguration("--ios_minimum_os=7.1"); - checkExtensionReplacesMinimumOsInCompilation(); - } - - @Test - public void testExtensionReplacesMinimumOsInCompilationAtMost82() throws Exception { - useConfiguration("--ios_minimum_os=8.3"); - checkExtensionDoesNotReplaceMinimumOsInCompilation(); - } - - @Test - public void testExtensionReplacesMinimumOsInCompilationMultiArch() throws Exception { - useConfiguration("--ios_minimum_os=7.1", "--ios_multi_cpus=i386,x86_64"); - checkExtensionReplacesMinimumOsInCompilation(); - } - - @Test - public void testExtensionReplacesMinimumOsInCompilationAtMost82MultiArch() throws Exception { - useConfiguration("--ios_minimum_os=8.3", "--ios_multi_cpus=i386,x86_64"); - checkExtensionDoesNotReplaceMinimumOsInCompilation(); - } -} diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleWatchExtensionBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleWatchExtensionBinaryTest.java deleted file mode 100644 index d317b82658..0000000000 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleWatchExtensionBinaryTest.java +++ /dev/null @@ -1,171 +0,0 @@ -// 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.objc; - -import static com.google.common.truth.Truth.assertThat; -import static com.google.devtools.build.lib.rules.objc.BinaryLinkingTargetFactory.REQUIRES_AT_LEAST_ONE_LIBRARY_OR_SOURCE_FILE; - -import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.RunfilesProvider; -import com.google.devtools.build.lib.analysis.config.CompilationMode; -import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Test case for apple_watch_extension_binary. */ -@RunWith(JUnit4.class) -public class AppleWatchExtensionBinaryTest extends ObjcRuleTestCase { - static final RuleType RULE_TYPE = new OnlyNeedsSourcesRuleType("apple_watch_extension_binary"); - protected static final ExtraLinkArgs EXTRA_LINK_ARGS = - new ExtraLinkArgs("-fapplication-extension", "-framework", "WatchKit"); - - @Test - public void testCreate_runfiles() throws Exception { - scratch.file("x/a.m"); - RULE_TYPE.scratchTarget(scratch, "srcs", "['a.m']"); - ConfiguredTarget binary = getConfiguredTarget("//x:x"); - RunfilesProvider runfiles = binary.getProvider(RunfilesProvider.class); - assertThat(runfiles.getDefaultRunfiles().getArtifacts()).isEmpty(); - assertThat(Artifact.toRootRelativePaths(runfiles.getDataRunfiles().getArtifacts())) - .containsExactly("x/x_bin"); - } - - @Test - public void testCreate_errorForNoSourceOrDep() throws Exception { - checkError("x", "x", REQUIRES_AT_LEAST_ONE_LIBRARY_OR_SOURCE_FILE, - "apple_watch_extension_binary(name='x')"); - } - - @Test - public void testCompileWithDotMFileInHeaders() throws Exception { - checkCompileWithDotMFileInHeaders(RULE_TYPE); - } - - @Test - public void testLinksFrameworksOfSelfAndTransitiveDependencies() throws Exception { - checkLinksFrameworksOfSelfAndTransitiveDependencies(RULE_TYPE); - } - - @Test - public void testLinksWeakFrameworksOfSelfAndTransitiveDependencies() throws Exception { - checkLinksWeakFrameworksOfSelfAndTransitiveDependencies(RULE_TYPE); - } - - @Test - public void testLinksDylibsTransitively() throws Exception { - checkLinksDylibsTransitively(RULE_TYPE); - } - - @Test - public void testPopulatesCompilationArtifacts() throws Exception { - checkPopulatesCompilationArtifacts(RULE_TYPE); - } - - @Test - public void testErrorsWrongFileTypeForSrcsWhenCompiling() throws Exception { - checkErrorsWrongFileTypeForSrcsWhenCompiling(RULE_TYPE); - } - - @Test - public void testObjcCopts() throws Exception { - checkObjcCopts(RULE_TYPE); - } - - @Test - public void testObjcCopts_argumentOrdering() throws Exception { - checkObjcCopts_argumentOrdering(RULE_TYPE); - } - - @Test - public void testAllowVariousNonBlacklistedTypesInHeaders() throws Exception { - checkAllowVariousNonBlacklistedTypesInHeaders(RULE_TYPE); - } - - @Test - public void testWarningForBlacklistedTypesInHeaders() throws Exception { - checkWarningForBlacklistedTypesInHeaders(RULE_TYPE); - } - - @Test - public void testCppSourceCompilesWithCppFlags() throws Exception { - checkCppSourceCompilesWithCppFlags(RULE_TYPE); - } - - @Test - public void testProtoBundlingAndLinking() throws Exception { - checkProtoBundlingAndLinking(RULE_TYPE); - } - - @Test - public void testProtoBundlingWithTargetsWithNoDeps() throws Exception { - checkProtoBundlingWithTargetsWithNoDeps(RULE_TYPE); - } - - @Test - public void testLinkingRuleCanUseCrosstool() throws Exception { - checkLinkingRuleCanUseCrosstool(RULE_TYPE); - } - - @Test - public void testBinaryStrippings() throws Exception { - checkBinaryStripAction(RULE_TYPE); - } - - @Test - public void testCompilationActionsForDebug() throws Exception { - checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.DBG, CodeCoverageMode.NONE); - } - - @Test - public void testCompilationActionsForOptimized() throws Exception { - checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.OPT, CodeCoverageMode.NONE); - } - - @Test - public void testClangCoptsForDebugModeWithoutGlib() throws Exception { - checkClangCoptsForDebugModeWithoutGlib(RULE_TYPE); - } - - @Test - public void testLinkActionCorrect() throws Exception { - checkLinkActionCorrect(RULE_TYPE, EXTRA_LINK_ARGS); - } - - @Test - public void testCompilationActionsForDebugInGcovCoverage() throws Exception { - checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.DBG, - CodeCoverageMode.GCOV); - } - - @Test - public void testCompilationActionsForOptimizedInGcovCoverage() throws Exception { - checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.OPT, - CodeCoverageMode.GCOV); - } - - @Test - public void testCompilationActionsForDebugInLlvmCovCoverage() throws Exception { - checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.DBG, - CodeCoverageMode.LLVMCOV); - } - - @Test - public void testCompilationActionsForOptimizedInLlvmCovCoverage() throws Exception { - checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.OPT, - CodeCoverageMode.LLVMCOV); - } -} diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BinaryRuleTypePair.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BinaryRuleTypePair.java index 57eeef63ef..47a8601180 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/BinaryRuleTypePair.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BinaryRuleTypePair.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.rules.objc; -import static com.google.devtools.build.lib.rules.objc.AppleWatch1ExtensionRule.WATCH_APP_DEPS_ATTR; import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.BundlingRule.FAMILIES_ATTR; import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.BundlingRule.INFOPLIST_ATTR; import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.ReleaseBundlingRule.APP_ICON_ATTR; @@ -23,14 +22,6 @@ import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.ReleaseBu import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.ReleaseBundlingRule.LAUNCH_IMAGE_ATTR; import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.ReleaseBundlingRule.LAUNCH_STORYBOARD_ATTR; import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.ReleaseBundlingRule.PROVISIONING_PROFILE_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_ASSET_CATALOGS_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_BUNDLE_ID_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_INFOPLISTS_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_PROVISIONING_PROFILE_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchApplicationBundleRule.WATCH_APP_STORYBOARDS_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchExtensionBundleRule.WATCH_EXT_BUNDLE_ID_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchExtensionBundleRule.WATCH_EXT_INFOPLISTS_ATTR; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.WatchExtensionBundleRule.WATCH_EXT_PROVISIONING_PROFILE_ATTR; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.testutil.Scratch; @@ -131,16 +122,6 @@ final class BinaryRuleTypePair { case PROVISIONING_PROFILE_ATTR: case ENTITLEMENTS_ATTR: case INFOPLIST_ATTR: - case AppleWatch1ExtensionRule.WATCH_EXT_FAMILIES_ATTR: - case WATCH_EXT_INFOPLISTS_ATTR: - case WATCH_APP_INFOPLISTS_ATTR: - case WATCH_APP_PROVISIONING_PROFILE_ATTR: - case WATCH_EXT_PROVISIONING_PROFILE_ATTR: - case WATCH_EXT_BUNDLE_ID_ATTR: - case WATCH_APP_BUNDLE_ID_ATTR: - case WATCH_APP_STORYBOARDS_ATTR: - case WATCH_APP_ASSET_CATALOGS_ATTR: - case WATCH_APP_DEPS_ATTR: bundlingAttributes.add(attributeName, value); break; default: diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosApplicationTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosApplicationTest.java index a7dda26d2a..5e2864a7dd 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosApplicationTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosApplicationTest.java @@ -32,7 +32,6 @@ import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.CommandAction; import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.FileProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.RunfilesProvider; @@ -1025,72 +1024,6 @@ public class IosApplicationTest extends ObjcRuleTestCase { } @Test - public void testPropagatesDebugSymbolsFromExtensions() throws Exception { - useConfiguration("--ios_multi_cpus=i386,x86_64", "--apple_generate_dsym"); - scratch.file( - "x/BUILD", - "ios_extension_binary(", - " name = 'ext2_bin',", - " srcs = ['ebin.m'],", - ")", - "", - "ios_extension(", - " name = 'ext2',", - " binary = ':ext2_bin',", - ")", - "", - "ios_extension_binary(", - " name = 'ext_bin',", - " srcs = ['ebin.m'],", - ")", - "", - "ios_extension(", - " name = 'ext',", - " binary = ':ext_bin',", - ")", - "", - "apple_watch_extension_binary(", - " name = 'watch_bin',", - " srcs = ['a.m'],", - ")", - "", - "apple_watch1_extension(", - " name = 'watch_ext',", - " app_name = 'y',", - " binary = ':watch_bin',", - ")", - "", - "objc_binary(", - " name = 'bin',", - " srcs = ['bin.m'],", - ")", - "", - "ios_application(", - " name = 'app',", - " binary = ':bin',", - " extensions = [':ext', ':ext2', ':watch_ext'],", - ")"); - - Iterable<Artifact> filesToBuild = - getConfiguredTarget("//x:app").getProvider(FileProvider.class).getFilesToBuild(); - assertThat(filesToBuild) - .containsAllOf( - getBinArtifact("app.app.dSYM/Contents/Resources/DWARF/app_i386", "//x:app"), - getBinArtifact("app.app.dSYM/Contents/Resources/DWARF/app_x86_64", "//x:app"), - getBinArtifact("app.app.dSYM/Contents/Info.plist", "//x:app"), - getBinArtifact("ext.app.dSYM/Contents/Resources/DWARF/ext_i386", "//x:app"), - getBinArtifact("ext.app.dSYM/Contents/Resources/DWARF/ext_x86_64", "//x:app"), - getBinArtifact("ext.app.dSYM/Contents/Info.plist", "//x:app"), - getBinArtifact("ext2.app.dSYM/Contents/Resources/DWARF/ext2_i386", "//x:app"), - getBinArtifact("ext2.app.dSYM/Contents/Resources/DWARF/ext2_x86_64", "//x:app"), - getBinArtifact("ext2.app.dSYM/Contents/Info.plist", "//x:app"), - getBinArtifact("watch_ext.app.dSYM/Contents/Resources/DWARF/watch_ext_i386", "//x:app"), - getBinArtifact( - "watch_ext.app.dSYM/Contents/Resources/DWARF/watch_ext_x86_64", "//x:app"), - getBinArtifact("watch_ext.app.dSYM/Contents/Info.plist", "//x:app")); - } - - @Test public void testMultiArchitectureFanOut() throws Exception { checkBinaryLipoActionMultiCpu(RULE_TYPE_PAIR, ConfigurationDistinguisher.IOS_APPLICATION); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyAppleWatch1ExtensionTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyAppleWatch1ExtensionTest.java deleted file mode 100644 index dc386625e8..0000000000 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyAppleWatch1ExtensionTest.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.objc; - -import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** - * Legacy test: These tests test --experimental_objc_crosstool=off. See README. - */ -@RunWith(JUnit4.class) -public class LegacyAppleWatch1ExtensionTest extends AppleWatch1ExtensionTest { - @Override - protected ObjcCrosstoolMode getObjcCrosstoolMode() { - return ObjcCrosstoolMode.OFF; - } - - @Test - public void testGenruleDependency() throws Exception { - checkGenruleDependency(RULE_TYPE_PAIR); - } -} diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyAppleWatchExtensionBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyAppleWatchExtensionBinaryTest.java deleted file mode 100644 index 84bd7cc4ad..0000000000 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyAppleWatchExtensionBinaryTest.java +++ /dev/null @@ -1,76 +0,0 @@ -// 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.objc; - -import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** - * Legacy test: These tests test --experimental_objc_crosstool=off. See README. - */ -@RunWith(JUnit4.class) -public class LegacyAppleWatchExtensionBinaryTest extends AppleWatchExtensionBinaryTest { - @Override - protected ObjcCrosstoolMode getObjcCrosstoolMode() { - return ObjcCrosstoolMode.OFF; - } - - @Test - public void testLinkActionWithTransitiveCppDependency() throws Exception { - checkLinkActionWithTransitiveCppDependency(RULE_TYPE, EXTRA_LINK_ARGS); - } - - @Test - public void testCompilesSources() throws Exception { - checkCompilesSources(RULE_TYPE); - } - - @Test - public void testCompilesSourcesWithModuleMapsEnabled() throws Exception { - checkCompilesSourcesWithModuleMapsEnabled(RULE_TYPE); - } - - @Test - public void testCompileWithTextualHeaders() throws Exception { - checkCompileWithTextualHeaders(RULE_TYPE); - } - - @Test - public void testLinkWithFrameworkImportsIncludesFlagsAndInputArtifacts() throws Exception { - checkLinkWithFrameworkImportsIncludesFlagsAndInputArtifacts(RULE_TYPE); - } - - @Test - public void testCompilesWithHdrs() throws Exception { - checkCompilesWithHdrs(RULE_TYPE); - } - - @Test - public void testForceLoadsAlwayslinkTargets() throws Exception { - checkForceLoadsAlwayslinkTargets(RULE_TYPE, EXTRA_LINK_ARGS); - } - - @Test - public void testReceivesTransitivelyPropagatedDefines() throws Exception { - checkReceivesTransitivelyPropagatedDefines(RULE_TYPE); - } - - @Test - public void testSdkIncludesUsedInCompileAction() throws Exception { - checkSdkIncludesUsedInCompileAction(RULE_TYPE); - } -} diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 5ec6bc0c82..794e8404d3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -198,7 +198,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { return String.format("blaze-out/ios_%s-fastbuild/", arch); case IOS_EXTENSION: // Intentional fall-through. case IOS_APPLICATION: - case WATCH_OS1_EXTENSION: case APPLEBIN_IOS: return String.format("blaze-out/ios-%1$s-min%3$s-%2$s-ios_%1$s-fastbuild/", arch, configurationDistinguisher.toString().toLowerCase(Locale.US), minOsVersion); @@ -234,7 +233,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { String arch, ConfigurationDistinguisher configurationDistinguisher) { switch (configurationDistinguisher) { case IOS_EXTENSION: - case WATCH_OS1_EXTENSION: case APPLEBIN_IOS: return String.format("blaze-out/%s-ios_%s-fastbuild/bin/", configurationDistinguisher.toString().toLowerCase(Locale.US), arch); @@ -259,8 +257,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { case IOS_APPLICATION: case APPLEBIN_IOS: return DEFAULT_IOS_SDK_VERSION; - case WATCH_OS1_EXTENSION: - return WatchUtils.MINIMUM_OS_VERSION; case APPLEBIN_WATCHOS: return DottedVersion.fromString(XcodeVersionProperties.DEFAULT_WATCHOS_SDK_VERSION); default: |