git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
fc59e1f
..
838aa7a
100644
(file)
--- a/
test/jalview/io/CrossRef2xmlTests.java
+++ b/
test/jalview/io/CrossRef2xmlTests.java
@@
-52,6
+52,8
@@
public class CrossRef2xmlTests extends Jalview2xmlBase
@Test(groups = { "Operational" }, enabled = true)
public void testRetrieveAndShowCrossref() throws Exception
{
@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>();
List<String> failedXrefMenuItems = new ArrayList<String>();
List<String> failedProjectRecoveries = new ArrayList<String>();
@@
-97,11
+99,15
@@
public class CrossRef2xmlTests extends Jalview2xmlBase
{
// retrieve dbref
{
// 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);
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()
// verify references for retrieved data
AlignmentTest.assertAlignmentDatasetRefs(af.getViewport()
@@
-399,6
+405,15
@@
public class CrossRef2xmlTests extends Jalview2xmlBase
Assert.fail("Didn't recover projects for some retrievals (did they retrieve ?) ("
+ failedProjectRecoveries.size() + " counts)");
}
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)");
+ }
}
private void assertProtein(AlignmentViewPanel alignmentViewPanel,
}
private void assertProtein(AlignmentViewPanel alignmentViewPanel,