Make all WithLegacySkylarkName providers declared providers.

RELNOTES: None.
PiperOrigin-RevId: 163343931

1 files changed, 15 insertions, 12 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 5b7155528c..9e2d0c07d0 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
@@ -51,6 +51,7 @@ import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.rules.cpp.CppModuleMapAction;
 import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode;
+import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.common.options.OptionsParsingException;
 import java.util.Collections;
@@ -331,9 +332,9 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
             .setAndCreateFiles("hdrs", "d.h", "e.m")
             .setList("deps", "//objc:lib")
             .write();
-    assertThat(Artifact.toRootRelativePaths(target.getProvider(ObjcProvider.class).get(HEADER)))
+    assertThat(getArifactPaths(target, HEADER))
         .containsExactly("objc/a.h", "objc/b.h", "objc/f.m");
-    assertThat(Artifact.toRootRelativePaths(depender.getProvider(ObjcProvider.class).get(HEADER)))
+    assertThat(getArifactPaths(depender, HEADER))
         .containsExactly("objc/a.h", "objc/b.h", "objc/f.m", "objc2/d.h", "objc2/e.m");
   }
 
@@ -356,11 +357,9 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
             .setList("non_propagated_deps", "//objc2:lib")
             .write();
 
-    assertThat(Artifact.toRootRelativePaths(target.getProvider(ObjcProvider.class).get(HEADER)))
+    assertThat(getArifactPaths(target, HEADER))
         .containsExactly("objc/a.h", "objc/b.h");
-    assertThat(
-            Artifact.toRootRelativePaths(
-                transitiveDepender.getProvider(ObjcProvider.class).get(HEADER)))
+    assertThat(getArifactPaths(transitiveDepender, HEADER))
         .containsExactly("objc2/c.h", "objc2/d.h", "objc3/e.h", "objc3/f.h");
   }
 
@@ -1026,16 +1025,20 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
             .setAndCreateFiles("hdrs", "c.h", "d.h")
             .setList("deps", "//objc:lib")
             .write();
-    assertThat(Artifact.toRootRelativePaths(target.getProvider(ObjcProvider.class).get(LIBRARY)))
-        .containsExactly("objc/liblib.a");
-    assertThat(Artifact.toRootRelativePaths(depender.getProvider(ObjcProvider.class).get(LIBRARY)))
-        .containsExactly("objc/liblib.a", "objc2/liblib.a");
-    assertThat(Artifact.toRootRelativePaths(target.getProvider(ObjcProvider.class).get(HEADER)))
+    assertThat(getArifactPaths(target, LIBRARY)).containsExactly("objc/liblib.a");
+    assertThat(getArifactPaths(depender, LIBRARY)).containsExactly(
+        "objc/liblib.a", "objc2/liblib.a");
+    assertThat(getArifactPaths(target, HEADER))
         .containsExactly("objc/a.h", "objc/b.h");
-    assertThat(Artifact.toRootRelativePaths(depender.getProvider(ObjcProvider.class).get(HEADER)))
+    assertThat(getArifactPaths(depender, HEADER))
         .containsExactly("objc/a.h", "objc/b.h", "objc2/c.h", "objc2/d.h");
   }
 
+  private Iterable<String> getArifactPaths(ConfiguredTarget target, Key<Artifact> artifactKey) {
+    return Artifact.toRootRelativePaths(
+        target.get(ObjcProvider.SKYLARK_CONSTRUCTOR).get(artifactKey));
+  }
+
   @Test
   public void testWeakSdkFrameworks_objcProvider() throws Exception {
     createLibraryTargetWriter("//base_lib:lib")