X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FCrossRef2xmlTests.java;h=9e24262c89a38b53a5467e253b0ec4c85106913c;hb=54dcb58375e9783c7bd4b793acd0b0aa485556ba;hp=838aa7a09a12ff0e25f08063ab089758d55b4769;hpb=ec58d7c6a3ceadb413a2e11247adef2eaee3382b;p=jalview.git diff --git a/test/jalview/io/CrossRef2xmlTests.java b/test/jalview/io/CrossRef2xmlTests.java index 838aa7a..9e24262 100644 --- a/test/jalview/io/CrossRef2xmlTests.java +++ b/test/jalview/io/CrossRef2xmlTests.java @@ -30,6 +30,7 @@ import jalview.gui.AlignFrame; import jalview.gui.CrossRefAction; import jalview.gui.Desktop; import jalview.gui.Jalview2XML; +import jalview.gui.JvOptionPane; import java.io.File; import java.io.IOException; @@ -38,14 +39,25 @@ import java.util.HashMap; import java.util.List; import org.testng.Assert; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Test(singleThreaded = true) public class CrossRef2xmlTests extends Jalview2xmlBase { + @Override + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + /** - * test store and recovery of expanded views + * test store and recovery of all reachable cross refs from all reachable + * crossrefs for one or more fetched db refs. Currently, this test has a known + * failure case. * * @throws Exception */ @@ -53,10 +65,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase public void testRetrieveAndShowCrossref() throws Exception { - List failedDBRetr = new ArrayList(); - List failedXrefMenuItems = new ArrayList(); - List failedProjectRecoveries = new ArrayList(); - + List failedDBRetr = new ArrayList<>(); + List failedXrefMenuItems = new ArrayList<>(); + List failedProjectRecoveries = new ArrayList<>(); // for every set of db queries // retrieve db query // verify presence of expected xrefs @@ -73,11 +84,12 @@ public class CrossRef2xmlTests extends Jalview2xmlBase // . codonframes // // - HashMap dbtoviewBit = new HashMap(); - List keyseq = new ArrayList(); - HashMap savedProjects = new HashMap(); + HashMap dbtoviewBit = new HashMap<>(); + List keyseq = new ArrayList<>(); + HashMap savedProjects = new HashMap<>(); - for (String[] did : new String[][] { { "UNIPROT", "P01731" } }) + for (String[] did : new String[][] { { "ENSEMBL", "ENSG00000157764" }, + { "UNIPROT", "P01731" } }) { // pass counters - 0 - first pass, 1 means retrieve project rather than // perform action @@ -113,6 +125,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase AlignmentTest.assertAlignmentDatasetRefs(af.getViewport() .getAlignment(), "Pass (" + pass1 + "," + pass2 + "," + pass3 + "): Fetch " + first + ":"); + assertDatasetIsNormalisedKnownDefect(af.getViewport() + .getAlignment(), "Pass (" + pass1 + "," + pass2 + "," + + pass3 + "): Fetch " + first + ":"); dna = af.getViewport().getAlignment().isNucleotide(); retral = af.getViewport().getAlignment(); dataset = retral.getDataset(); @@ -124,7 +139,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase Desktop.instance.closeAll_actionPerformed(null); // recover stored project af = new FileLoader(false).LoadFileWaitTillLoaded(savedProjects - .get(first).toString(), FormatAdapter.FILE); + .get(first).toString(), DataSourceType.FILE); System.out.println("Recovered view for '" + first + "' from '" + savedProjects.get(first).toString() + "'"); dna = af.getViewport().getAlignment().isNucleotide(); @@ -136,6 +151,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase AlignmentTest.assertAlignmentDatasetRefs(af.getViewport() .getAlignment(), "Pass (" + pass1 + "," + pass2 + "," + pass3 + "): Recover " + first + ":"); + assertDatasetIsNormalisedKnownDefect(af.getViewport() + .getAlignment(), "Pass (" + pass1 + "," + pass2 + "," + + pass3 + "): Recover " + first + ":"); } @@ -157,9 +175,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase // build next key so we an retrieve all views String nextxref = first + " -> " + db + "{" + firstcr_ap + "}"; // perform crossref action, or retrieve stored project - List cra_views = new ArrayList(); + List cra_views = new ArrayList<>(); CrossRefAction cra = null; - + if (pass2 == 0) { // retrieve and show cross-refs in this thread cra = new CrossRefAction(af, seqs, dna, db); @@ -194,7 +212,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase // recover stored project AlignFrame af2 = new FileLoader(false) .LoadFileWaitTillLoaded(savedProjects.get(nextxref) - .toString(), FormatAdapter.FILE); + .toString(), DataSourceType.FILE); System.out.println("Recovered view for '" + nextxref + "' from '" + savedProjects.get(nextxref).toString() + "'"); @@ -218,7 +236,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase } } - HashMap> xrptypes = new HashMap>(); + HashMap> xrptypes = new HashMap<>(); // first save/verify views. for (AlignmentViewPanel avp : cra_views) { @@ -228,6 +246,10 @@ public class CrossRef2xmlTests extends Jalview2xmlBase "Pass (" + pass1 + "," + pass2 + "," + pass3 + "): before start of pass3: " + nextxref + ":"); + assertDatasetIsNormalisedKnownDefect(avp.getAlignment(), + "Pass (" + pass1 + "," + pass2 + "," + pass3 + + "): before start of pass3: " + nextxref + + ":"); SequenceI[] xrseqs = avp.getAlignment().getSequencesArray(); @@ -235,7 +257,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase : new CrossRef(xrseqs, dataset) .findXrefSourcesForSequences(avp .getAlignViewport().isNucleotide()); - + stringify(dbtoviewBit, savedProjects, nextxref, avp); xrptypes.put(nextxref, _xrptypes); @@ -251,10 +273,10 @@ public class CrossRef2xmlTests extends Jalview2xmlBase nextxref = first + " -> " + db + "{" + firstcr_ap++ + "}"; for (String xrefdb : xrptypes.get(nextxref)) { - List cra_views2 = new ArrayList(); + List cra_views2 = new ArrayList<>(); int q = 0; - String nextnextxref = nextxref - + " -> " + xrefdb + "{" + q + "}"; + String nextnextxref = nextxref + " -> " + xrefdb + "{" + + q + "}"; if (pass3 == 0) { @@ -271,8 +293,8 @@ public class CrossRef2xmlTests extends Jalview2xmlBase { failedXrefMenuItems .add("No crossrefs retrieved for '" - + nextxref + "' to " + xrefdb + " via '" - + nextaf.getTitle() + "'"); + + nextxref + "' to " + xrefdb + + " via '" + nextaf.getTitle() + "'"); continue; } cra_views2 = cra.getXrefViews(); @@ -301,7 +323,8 @@ public class CrossRef2xmlTests extends Jalview2xmlBase AlignFrame af2 = new FileLoader(false) .LoadFileWaitTillLoaded( savedProjects.get(nextnextxref) - .toString(), FormatAdapter.FILE); + .toString(), + DataSourceType.FILE); System.out.println("Recovered view for '" + nextnextxref + "' from '" + savedProjects.get(nextnextxref).toString() @@ -332,14 +355,18 @@ public class CrossRef2xmlTests extends Jalview2xmlBase for (AlignmentViewPanel nextavp : cra_views2) { - nextnextxref = nextxref - + " -> " + xrefdb + "{" + q++ + "}"; + nextnextxref = nextxref + " -> " + xrefdb + "{" + q++ + + "}"; // verify references for this panel AlignmentTest.assertAlignmentDatasetRefs( nextavp.getAlignment(), "" + "Pass (" + pass1 + "," + pass2 + "): For " + nextnextxref + ":"); + assertDatasetIsNormalisedKnownDefect( + nextavp.getAlignment(), "" + "Pass (" + pass1 + + "," + pass2 + "): For " + + nextnextxref + ":"); stringify(dbtoviewBit, savedProjects, nextnextxref, nextavp); @@ -376,15 +403,8 @@ public class CrossRef2xmlTests extends Jalview2xmlBase else { 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; - } } - } while (pass3 < 2); + } while (pass1 < 3); } if (failedXrefMenuItems.size() > 0) { @@ -416,6 +436,34 @@ public class CrossRef2xmlTests extends Jalview2xmlBase } } + /** + * wrapper to trap known defect for AH002001 testcase + * + * @param alignment + * @param string + */ + private void assertDatasetIsNormalisedKnownDefect(AlignmentI al, + String message) + { + try + { + AlignmentTest.assertDatasetIsNormalised(al, message); + } catch (AssertionError ae) + { + if (!ae.getMessage().endsWith("EMBL|AH002001")) + { + throw ae; + } + else + { + System.out + .println("Ignored exception for known defect: JAL-2179 : " + + message); + } + + } + } + private void assertProtein(AlignmentViewPanel alignmentViewPanel, String message) { @@ -431,10 +479,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase private void assertType(boolean expectProtein, AlignmentViewPanel alignmentViewPanel, String message) { - List nonType = new ArrayList(); + List nonType = new ArrayList<>(); for (SequenceI sq : alignmentViewPanel.getAlignViewport() - .getAlignment() - .getSequences()) + .getAlignment().getSequences()) { if (sq.isProtein() != expectProtein) { @@ -445,8 +492,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase { Assert.fail(message + " [ " + (expectProtein ? "nucleotides were " : "proteins were ") - + nonType.toString() - + " ]"); + + nonType.toString() + " ]"); } }