Merge branch 'Jalview-JS/jim/JAL-3253-JAL-3418' into Jalview-JS/JAL-3253-applet

[jalview.git] / test / jalview / ws / dbsources / XfamFetcherTest.java

diff --git a/test/jalview/ws/dbsources/XfamFetcherTest.java b/test/jalview/ws/dbsources/XfamFetcherTest.java
index e164267..51cff6e 100644 (file)
--- a/test/jalview/ws/dbsources/XfamFetcherTest.java
+++ b/test/jalview/ws/dbsources/XfamFetcherTest.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2016 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -21,13 +21,23 @@
 package jalview.ws.dbsources;
 
 import jalview.datamodel.AlignmentI;
+import jalview.gui.JvOptionPane;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class XfamFetcherTest
 {
-  @Test(groups = { "network" })
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  @Test(groups = { "External" })
   public void testRfamSeed() throws Exception
   {
     // RfamFull rff = new RfamFull();
@@ -39,12 +49,16 @@ public class XfamFetcherTest
     Assert.assertTrue(seedrf.getHeight() > 1,
             "Seed Alignment for " + rfs.getTestQuery()
                     + " didn't contain more than one sequence.");
+    Assert.assertTrue(seedrf.getProperties().size() > 0,
+            "Seed Alignment for " + rfs.getTestQuery()
+                    + " didn't have any properties.");
+
   }
 
-  @Test(groups = { "network" })
+  @Test(groups = { "External" })
   public void testPfamFullAndSeed() throws Exception
   {
-    PfamFull pff = new PfamFull();
+    Pfam pff = new PfamFull();
     PfamSeed pfseed = new PfamSeed();
 
     AlignmentI fullpf = pff.getSequenceRecords(pff.getTestQuery());
@@ -56,9 +70,16 @@ public class XfamFetcherTest
     AlignmentI seedpf = pfseed.getSequenceRecords(pff.getTestQuery());
     Assert.assertNotNull(seedpf, "Seed Alignment for " + pff.getTestQuery()
             + " didn't retrieve.");
+    Assert.assertTrue(seedpf.getProperties().size() > 0,
+            "Seed Alignment for " + pfseed.getTestQuery()
+                    + " didn't have any properties.");
 
     Assert.assertTrue(seedpf.getHeight() < fullpf.getHeight(),
             "Expected Full alignment to have more sequences than seed for "
                     + pff.getTestQuery());
+    Assert.assertTrue(fullpf.getProperties().size() > 0,
+            "Full Alignment for " + pff.getTestQuery()
+                    + " didn't have any properties.");
+
   }
 }