[xwiki-notifications] r10962 - xwiki-platform/xwiki-tools/trunk/xwiki-shared-tests/src/main/java/com/xpn/xwiki/test

[vmassol (SVN)]

Author: vmassol
Date: 2008-07-01 11:24:09 +0200 (Tue, 01 Jul 2008)
New Revision: 10962

Modified:
   xwiki-platform/xwiki-tools/trunk/xwiki-shared-tests/src/main/java/com/xpn/xwiki/test/XWikiTestSetup.java
Log:
Minor improvement to check existence of dirs

Modified: xwiki-platform/xwiki-tools/trunk/xwiki-shared-tests/src/main/java/com/xpn/xwiki/test/XWikiTestSetup.java
===================================================================
--- xwiki-platform/xwiki-tools/trunk/xwiki-shared-tests/src/main/java/com/xpn/xwiki/test/XWikiTestSetup.java	2008-07-01 02:43:51 UTC (rev 10961)
+++ xwiki-platform/xwiki-tools/trunk/xwiki-shared-tests/src/main/java/com/xpn/xwiki/test/XWikiTestSetup.java	2008-07-01 09:24:09 UTC (rev 10962)
@@ -101,19 +101,30 @@
 
     private void startXWiki() throws Exception
     {
-        ExecTask execTask = (ExecTask) this.project.createTask("exec");
-        execTask.setDir(new File(EXECUTION_DIRECTORY));
-        Commandline commandLine = new Commandline(START_COMMAND);
-        execTask.setCommand(commandLine);
-        execTask.execute();
+        File dir = new File(EXECUTION_DIRECTORY);
+        if (dir.exists()) {
+            ExecTask execTask = (ExecTask) this.project.createTask("exec");
+            execTask.setDir(new File(EXECUTION_DIRECTORY));
+            Commandline commandLine = new Commandline(START_COMMAND);
+            execTask.setCommand(commandLine);
+            execTask.execute();
+        } else {
+            throw new Exception("Invalid directory from where to start XWiki [" + EXECUTION_DIRECTORY + "]");
+        }
     }
 
-    private Task createStopTask()
+    private Task createStopTask() throws Exception
     {
-        ExecTask execTask = (ExecTask) this.project.createTask("exec");
-        execTask.setDir(new File(EXECUTION_DIRECTORY));
-        Commandline commandLine = new Commandline(STOP_COMMAND);
-        execTask.setCommand(commandLine);
+        ExecTask execTask;
+        File dir = new File(EXECUTION_DIRECTORY);
+        if (dir.exists()) {
+            execTask = (ExecTask) this.project.createTask("exec");
+            execTask.setDir(new File(EXECUTION_DIRECTORY));
+            Commandline commandLine = new Commandline(STOP_COMMAND);
+            execTask.setCommand(commandLine);
+        } else {
+            throw new Exception("Invalid directory from where to stop XWiki [" + EXECUTION_DIRECTORY + "]");
+        }
         return execTask;
     }