Merge BazelIosTest and ExperimentalIosTest, deleting the former.

--
MOS_MIGRATED_REVID=103781890

2 files changed, 2 insertions, 71 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTest.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTest.java
deleted file mode 100644
index c92e385647..0000000000
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2014 Google Inc. 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.bazel.rules.objc;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-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.analysis.RunfilesSupport;
-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.objc.ExecutionRequirements;
-import com.google.devtools.build.lib.rules.objc.IosTest;
-import com.google.devtools.build.lib.rules.objc.ObjcCommon;
-import com.google.devtools.build.lib.rules.objc.TestSupport;
-import com.google.devtools.build.lib.rules.objc.XcodeProvider;
-import com.google.devtools.build.lib.rules.test.ExecutionInfoProvider;
-
-/**
- * Implementation for ios_test rule in Bazel.
- */
-public final class BazelIosTest extends IosTest {
-  @Override
-  public ConfiguredTarget create(RuleContext ruleContext, ObjcCommon common,
-      XcodeProvider xcodeProvider, NestedSet<Artifact> filesToBuild) throws InterruptedException {
-
-    Runfiles.Builder runfilesBuilder = new Runfiles.Builder(ruleContext.getWorkspaceName())
-        .addRunfiles(ruleContext, RunfilesProvider.DEFAULT_RUNFILES);
-    NestedSetBuilder<Artifact> filesToBuildBuilder = NestedSetBuilder.<Artifact>stableOrder()
-        .addTransitive(filesToBuild);
-
-    TestSupport testSupport =
-        new TestSupport(ruleContext)
-            .registerTestRunnerActions()
-            .addRunfiles(runfilesBuilder)
-            .addFilesToBuild(filesToBuildBuilder);
-
-    Artifact executable = testSupport.generatedTestScript();
-
-    Runfiles runfiles = runfilesBuilder.build();
-    RunfilesSupport runfilesSupport =
-        RunfilesSupport.withExecutable(ruleContext, runfiles, executable);
-
-    return new RuleConfiguredTargetBuilder(ruleContext)
-        .setFilesToBuild(filesToBuildBuilder.build())
-        .add(XcodeProvider.class, xcodeProvider)
-        .add(RunfilesProvider.class, RunfilesProvider.simple(runfiles))
-        .add(
-            ExecutionInfoProvider.class,
-            new ExecutionInfoProvider(ImmutableMap.of(ExecutionRequirements.REQUIRES_DARWIN, "")))
-        .addProviders(testSupport.getExtraProviders())
-        .setRunfilesSupport(runfilesSupport, executable)
-        .build();
-  }
-}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTestRule.java
index 8443a45c53..bb4a6ad3e0 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTestRule.java
@@ -32,6 +32,7 @@ import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.rules.java.J2ObjcConfiguration;
+import com.google.devtools.build.lib.rules.objc.ExperimentalIosTest;
 import com.google.devtools.build.lib.rules.objc.IosTest;
 import com.google.devtools.build.lib.rules.objc.ObjcConfiguration;
 import com.google.devtools.build.lib.rules.objc.ObjcRuleClasses;
@@ -109,7 +110,7 @@ public final class BazelIosTestRule implements RuleDefinition {
         .type(RuleClassType.TEST)
         .ancestors(BaseRuleClasses.BaseRule.class, BaseRuleClasses.TestBaseRule.class,
             ObjcRuleClasses.IosTestBaseRule.class, ObjcRuleClasses.SimulatorRule.class)
-        .factoryClass(BazelIosTest.class)
+        .factoryClass(ExperimentalIosTest.class)
         .build();
   }
 }