X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FRNAStructExportImport.java;h=206930cb902da2052ed2dab02b868cb8f1fb706e;hb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;hp=2753e64cae129de1b4058eb5545c740b600968bb;hpb=bc469bb898fd42c92d9b8b70660b4c94a93b3118;p=jalview.git
diff --git a/test/jalview/ws/jabaws/RNAStructExportImport.java b/test/jalview/ws/jabaws/RNAStructExportImport.java
index 2753e64..206930c 100644
--- a/test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/test/jalview/ws/jabaws/RNAStructExportImport.java
@@ -1,41 +1,63 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ws.jabaws;
-import static org.junit.Assert.*;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
-import java.awt.Component;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
-import jalview.api.AlignCalcManagerI;
+import jalview.bin.Cache;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
-import jalview.datamodel.Annotation;
import jalview.gui.Jalview2XML;
import jalview.io.AnnotationFile;
+import jalview.io.DataSourceType;
+import jalview.io.FileFormat;
import jalview.io.FormatAdapter;
import jalview.io.StockholmFileTest;
-import jalview.ws.jws2.AADisorderClient;
import jalview.ws.jws2.Jws2Discoverer;
import jalview.ws.jws2.RNAalifoldClient;
import jalview.ws.jws2.SequenceAnnotationWSClient;
-import jalview.ws.jws2.dm.JabaOption;
import jalview.ws.jws2.jabaws2.Jws2Instance;
import jalview.ws.params.AutoCalcSetting;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.awt.Component;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import compbio.metadata.WrongParameterException;
public class RNAStructExportImport
{
- public static String testseqs = "examples/unfolded_RF00031.aln";
+ private static final String JAR_FILE_NAME = "testRnalifold_param.jar";
+
+ public static String testseqs = "examples/RF00031_folded.stk";
public static Jws2Discoverer disc;
@@ -45,12 +67,12 @@ public class RNAStructExportImport
public static jalview.gui.AlignFrame af = null;
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
-
- jalview.bin.Cache.initLogger();
- disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
+ Cache.loadProperties("test/jalview/io/testProps.jvprops");
+ Cache.initLogger();
+ disc = JalviewJabawsTestUtils.getJabawsDiscoverer(false);
for (Jws2Instance svc : disc.getServices())
{
@@ -64,27 +86,84 @@ public class RNAStructExportImport
System.out.println("State of rnaalifoldws: " + rnaalifoldws);
if (rnaalifoldws == null)
- System.exit(0);
+ {
+ Assert.fail("no web service");
+ }
jalview.io.FileLoader fl = new jalview.io.FileLoader(false);
- af = fl.LoadFileWaitTillLoaded(testseqs, jalview.io.FormatAdapter.FILE);
+ af = fl.LoadFileWaitTillLoaded(testseqs, jalview.io.DataSourceType.FILE);
assertNotNull("Couldn't load test data ('" + testseqs + "')", af);
+ // remove any existing annotation
+ List aal = new ArrayList();
+ for (AlignmentAnnotation rna : af.getViewport().getAlignment()
+ .getAlignmentAnnotation())
+ {
+ if (rna.isRNA())
+ {
+ aal.add(rna);
+ }
+ }
+ for (AlignmentAnnotation rna : aal)
+ {
+ af.getViewport().getAlignment().deleteAnnotation(rna);
+ }
+ af.getViewport().alignmentChanged(af.alignPanel); // why is af.alignPanel
+ // public?
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
if (af != null)
{
af.setVisible(false);
af.dispose();
+ File f = new File(JAR_FILE_NAME);
+ if (f.exists())
+ {
+ f.delete();
+ }
+ }
+ }
+
+ @Test(groups = { "Functional" })
+ public void testRNAAliFoldValidStructure()
+ {
+
+ alifoldClient = new RNAalifoldClient(rnaalifoldws, af, null, null);
+
+ af.getViewport().getCalcManager().startWorker(alifoldClient);
+
+ do
+ {
+ try
+ {
+ Thread.sleep(50);
+ } catch (InterruptedException x)
+ {
+ }
+ ;
+ } while (af.getViewport().getCalcManager().isWorking());
+
+ AlignmentI orig_alig = af.getViewport().getAlignment();
+ for (AlignmentAnnotation aa : orig_alig.getAlignmentAnnotation())
+ {
+ if (alifoldClient.involves(aa))
+ {
+ if (aa.isRNA())
+ {
+ assertTrue(
+ "Did not create valid structure from RNAALiFold prediction",
+ aa.isValidStruc());
+ }
+ }
}
}
- @Test
+ @Test(groups = { "Functional" })
public void testRNAStructExport()
{
@@ -117,9 +196,8 @@ public class RNAStructExportImport
String aligfileout = new FormatAdapter().formatSequences("PFAM",
al.getSequencesArray());
- String anfileout = new AnnotationFile().printAnnotations(
- al.getAlignmentAnnotation(), al.getGroups(),
- al.getProperties());
+ String anfileout = new AnnotationFile()
+ .printAnnotationsForAlignment(al);
assertTrue(
"Test "
+ testname
@@ -136,27 +214,27 @@ public class RNAStructExportImport
// again what format would be appropriate?
AlignmentI al_new = new FormatAdapter().readFile(aligfileout,
- FormatAdapter.PASTE, "PFAM");
+ DataSourceType.PASTE, FileFormat.Pfam);
assertTrue(
"Test "
+ testname
+ "\nregenerated annotation file did not annotate alignment.",
new AnnotationFile().readAnnotationFile(al_new, anfileout,
- FormatAdapter.PASTE));
+ DataSourceType.PASTE));
// test for consistency in io
- StockholmFileTest.testAlignmentEquivalence(al, al_new);
+ StockholmFileTest.testAlignmentEquivalence(al, al_new, false);
return;
} catch (Exception e)
{
e.printStackTrace();
}
- fail("Test "
+ Assert.fail("Test "
+ testname
+ "\nCouldn't complete Annotation file roundtrip input/output/input test.");
}
- @Test
+ @Test(groups = { "Functional" })
public void testRnaalifoldSettingsRecovery()
{
List opts = new ArrayList();
@@ -170,7 +248,7 @@ public class RNAStructExportImport
rg.setValue("292");
} catch (WrongParameterException q)
{
- fail("Couldn't set the temperature parameter "
+ Assert.fail("Couldn't set the temperature parameter "
+ q.getStackTrace());
}
opts.add(rg);
@@ -181,9 +259,9 @@ public class RNAStructExportImport
}
}
alifoldClient = new RNAalifoldClient(rnaalifoldws, af, null, opts);
-
+
af.getViewport().getCalcManager().startWorker(alifoldClient);
-
+
do
{
try
@@ -194,39 +272,58 @@ public class RNAStructExportImport
}
;
} while (af.getViewport().getCalcManager().isWorking());
- AutoCalcSetting oldacs = af.getViewport().getCalcIdSettingsFor(alifoldClient.getCalcId());
+ AutoCalcSetting oldacs = af.getViewport().getCalcIdSettingsFor(
+ alifoldClient.getCalcId());
String oldsettings = oldacs.getWsParamFile();
// write out parameters
- jalview.gui.AlignFrame nalf=null;
- assertTrue("Couldn't write out the Jar file",new Jalview2XML(false).SaveAlignment(af, "testRnalifold_param.jar","trial parameter writeout"));
- assertTrue("Couldn't read back the Jar file",(nalf = new Jalview2XML(false).LoadJalviewAlign("testRnalifold_param.jar"))!=null);
- if (nalf!=null)
+ jalview.gui.AlignFrame nalf = null;
+ assertTrue("Couldn't write out the Jar file",
+ new Jalview2XML(false).saveAlignment(af, JAR_FILE_NAME,
+ "trial parameter writeout"));
+ assertTrue("Couldn't read back the Jar file", (nalf = new Jalview2XML(
+ false).loadJalviewAlign(JAR_FILE_NAME)) != null);
+ if (nalf != null)
{
- AutoCalcSetting acs = af.getViewport().getCalcIdSettingsFor(alifoldClient.getCalcId());
- assertTrue("Calc ID settings not recovered from viewport stash", acs.equals(oldacs));
- assertTrue("Serialised Calc ID settings not identical to those recovered from viewport stash", acs.getWsParamFile().equals(oldsettings));
- JMenu nmenu=new JMenu();
- new SequenceAnnotationWSClient().attachWSMenuEntry(nmenu, rnaalifoldws, af);
- assertTrue("Couldn't get menu entry for service",nmenu.getItemCount()>0);
- for (Component itm: nmenu.getMenuComponents())
+ AutoCalcSetting acs = af.getViewport().getCalcIdSettingsFor(
+ alifoldClient.getCalcId());
+ assertTrue("Calc ID settings not recovered from viewport stash",
+ acs.equals(oldacs));
+ assertTrue(
+ "Serialised Calc ID settings not identical to those recovered from viewport stash",
+ acs.getWsParamFile().equals(oldsettings));
+ JMenu nmenu = new JMenu();
+ new SequenceAnnotationWSClient().attachWSMenuEntry(nmenu,
+ rnaalifoldws, af);
+ assertTrue("Couldn't get menu entry for service",
+ nmenu.getItemCount() > 0);
+ for (Component itm : nmenu.getMenuComponents())
{
if (itm instanceof JMenuItem)
{
JMenuItem i = (JMenuItem) itm;
- if (i.getText().equals(rnaalifoldws.getAlignAnalysisUI().getAAconToggle()))
- {
+ if (i.getText().equals(
+ rnaalifoldws.getAlignAnalysisUI().getAAconToggle()))
+ {
i.doClick();
break;
- }
+ }
}
}
while (af.getViewport().isCalcInProgress())
{
- try { Thread.sleep(200);
- } catch (Exception x) {};
+ try
+ {
+ Thread.sleep(200);
+ } catch (Exception x)
+ {
+ }
+ ;
}
- AutoCalcSetting acs2 = af.getViewport().getCalcIdSettingsFor(alifoldClient.getCalcId());
- assertTrue("Calc ID settings after recalculation has not been recovered.", acs2.getWsParamFile().equals(oldsettings));
+ AutoCalcSetting acs2 = af.getViewport().getCalcIdSettingsFor(
+ alifoldClient.getCalcId());
+ assertTrue(
+ "Calc ID settings after recalculation has not been recovered.",
+ acs2.getWsParamFile().equals(oldsettings));
}
}
}