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 testNG like assertAlignmentDatasetRefs static wrappers and allow a message...
[jalview.git]
/
test
/
jalview
/
io
/
CrossRef2xmlTests.java
diff --git
a/test/jalview/io/CrossRef2xmlTests.java
b/test/jalview/io/CrossRef2xmlTests.java
index
154abc0
..
d1821f1
100644
(file)
--- a/
test/jalview/io/CrossRef2xmlTests.java
+++ b/
test/jalview/io/CrossRef2xmlTests.java
@@
-99,8
+99,9
@@
public class CrossRef2xmlTests extends Jalview2xmlBase
assertTrue("Didn't retrieve " + first, af != null);
// verify references for retrieved data
assertTrue("Didn't retrieve " + first, af != null);
// verify references for retrieved data
- AlignmentTest.verifyAlignmentDatasetRefs(af.getViewport()
- .getAlignment(), true);
+ AlignmentTest.assertAlignmentDatasetRefs(af.getViewport()
+ .getAlignment(), "Pass (" + pass1 + "," + pass2 + ","
+ + pass3 + "): Fetch " + first + ":");
// store project to recover on next pass
stringify(dbtoviewBit, savedProjects, first, af.alignPanel);
// store project to recover on next pass
stringify(dbtoviewBit, savedProjects, first, af.alignPanel);
@@
-113,8
+114,9
@@
public class CrossRef2xmlTests extends Jalview2xmlBase
.get(first).toString(), FormatAdapter.FILE);
// verify references for recovered data
.get(first).toString(), FormatAdapter.FILE);
// verify references for recovered data
- AlignmentTest.verifyAlignmentDatasetRefs(af.getViewport()
- .getAlignment(), true);
+ AlignmentTest.assertAlignmentDatasetRefs(af.getViewport()
+ .getAlignment(), "Pass (" + pass1 + "," + pass2 + ","
+ + pass3 + "): Recover " + first + ":");
}
}
@@
-186,12
+188,14
@@
public class CrossRef2xmlTests extends Jalview2xmlBase
}
for (AlignmentViewPanel avp : cra_views)
{
}
for (AlignmentViewPanel avp : cra_views)
{
+ nextxref = first + " -> " + db + "{" + p++ + "}";
+
// verify references for this panel
// verify references for this panel
- AlignmentTest.verifyAlignmentDatasetRefs(avp.getAlignment(),
- true);
+ AlignmentTest.assertAlignmentDatasetRefs(avp.getAlignment(),
+ "" + "Pass (" + pass1 + "," + pass2 + "): For "
+ + nextxref + ":");
SequenceI[] xrseqs = avp.getAlignment().getSequencesArray();
SequenceI[] xrseqs = avp.getAlignment().getSequencesArray();
- nextxref = first + " -> " + db + "{" + p++ + "}";
viewsourcedb.put(avp, nextxref);
stringify(dbtoviewBit, savedProjects, nextxref, avp);
viewsourcedb.put(avp, nextxref);
stringify(dbtoviewBit, savedProjects, nextxref, avp);
@@
-263,8
+267,10
@@
public class CrossRef2xmlTests extends Jalview2xmlBase
+ xrefdb + "{" + q++ + "}";
// verify references for this panel
+ xrefdb + "{" + q++ + "}";
// verify references for this panel
- AlignmentTest.verifyAlignmentDatasetRefs(
- nextavp.getAlignment(), true);
+ AlignmentTest.assertAlignmentDatasetRefs(
+ nextavp.getAlignment(), "" + "Pass (" + pass1
+ + "," + pass2 + "): For "
+ + nextnextxref + ":");
viewsourcedb.put(nextavp, nextnextxref);
stringify(dbtoviewBit, savedProjects, nextnextxref,
viewsourcedb.put(nextavp, nextnextxref);
stringify(dbtoviewBit, savedProjects, nextnextxref,