JAL-2110 unit tests for and minor refactoring of CrossRef

[jalview.git] / test / jalview / ws / SequenceFetcherTest.java

diff --git a/test/jalview/ws/SequenceFetcherTest.java b/test/jalview/ws/SequenceFetcherTest.java
index a54ce8b..76ca69b 100644 (file)
--- a/test/jalview/ws/SequenceFetcherTest.java
+++ b/test/jalview/ws/SequenceFetcherTest.java
@@ -1,5 +1,6 @@
 package jalview.ws;
 
+import jalview.analysis.CrossRef;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.DBRefSource;
@@ -105,18 +106,18 @@ public class SequenceFetcherTest
           {
             boolean dna = sp.isDnaCoding();
             // try and find products
-            String types[] = jalview.analysis.CrossRef
-                    .findSequenceXrefTypes(dna, al.getSequencesArray());
+            List<String> types = CrossRef.findXrefSourcesForSequences(dna,
+                    al.getSequencesArray(), null);
             if (types != null)
             {
               System.out.println("Xref Types for: "
                       + (dna ? "dna" : "prot"));
-              for (int t = 0; t < types.length; t++)
+              for (String source : types)
               {
-                System.out.println("Type: " + types[t]);
+                System.out.println("Type: " + source);
                 SequenceI[] prod = jalview.analysis.CrossRef
                         .findXrefSequences(al.getSequencesArray(), dna,
-                                types[t], null)
+                                source, null)
                         .getSequencesArray();
                 System.out.println("Found "
                         + ((prod == null) ? "no" : "" + prod.length)