Move some actions to language-specific packages, where they belong.

--
MOS_MIGRATED_REVID=140024976

5 files changed, 8 insertions, 37 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 8fcb520f63..9db93c01ac 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -934,6 +934,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:bazel-rules",
         "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:flags",
+        "//src/main/java/com/google/devtools/build/lib:io",
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/build/lib:vfs",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
index 0bdf79f606..0410e5ce50 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
@@ -13,17 +13,13 @@
 // limitations under the License.
 package com.google.devtools.build.lib.analysis.actions;
 
-import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_ACTION_OWNER;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
-import com.google.devtools.build.lib.actions.ActionExecutionException;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Executor;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
@@ -83,26 +79,4 @@ public class SymlinkActionTest extends BuildViewTestCase {
     assertEquals(inputArtifact, action.getPrimaryInput());
     assertEquals(outputArtifact, action.getPrimaryOutput());
   }
-
-  @Test
-  public void testExecutableSymlink() throws Exception {
-    Executor executor = new TestExecutorBuilder(directories, null).build();
-    outputArtifact = getBinArtifactWithNoOwner("destination2.txt");
-    output = outputArtifact.getPath();
-    action = new ExecutableSymlinkAction(NULL_ACTION_OWNER, inputArtifact, outputArtifact);
-    assertFalse(input.isExecutable());
-    ActionExecutionContext actionExecutionContext =
-      new ActionExecutionContext(executor, null, null, null,
-          ImmutableMap.<String, String>of(), null);
-    try {
-      action.execute(actionExecutionContext);
-      fail("Expected ActionExecutionException");
-    } catch (ActionExecutionException e) {
-      assertThat(e.getMessage()).containsMatch("'input.txt' is not executable");
-    }
-    input.setExecutable(true);
-    action.execute(actionExecutionContext);
-    assertTrue(output.isSymbolicLink());
-    assertEquals(input, output.resolveSymbolicLinks());
-  }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index d8dd01575e..9cf952c200 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -69,11 +69,11 @@ 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.analysis.SourceManifestAction;
-import com.google.devtools.build.lib.analysis.SymlinkTreeAction;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.analysis.WorkspaceStatusAction;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
+import com.google.devtools.build.lib.analysis.actions.SymlinkTreeAction;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildInfoKey;
 import com.google.devtools.build.lib.analysis.config.BinTools;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/CreateIncSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
index 9f5b2540f1..f6ec5bca7e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/CreateIncSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.analysis.actions;
+package com.google.devtools.build.lib.rules.cpp;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_ACTION_OWNER;
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/LTOBackendActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LTOBackendActionTest.java
index 2dd014bbcb..21922f5dae 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/LTOBackendActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LTOBackendActionTest.java
@@ -11,7 +11,7 @@
 // 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.analysis.actions;
+package com.google.devtools.build.lib.rules.cpp;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -37,7 +37,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Tests {@link LTOBackendAction}. */
+/** Tests {@link com.google.devtools.build.lib.rules.cpp.LTOBackendAction}. */
 @RunWith(JUnit4.class)
 public class LTOBackendActionTest extends BuildViewTestCase {
   private Artifact bitcode1Artifact;
@@ -52,10 +52,6 @@ public class LTOBackendActionTest extends BuildViewTestCase {
   private Executor executor;
   private ActionExecutionContext context;
 
-  private LTOBackendAction.Builder builder() {
-    return new LTOBackendAction.Builder();
-  }
-
   @Before
   public final void createArtifacts() throws Exception {
     collectingAnalysisEnvironment =
@@ -84,7 +80,7 @@ public class LTOBackendActionTest extends BuildViewTestCase {
   @Test
   public void testEmptyImports() throws Exception {
     Action[] actions =
-        builder()
+        new LTOBackendAction.Builder()
             .addImportsInfo(allBitcodeFiles, imports1Artifact)
             .addInput(bitcode1Artifact)
             .addInput(index1Artifact)
@@ -111,7 +107,7 @@ public class LTOBackendActionTest extends BuildViewTestCase {
   @Test
   public void testNonEmptyImports() throws Exception {
     Action[] actions =
-        builder()
+        new LTOBackendAction.Builder()
             .addImportsInfo(allBitcodeFiles, imports2Artifact)
             .addInput(bitcode2Artifact)
             .addInput(index2Artifact)
@@ -148,7 +144,7 @@ public class LTOBackendActionTest extends BuildViewTestCase {
         new ActionCombinationFactory() {
           @Override
           public Action generate(int i) {
-            LTOBackendAction.Builder builder = builder();
+            LTOBackendAction.Builder builder = new LTOBackendAction.Builder();
             builder.addOutput(destinationArtifact);
 
             PathFragment executable =