Remove old implementation for object file path

RELNOTES:
--experimental_shortened_obj_file_path is removed.
PiperOrigin-RevId: 203944948

1 files changed, 1 insertions, 28 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
index ae879d288c..f0eb7ec5cc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
@@ -122,8 +122,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testCompilesSourcesWithSameBaseNameWithNewObjPath() throws Exception {
-    useConfiguration("--experimental_shortened_obj_file_path=true");
+  public void testCompilesSourcesWithSameBaseName() throws Exception {
     createLibraryTargetWriter("//foo:lib")
         .setAndCreateFiles("srcs", "a.m", "pkg1/a.m", "b.m")
         .setAndCreateFiles("non_arc_srcs", "pkg2/a.m")
@@ -148,32 +147,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testCompilesSourcesWithSameBaseNameWithLegacyObjPath() throws Exception {
-    useConfiguration("--experimental_shortened_obj_file_path=false");
-    createLibraryTargetWriter("//foo:lib")
-        .setAndCreateFiles("srcs", "a.m", "pkg1/a.m", "b.m")
-        .setAndCreateFiles("non_arc_srcs", "pkg2/a.m")
-        .write();
-
-    getConfiguredTarget("//foo:lib");
-
-    Artifact a0 = getBinArtifact("_objs/lib/foo/a.o", getConfiguredTarget("//foo:lib"));
-    Artifact a1 = getBinArtifact("_objs/lib/foo/pkg1/a.o", getConfiguredTarget("//foo:lib"));
-    Artifact a2 = getBinArtifact("_objs/lib/foo/pkg2/a.o", getConfiguredTarget("//foo:lib"));
-    Artifact b = getBinArtifact("_objs/lib/foo/b.o", getConfiguredTarget("//foo:lib"));
-
-    assertThat(getGeneratingAction(a0)).isNotNull();
-    assertThat(getGeneratingAction(a1)).isNotNull();
-    assertThat(getGeneratingAction(a2)).isNotNull();
-    assertThat(getGeneratingAction(b)).isNotNull();
-
-    assertThat(getGeneratingAction(a0).getInputs()).contains(getSourceArtifact("foo/a.m"));
-    assertThat(getGeneratingAction(a1).getInputs()).contains(getSourceArtifact("foo/pkg1/a.m"));
-    assertThat(getGeneratingAction(a2).getInputs()).contains(getSourceArtifact("foo/pkg2/a.m"));
-    assertThat(getGeneratingAction(b).getInputs()).contains(getSourceArtifact("foo/b.m"));
-  }
-
-  @Test
   public void testObjcPlusPlusCompile() throws Exception {
     useConfiguration(
         "--cpu=ios_i386",