[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Mar 17 16:21:55 EDT 2010
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test
In directory dev.open-bio.org:/tmp/cvs-serv11511/src/main/ca/ucalgary/seahawk/gui/test

Modified Files:
	SeahawkTestCase.java 
Log Message:
Interface updates related to new search/filter and workflow generation/preview functions
moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test SeahawkTestCase.java,1.12,1.13
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test/SeahawkTestCase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test/SeahawkTestCase.java	2009/06/09 19:26:15	1.12
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test/SeahawkTestCase.java	2010/03/17 20:21:55	1.13
@@ -35,7 +35,7 @@
     private final static String TEST_MS_EXCEL_FILE = "ca/ucalgary/seahawk/gui/test/twohybrid_uetz.xls";
     private final static String TEST_MOBYEX_XML = "ca/ucalgary/seahawk/gui/test/moby_exception.xml";
     private final static String TEST_MOBY_XML = "ca/ucalgary/seahawk/gui/test/allDataTypes.xml";
-    private final static String TEST_WSDL_FILE = "ca/ucalgary/seahawk/gui/test/efetch_seq.wsdl";
+    private final static String TEST_WSDL_FILE = "http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/v2.0/efetch_seq.wsdl";
     private final static String TEST_EXTERNAL_URL = "http://www.google.com/";
     private final static String TEST_DNA_SEQ = "AAGCTTGGCCAACGTAAATCTTTCGGCGGCA";
     private final static String TEST_AA_SEQ = "MPGGFILAIDEGTTSARAIIYNQDLEVLGIGQYDFPQHYPSP";
@@ -527,7 +527,7 @@
 
     // Checks to make sure the Moby-wrapping of WSDL forms works fine
     public void testWSDL() throws Exception{
-	URL wsdlResource = getClass().getClassLoader().getResource(TEST_WSDL_FILE);
+	URL wsdlResource = TEST_WSDL_FILE.startsWith("http://") ? new URL(TEST_WSDL_FILE) : getClass().getClassLoader().getResource(TEST_WSDL_FILE);
 	assertNotNull("Could not find test WSDL resource " + TEST_WSDL_FILE, wsdlResource);
 	contentGUI.loadPaneFromURL(wsdlResource, true);
 	try{
@@ -802,13 +802,13 @@
 	sleep(2000); //just to ensure HTML rendering finishes		
     }
 
-    public void testRunServiceSecondariesAndSCUFL() throws Exception{
+    public void testRunServiceSecondariesAndWorkflow() throws Exception{
 	try{
-	    findService(TEST_DNA_SEQ, "Bioinformatics", "...");
+	    findService(TEST_DNA_SEQ, "BasicGFFSequenceFeature", "...");
 	} catch(Exception e){
 	    e.printStackTrace();
 	    fail("Error while a finding service ending with \"...\" " +
-		 "(secondary input) under \"Analysis\" in the popup");
+		 "(secondary input) under \"BasicGFFSequenceFeature\" in the popup");
 	}
 	fillInSecondariesAndExecute();
 
@@ -824,9 +824,9 @@
 	// Since we ran a real service, we can make a Taverna workflow out of the tab history
 	File testFile = File.createTempFile("test-seahawk", "");
 	testFile.deleteOnExit();
-	MobySaveDialog.exportSCUFL(contentGUI.getCurrentPane(), testFile);
+	MobySaveDialog.exportWorkflow(contentGUI.getCurrentPane(), testFile);
 	sleep(1000);
-	assertTrue("The SCUFL saved data file was empty", testFile.length() != 0);
+	assertTrue("The workflow saved data file was empty", testFile.length() != 0);
     }
 
     public void fillInSecondariesAndExecute() throws Exception{
@@ -1079,7 +1079,7 @@
   	suite.addTest(new SeahawkTestCase("testPrint"));  //done
   	suite.addTest(new SeahawkTestCase("testNavigationButtons")); //done
   	suite.addTest(new SeahawkTestCase("testRunAsynchronousService")); //done
-  	suite.addTest(new SeahawkTestCase("testRunServiceSecondariesAndSCUFL")); //done
+  	suite.addTest(new SeahawkTestCase("testRunServiceSecondariesAndWorkflow")); //done
   	suite.addTest(new SeahawkTestCase("testHighlightOptions"));//done
   	suite.addTest(new SeahawkTestCase("testUserPreferences"));//done
   	suite.addTest(new SeahawkTestCase("testExternalBrowser"));//done