From: James Procter <j.procter@dundee.ac.uk>
Date: Fri, 10 Feb 2023 17:05:30 +0000 (+0000)
Subject: JAL-3077 broken conflict resolve resulted in failing test (nb - still not resolved... 
X-Git-Tag: Release_2_11_3_0~23^2~2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=421c0cd3daea00db58f42af499c8415608fb0aaa;p=jalview.git

JAL-3077 broken conflict resolve resulted in failing test (nb - still not resolved the issue of (promoted) dbrefs!)
---

diff --git a/test/jalview/ws/dbsources/UniprotTest.java b/test/jalview/ws/dbsources/UniprotTest.java
index 7eb3b75..176cddc 100644
--- a/test/jalview/ws/dbsources/UniprotTest.java
+++ b/test/jalview/ws/dbsources/UniprotTest.java
@@ -224,9 +224,6 @@ public class UniprotTest
     res = DBRefUtils.searchRefsForSource(seq.getDBRefs(),
             DBRefSource.UNIPROT);
     assertEquals(2, res.size());
-    res = DBRefUtils.searchRefs(seq.getDBRefs(), "AAK85932");
-    assertEquals(1, res.size());
-    assertTrue("1".equals(res.get(0).getVersion()));
     /*
      * NB this test fragile - relies on ordering being preserved
      */