JAL-2154 report any db fetch failures as a fail at end

[jalview.git] / test / jalview / io / CrossRef2xmlTests.java

diff --git a/test/jalview/io/CrossRef2xmlTests.java b/test/jalview/io/CrossRef2xmlTests.java
index 65c0d2b..838aa7a 100644 (file)
--- a/test/jalview/io/CrossRef2xmlTests.java
+++ b/test/jalview/io/CrossRef2xmlTests.java
@@ -52,7 +52,11 @@ public class CrossRef2xmlTests extends Jalview2xmlBase
   @Test(groups = { "Operational" }, enabled = true)
   public void testRetrieveAndShowCrossref() throws Exception
   {
+
+    List<String> failedDBRetr = new ArrayList<String>();
     List<String> failedXrefMenuItems = new ArrayList<String>();
+    List<String> failedProjectRecoveries = new ArrayList<String>();
+
     // for every set of db queries
     // retrieve db query
     // verify presence of expected xrefs
@@ -95,11 +99,15 @@ public class CrossRef2xmlTests extends Jalview2xmlBase
         {
           // retrieve dbref
 
+          List<AlignFrame> afs = jalview.gui.SequenceFetcher.fetchAndShow(
+                  did[0], did[1]);
+          if (afs.size() == 0)
+          {
+            failedDBRetr.add("Didn't retrieve " + first);
+            break;
+          }
           keyseq.add(first);
-
-          af = jalview.gui.SequenceFetcher.fetchAndShow(did[0], did[1])
-                  .get(0);
-          Assert.assertTrue(af != null, "Didn't retrieve " + first);
+          af = afs.get(0);
 
           // verify references for retrieved data
           AlignmentTest.assertAlignmentDatasetRefs(af.getViewport()
@@ -175,6 +183,15 @@ public class CrossRef2xmlTests extends Jalview2xmlBase
               Desktop.instance.closeAll_actionPerformed(null);
               pass3 = 0;
               // recover stored project
+              File storedProject = savedProjects.get(nextxref);
+              if (storedProject == null)
+              {
+                failedProjectRecoveries.add("Failed to store a view for '"
+                        + nextxref + "'");
+                continue;
+              }
+
+              // recover stored project
               AlignFrame af2 = new FileLoader(false)
                       .LoadFileWaitTillLoaded(savedProjects.get(nextxref)
                               .toString(), FormatAdapter.FILE);
@@ -273,6 +290,14 @@ public class CrossRef2xmlTests extends Jalview2xmlBase
                   {
                     Desktop.instance.closeAll_actionPerformed(null);
                     // recover stored project
+                    File storedProject = savedProjects.get(nextnextxref);
+                    if (storedProject == null)
+                    {
+                      failedProjectRecoveries
+                              .add("Failed to store a view for '"
+                                      + nextnextxref + "'");
+                      continue;
+                    }
                     AlignFrame af2 = new FileLoader(false)
                             .LoadFileWaitTillLoaded(
                                     savedProjects.get(nextnextxref)
@@ -350,22 +375,44 @@ public class CrossRef2xmlTests extends Jalview2xmlBase
         }
         else
         {
-          // verify stored projects for second set of cross references
-          pass2 = 1;
+          pass1++;
+          if (pass1 < 2)
+          {
+            // verify stored projects for second set of cross references
+            pass2 = 1;
           // and verify cross-references retrievable from those stored projects.
-          pass3 = 0;
+            pass3 = 0;
+          }
         }
       } while (pass3 < 2);
     }
     if (failedXrefMenuItems.size() > 0)
     {
-      StringBuilder sb = new StringBuilder();
       for (String s : failedXrefMenuItems)
       {
-        sb.append(s + "\n");
+        System.err.println(s);
       }
       Assert.fail("Faulty xref menu (" + failedXrefMenuItems.size()
-              + " counts)\n" + sb.toString());
+              + " counts)");
+    }
+    if (failedProjectRecoveries.size() > 0)
+    {
+
+      for (String s : failedProjectRecoveries)
+      {
+        System.err.println(s);
+      }
+      Assert.fail("Didn't recover projects for some retrievals (did they retrieve ?) ("
+              + failedProjectRecoveries.size() + " counts)");
+    }
+    if (failedDBRetr.size() > 0)
+    {
+      for (String s : failedProjectRecoveries)
+      {
+        System.err.println(s);
+      }
+      Assert.fail("Didn't retrieve some db refs for checking cross-refs ("
+              + failedDBRetr.size() + " counts)");
     }
   }