From 3b57477705769b031dd538083097ef908766f648 Mon Sep 17 00:00:00 2001
From: Mai Essa <messa@google.com>
Date: Thu, 29 Feb 2024 16:30:15 -0500
Subject: [PATCH] Fix unit test failure with bazel@head

---
 .../base/qsync/DependencyTrackerImplTest.java      |  8 ++++----
 .../idea/blaze/qsync/QuerySyncTestUtils.java       | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/base/tests/unittests/com/google/idea/blaze/base/qsync/DependencyTrackerImplTest.java b/base/tests/unittests/com/google/idea/blaze/base/qsync/DependencyTrackerImplTest.java
index e1a15e6e899..9a2bd335b72 100644
--- a/base/tests/unittests/com/google/idea/blaze/base/qsync/DependencyTrackerImplTest.java
+++ b/base/tests/unittests/com/google/idea/blaze/base/qsync/DependencyTrackerImplTest.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.idea.blaze.qsync.QuerySyncTestUtils.REPOSITORY_MAPPED_LABEL_CORRESPONDENCE;
+import static com.google.idea.blaze.qsync.QuerySyncTestUtils.LabelIgnoringCanonicalFormat;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableSet;
@@ -81,10 +82,9 @@ public void getPendingExternalDeps_followJavaDeps_allBuilt() throws Exception {
     blazeProject.setCurrent(context, snapshot);
     DependencyTrackerImpl dt =
         new DependencyTrackerImpl(blazeProject, dependencyBuilder, artifactTracker);
-    // This version of rules_jvm_external here has to exactly match the version in MODULE.bazel
-    // Otherwise, this test will fail
-    String guava = "@@rules_jvm_external~6.0~maven~com_google_guava_guava//jar:jar";
-    when(artifactTracker.getLiveCachedTargets()).thenReturn(ImmutableSet.of(Label.of(guava)));
+    LabelIgnoringCanonicalFormat guava = new LabelIgnoringCanonicalFormat("@com_google_guava_guava//jar:jar");
+    when(artifactTracker.getLiveCachedTargets()).thenReturn(ImmutableSet.of(guava));
+
     assertThat(
             dt.getPendingExternalDeps(
                 ImmutableSet.copyOf(TestData.JAVA_LIBRARY_EXTERNAL_DEP_QUERY.getAssumedLabels())))
diff --git a/querysync/javatests/com/google/idea/blaze/qsync/QuerySyncTestUtils.java b/querysync/javatests/com/google/idea/blaze/qsync/QuerySyncTestUtils.java
index ff032bbb91a..8bbbf3f541c 100644
--- a/querysync/javatests/com/google/idea/blaze/qsync/QuerySyncTestUtils.java
+++ b/querysync/javatests/com/google/idea/blaze/qsync/QuerySyncTestUtils.java
@@ -91,6 +91,20 @@ public static PathPackage of(String path, String pkg) {
     }
   }
 
+  public static class LabelIgnoringCanonicalFormat extends Label {
+    public LabelIgnoringCanonicalFormat(String label) {
+      super(label);
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (!(that instanceof Label)) {
+        return false;
+      }
+      return cleanLabel(this.toString()).equals(cleanLabel(that.toString()));
+    }
+  }
+
   /**
    * Creates a dummy source jar at the specified destination with a package structure defined by
    * {@code pathPackages}