Revision: 6571 Author: [email protected] Date: Fri Oct 30 14:33:17 2009 Log: tr...@6570 was merged into this branch Revert r6456 because it was causing JUnitShell to wait indefinitely. svn merge --ignore-ancestry -c 6570 http://google-web-toolkit.googlecode.com/svn/trunk/ .
Patch by: jlabanca http://code.google.com/p/google-web-toolkit/source/detail?r=6571 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java /releases/2.0/user/src/com/google/gwt/junit/RunStyle.java /releases/2.0/user/src/com/google/gwt/junit/RunStyleManual.java /releases/2.0/user/src/com/google/gwt/junit/RunStyleRemoteWeb.java ======================================= --- /releases/2.0/branch-info.txt Fri Oct 30 13:01:57 2009 +++ /releases/2.0/branch-info.txt Fri Oct 30 14:33:17 2009 @@ -139,3 +139,7 @@ Fixed script permissions for *Creator and benchmarkViewer svn merge -c 6564 http://google-web-toolkit.googlecode.com/svn/trunk/ . +tr...@6570 was merged into this branch + Revert r6456 because it was causing JUnitShell to wait indefinitely. + svn merge --ignore-ancestry -c 6570 http://google-web-toolkit.googlecode.com/svn/trunk/ . + ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Wed Oct 28 19:23:32 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Fri Oct 30 14:33:17 2009 @@ -684,22 +684,15 @@ */ protected boolean notDone() { int activeClients = messageQueue.getNumClientsRetrievedTest(currentTestInfo); - if (firstLaunch && runStyle.isStartDelayed()) { - // Pretty print the list of clients for manual tests. - if (runStyle instanceof RunStyleManual) { - String[] newClients = messageQueue.getNewClients(); - int printIndex = activeClients - newClients.length + 1; - for (String newClient : newClients) { - System.out.println(printIndex + " - " + newClient); - ++printIndex; - } - } - - if (runStyle.wasInterrupted()) { - // Exit early if the test is interrupted. - throw new TimeoutException("A remote browser died a mysterious death."); - } else if (activeClients != this.numClients) { - // Wait forever for first contact. + if (firstLaunch && runStyle instanceof RunStyleManual) { + String[] newClients = messageQueue.getNewClients(); + int printIndex = activeClients - newClients.length + 1; + for (String newClient : newClients) { + System.out.println(printIndex + " - " + newClient); + ++printIndex; + } + if (activeClients != this.numClients) { + // Wait forever for first contact; user-driven. return true; } } ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/RunStyle.java Sat Oct 24 08:11:35 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/RunStyle.java Fri Oct 30 14:33:17 2009 @@ -49,15 +49,6 @@ public boolean initialize(String args) { return true; } - - /** - * Check whether or not tests start immediately or if they can be delayed. - * - * @return <code>true</code> if the test can be delayed - */ - public boolean isStartDelayed() { - return false; - } /** * Requests initial launch of the browser. This should only be called once per ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/RunStyleManual.java Sat Oct 24 08:11:35 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/RunStyleManual.java Fri Oct 30 14:33:17 2009 @@ -45,14 +45,6 @@ shell.setNumClients(numClients); return true; } - - /** - * Manual tests are started by users in user time. - */ - @Override - public boolean isStartDelayed() { - return true; - } @Override public void launchModule(String moduleName) throws UnableToCompleteException { ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/RunStyleRemoteWeb.java Sat Oct 24 08:11:35 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/RunStyleRemoteWeb.java Fri Oct 30 14:33:17 2009 @@ -200,14 +200,6 @@ Runtime.getRuntime().addShutdownHook(new ShutdownCb()); return true; } - - /** - * Remote web tests can be queued for extended periods. - */ - @Override - public boolean isStartDelayed() { - return true; - } @Override public synchronized void launchModule(String moduleName) --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
