commit 60ad8f4e5f91cf9b17430931bdaf179210df8fb9
author waltl <waltl@google.com> Thu Oct 21 08:28:07 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 21 08:29:52 2021 -0700
tree f02391fd16a22acd1fc692d2436e6a4b6ba02f41
parent 21b4b1a489c991682b9fcc9a10b468b9ea18e931

Fix archive testing

Previously this wasn't doing anything.

PiperOrigin-RevId: 404800294

src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java

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 14c2478..0f99f8c 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
@@ -356,7 +356,7 @@
 
     for (String inputArchive : inputArchives) {
       // Verify each input archive is present in the action inputs.
-      getFirstArtifactEndingWith(binAction.getInputs(), inputArchive);
+      assertThat(getFirstArtifactEndingWith(binAction.getInputs(), inputArchive)).isNotNull();
     }
     ImmutableList.Builder<String> frameworkPathFragmentParents = ImmutableList.builder();
     ImmutableList.Builder<String> frameworkPathBaseNames = ImmutableList.builder();
@@ -638,7 +638,7 @@
         binArtifact,
         objList,
         "x86_64",
-        ImmutableList.of("x/libx.a", "libobjc_lib.a"),
+        ImmutableList.of("libobjc_lib.a"),
         ImmutableList.of(PathFragment.create("libs/buzzbuzz")),
         extraLinkArgs);
   }
@@ -1069,12 +1069,19 @@
         getFirstArtifactEndingWith(getGeneratingAction(x8664BinArtifact).getInputs(),
             x8664Filelist);
 
-    ImmutableList<String> archiveNames =
-        ImmutableList.of("x/libx.a", "lib1/liblib1.a", "lib2/liblib2.a");
-    verifyLinkAction(i386BinArtifact, i386FilelistArtifact, "i386", archiveNames,
-        ImmutableList.of(PathFragment.create("fx/MyFramework")), extraLinkArgs);
-    verifyLinkAction(x8664BinArtifact, x8664FilelistArtifact,
-        "x86_64", archiveNames,  ImmutableList.of(PathFragment.create("fx/MyFramework")),
+    verifyLinkAction(
+        i386BinArtifact,
+        i386FilelistArtifact,
+        "i386",
+        ImmutableList.of(),
+        ImmutableList.of(PathFragment.create("fx/MyFramework")),
+        extraLinkArgs);
+    verifyLinkAction(
+        x8664BinArtifact,
+        x8664FilelistArtifact,
+        "x86_64",
+        ImmutableList.of(),
+        ImmutableList.of(PathFragment.create("fx/MyFramework")),
         extraLinkArgs);
   }