X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fseqfetcher%2FDbRefFetcherTest.java;h=f75223512736dac65ef6243a842e8df15b86a698;hb=c0a37536d35fb247404187b367228e71f85ce373;hp=0a565bda2ef3c92c62d67b0587ddd6bf9a88c5cd;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git

diff --git a/test/jalview/ws/seqfetcher/DbRefFetcherTest.java b/test/jalview/ws/seqfetcher/DbRefFetcherTest.java
index 0a565bd..f752235 100644
--- a/test/jalview/ws/seqfetcher/DbRefFetcherTest.java
+++ b/test/jalview/ws/seqfetcher/DbRefFetcherTest.java
@@ -21,6 +21,7 @@
 package jalview.ws.seqfetcher;
 
 import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertTrue;
 
@@ -31,6 +32,7 @@ import jalview.datamodel.DBRefSource;
 import jalview.datamodel.FeatureProperties;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
+import jalview.gui.JvOptionPane;
 import jalview.util.DBRefUtils;
 import jalview.ws.SequenceFetcher;
 import jalview.ws.dbsources.Pdb;
@@ -51,6 +53,13 @@ import org.testng.annotations.Test;
 public class DbRefFetcherTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   /**
    * @throws java.lang.Exception
    */
@@ -76,11 +85,11 @@ public class DbRefFetcherTest
   @Test(groups = { "Functional" })
   public void testStandardProtDbs()
   {
-    List<String> defdb = new ArrayList<String>();
+    List<String> defdb = new ArrayList<>();
     defdb.addAll(Arrays.asList(DBRefSource.PROTEINDBS));
     defdb.add(DBRefSource.PDB);
-    List<DbSourceProxy> srces = new ArrayList<DbSourceProxy>();
-    SequenceFetcher sfetcher = new SequenceFetcher();
+    List<DbSourceProxy> srces = new ArrayList<>();
+    SequenceFetcher sfetcher = SequenceFetcher.getInstance();
     boolean pdbFound = false;
 
     for (String ddb : defdb)
@@ -126,7 +135,7 @@ public class DbRefFetcherTest
   public void testEmblUniprotProductRecovery() throws Exception
   {
     String retrievalId = "V00488";
-    DbSourceProxy embl = new SequenceFetcher().getSourceProxy(
+    DbSourceProxy embl = SequenceFetcher.getInstance().getSourceProxy(
             DBRefSource.EMBL).get(0);
     assertNotNull("Couldn't find the EMBL retrieval client", embl);
     verifyProteinNucleotideXref(retrievalId, embl);
@@ -142,7 +151,8 @@ public class DbRefFetcherTest
   public void testEmblCDSUniprotProductRecovery() throws Exception
   {
     String retrievalId = "AAH29712";
-    DbSourceProxy embl = new SequenceFetcher().getSourceProxy(
+    DbSourceProxy embl = SequenceFetcher.getInstance()
+            .getSourceProxy(
             DBRefSource.EMBLCDS).get(0);
     assertNotNull("Couldn't find the EMBL retrieval client", embl);
     verifyProteinNucleotideXref(retrievalId, embl);
@@ -165,32 +175,32 @@ public class DbRefFetcherTest
     SequenceI seq = alsq.getSequenceAt(0);
     assertEquals("Wrong sequence name", embl.getDbSource() + "|"
             + retrievalId, seq.getName());
-    SequenceFeature[] sfs = seq.getSequenceFeatures();
-    assertNotNull("Sequence features missing", sfs);
+    List<SequenceFeature> sfs = seq.getSequenceFeatures();
+    assertFalse("Sequence features missing", sfs.isEmpty());
     assertTrue(
             "Feature not CDS",
             FeatureProperties.isCodingFeature(embl.getDbSource(),
-                    sfs[0].getType()));
-    assertEquals(embl.getDbSource(), sfs[0].getFeatureGroup());
-    DBRefEntry[] dr = DBRefUtils.selectRefs(seq.getDBRefs(),
+ sfs.get(0).getType()));
+    assertEquals(embl.getDbSource(), sfs.get(0).getFeatureGroup());
+    List<DBRefEntry> dr = DBRefUtils.selectRefs(seq.getDBRefs(),
             new String[] { DBRefSource.UNIPROT });
     assertNotNull(dr);
-    assertEquals("Expected a single Uniprot cross reference", 1, dr.length);
-    assertEquals("Expected cross reference map to be one amino acid", dr[0]
+    assertEquals("Expected a single Uniprot cross reference", 1, dr.size());
+    assertEquals("Expected cross reference map to be one amino acid", dr.get(0)
             .getMap().getMappedWidth(), 1);
-    assertEquals("Expected local reference map to be 3 nucleotides", dr[0]
+    assertEquals("Expected local reference map to be 3 nucleotides", dr.get(0)
             .getMap().getWidth(), 3);
     AlignmentI sprods = new CrossRef(alsq.getSequencesArray(), alsq)
-            .findXrefSequences(dr[0].getSource(), true);
+            .findXrefSequences(dr.get(0).getSource(), true);
     assertNotNull(
             "Couldn't recover cross reference sequence from dataset. Was it ever added ?",
             sprods);
     assertEquals("Didn't xref right number of records", 1,
             sprods.getHeight());
     SequenceI proteinSeq = sprods.getSequenceAt(0);
-    assertEquals(proteinSeq.getSequenceAsString(), dr[0].getMap().getTo()
+    assertEquals(proteinSeq.getSequenceAsString(), dr.get(0).getMap().getTo()
             .getSequenceAsString());
-    assertEquals(dr[0].getSource() + "|" + dr[0].getAccessionId(),
+    assertEquals(dr.get(0).getSource() + "|" + dr.get(0).getAccessionId(),
             proteinSeq.getName());
   }
 }