[jbpm-commits] JBoss JBPM SVN: r3197 - in projects/gwt-console/trunk/war/src: test/java/org/jboss/bpm/console/client and 1 other directory.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-12-04 05:51:59 -0500 (Thu, 04 Dec 2008)
New Revision: 3197

Modified:
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
   projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java
   projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java
Log:
Fix test cases

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java	2008-12-04 10:26:41 UTC (rev 3196)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java	2008-12-04 10:51:59 UTC (rev 3197)
@@ -45,7 +45,13 @@
    private String overviewReportFile;
    private String definitionReportFile;
    private String instanceReportFile;
-   
+
+
+   public ConsoleConfig(String consoleServerUrl)
+   {
+      this.consoleServerUrl = consoleServerUrl;
+   }
+
    public ConsoleConfig()
    {
       Dictionary theme = Dictionary.getDictionary("consoleConfig");

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java	2008-12-04 10:26:41 UTC (rev 3196)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java	2008-12-04 10:51:59 UTC (rev 3197)
@@ -21,7 +21,6 @@
  */
 package org.jboss.bpm.console.client;
 
-import org.jboss.bpm.console.client.util.ConsoleLog;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.http.client.Request;
 import com.google.gwt.http.client.Response;
@@ -41,6 +40,7 @@
 import org.jboss.bpm.console.client.metric.MetricOverviewEditor;
 import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
 import org.jboss.bpm.console.client.task.TaskListEditor;
+import org.jboss.bpm.console.client.util.ConsoleLog;
 
 import java.util.List;
 
@@ -70,10 +70,16 @@
 
    public MainView()
    {
-      ConsoleConfig config = new ConsoleConfig();
+      ConsoleConfig config = null;
 
-      if(!GWT.isScript()) // hosted mode used proxy by default
-         config.setConsoleServerUrl(GWT.getModuleBaseURL()+"xhp");      
+      if(GWT.isScript())
+      {
+         config = new ConsoleConfig();
+      }
+      else
+      {
+         config = new ConsoleConfig(GWT.getModuleBaseURL()+"xhp");      
+      }
 
       ConsoleLog.debug("Console server: " + config.getConsoleServerUrl());
       ConsoleLog.debug("Report server: " + config.getReportServerUrl());

Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java
===================================================================
--- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java	2008-12-04 10:26:41 UTC (rev 3196)
+++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java	2008-12-04 10:51:59 UTC (rev 3197)
@@ -54,7 +54,8 @@
          application.onModuleLoad2();
       }
 
-      urlBuilder = new URLBuilder(GWT.getModuleBaseURL(), "xhp");
+      ConsoleConfig config = new ConsoleConfig(GWT.getModuleBaseURL()+"xhp");      
+      urlBuilder = new URLBuilder(config);
    }
 
    protected abstract class ChainedTimer extends Timer

Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java	2008-12-04 10:26:41 UTC (rev 3196)
+++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java	2008-12-04 10:51:59 UTC (rev 3197)
@@ -62,8 +62,8 @@
       context.put("instanceFollow", undeployTimer);
       
       // trigger first timer
-      deployTimer.schedule(500);
-      delayTestFinish(1000);
+      deployTimer.schedule(1000);
+      delayTestFinish(2000);
 
    }