[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Oct 29 22:33:24 EDT 2008
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test
In directory dev.open-bio.org:/tmp/cvs-serv10500/src/main/ca/ucalgary/seahawk/gui/test

Modified Files:
	SeahawkTestCase.java 
Log Message:
Updates related to SAWSDL wrapping Web Service implementation
moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test SeahawkTestCase.java,1.10,1.11
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test/SeahawkTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test/SeahawkTestCase.java	2008/01/30 00:06:48	1.10
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/test/SeahawkTestCase.java	2008/10/30 02:33:24	1.11
@@ -3,6 +3,9 @@
 import ca.ucalgary.seahawk.gui.*;
 import ca.ucalgary.seahawk.util.*;
 
+import org.biomoby.client.CentralImpl;
+import org.biomoby.shared.Central;
+import org.biomoby.shared.CentralCached;
 import org.biomoby.shared.MobyDataType;
 import org.biomoby.shared.data.*;
 
@@ -215,8 +218,9 @@
 	try{
 	    testFile = File.createTempFile("test-seahawk", "");	    
 	    testFile.deleteOnExit();
+	    sleep(5000);
 	    fc.setSelectedFile(testFile);
-	    sleep(2000);
+	    sleep(5000);
 	    fc.approveSelection();
 	    assertTrue("File (" + testFile + ") was not saved", testFile.exists());
 	}
@@ -457,7 +461,9 @@
 	int startingTabCount = tabbedPane.getTabCount();
 
 	if("file".equals(testMobyURL.getProtocol())){
+	    sleep(5000);
 	    fc.setSelectedFile(new File(testMobyURL.toURI()));
+	    sleep(5000);
 	    fc.approveSelection();
 	}
 	else{
@@ -603,10 +609,10 @@
 	Robot robot = new Robot();
 	robot.mouseMove(screenPos.x, screenPos.y+10);
 	sleep(2000);
-	robot.mouseMove(screenPos.x-10, screenPos.y+10);
-	sleep(2000);
-	robot.mouseMove(screenPos.x+10, screenPos.y+10);
+	robot.mouseMove(screenPos.x-8, screenPos.y+10);
 	sleep(2000);
+	//robot.mouseMove(screenPos.x+10, screenPos.y+10);
+	//sleep(2000);
 	robot.mousePress(InputEvent.BUTTON1_MASK);
 	robot.mouseRelease(InputEvent.BUTTON1_MASK);
 	sleep(2000);
@@ -677,14 +683,14 @@
     public void testRunAsynchronousService() throws Exception{
 	String serviceLabel = null;
 	try{
-	    serviceLabel = findService(TEST_AA_SEQ, "Bioinformatics", "(async)");
+	    serviceLabel = findService(TEST_AA_SEQ, "ObjectHandling", "(async)");
 	} catch(Exception e){
 	    e.printStackTrace();
-	    fail("Error while finding a service ending with \"(async)\" " +
-		 "(asynchronous execution) under \"Bioinformatics\" in the popup");
+	    fail("Error while finding a service matching \"(async)\" " +
+		 "(asynchronous execution) under \"ObjectHandling\" in the popup");
 	}
 
-	if(serviceLabel.indexOf("...") != 0){
+	if(serviceLabel.indexOf("...") != -1){
 	    fillInSecondariesAndExecute();
 	}
 
@@ -700,7 +706,7 @@
 
     public void testRunServiceSecondariesAndSCUFL() throws Exception{
 	try{
-	    findService(TEST_DNA_SEQ, "Analysis", "...");
+	    findService(TEST_DNA_SEQ, "Bioinformatics", "...");
 	} catch(Exception e){
 	    e.printStackTrace();
 	    fail("Error while a finding service ending with \"...\" " +
@@ -890,6 +896,11 @@
     }
 
     public void testMain() throws Exception{
+	// Clear the cache to ensure cache loading classes get used
+	Central central = CentralImpl.getDefaultCentral(null);
+	if(central instanceof CentralCached){
+	    ((CentralCached) central).removeFromCache(null);
+	}
 	MobyContentGUI.setDefaultAppCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 	MobyContentGUI.main(new String[]{});
     }