[jbosstools-commits] JBoss Tools SVN: r42952 - in branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext: src/org/jboss/tools/ui/bot/ext/config/requirement and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: ljelinko
Date: 2012-08-09 10:19:24 -0400 (Thu, 09 Aug 2012)
New Revision: 42952

Modified:
   branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/
   branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/ClearProjects.java
   branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RemoveServer.java
   branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/StopServer.java
Log:
Added check so that requirements are performed only if the server is present. 


Property changes on: branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/tests/plugins/org.jboss.tools.ui.bot.ext:41456-42878
   + /trunk/tests/plugins/org.jboss.tools.ui.bot.ext:41456-42878,42924,42950

Modified: branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/ClearProjects.java
===================================================================
--- branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/ClearProjects.java	2012-08-09 14:18:41 UTC (rev 42951)
+++ branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/ClearProjects.java	2012-08-09 14:19:24 UTC (rev 42952)
@@ -21,7 +21,9 @@
 
 	@Override
 	public void handle() {
-		SWTTestExt.servers.removeAllProjectsFromServer();
+		if (SWTTestExt.servers.serverExists(SWTTestExt.configuredState.getServer().name)){
+			SWTTestExt.servers.removeAllProjectsFromServer();
+		}
 		SWTTestExt.projectExplorer.deleteAllProjects();
 
 	}

Modified: branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RemoveServer.java
===================================================================
--- branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RemoveServer.java	2012-08-09 14:18:41 UTC (rev 42951)
+++ branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RemoveServer.java	2012-08-09 14:19:24 UTC (rev 42952)
@@ -17,8 +17,10 @@
 	@Override
 	public void handle() {
 		if (!checkFulfilled()) {
-			SWTTestExt.servers.deleteServer(SWTTestExt.configuredState.getServer().name);
-			SWTTestExt.eclipse.removeServerRuntime(SWTTestExt.configuredState.getServer().name);
+			if (SWTTestExt.servers.serverExists(SWTTestExt.configuredState.getServer().name)){
+				SWTTestExt.servers.deleteServer(SWTTestExt.configuredState.getServer().name);
+				SWTTestExt.eclipse.removeServerRuntime(SWTTestExt.configuredState.getServer().name);
+			}
 			SWTTestExt.configuredState.getServer().isConfigured=false;
 			SWTTestExt.configuredState.getServer().name=null;
 			SWTTestExt.configuredState.getServer().version=null;

Modified: branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/StopServer.java
===================================================================
--- branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/StopServer.java	2012-08-09 14:18:41 UTC (rev 42951)
+++ branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/StopServer.java	2012-08-09 14:19:24 UTC (rev 42952)
@@ -15,9 +15,11 @@
 
 	@Override
 	public void handle(){
-	  if (SWTTestExt.configuredState.getServer().isRunning){
-	    SWTTestExt.servers.stopServer(SWTTestExt.configuredState.getServer().name);
-	    SWTTestExt.configuredState.getServer().isRunning = false;
-	  }
+		if (SWTTestExt.configuredState.getServer().isRunning){
+			if (SWTTestExt.servers.serverExists(SWTTestExt.configuredState.getServer().name)){
+				SWTTestExt.servers.stopServer(SWTTestExt.configuredState.getServer().name);	  
+			}
+			SWTTestExt.configuredState.getServer().isRunning = false;
+		}
 	}
 }