Made a couple of public methods package-protected. git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5692 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/junit/JUnitMessageQueue.java b/user/src/com/google/gwt/junit/JUnitMessageQueue.java index 25b7f99..169391c 100644 --- a/user/src/com/google/gwt/junit/JUnitMessageQueue.java +++ b/user/src/com/google/gwt/junit/JUnitMessageQueue.java
@@ -88,18 +88,6 @@ } /** - * Gets a human-readable string. - * - * @return Fetches a human-readable representation of the current test object - */ - public String getCurrentTestName() { - if (currentTest == null) { - return "(no test)"; - } - return currentTest.toString(); - } - - /** * Called by the servlet to query for for the next method to test. * * @param timeout how long to wait for an answer @@ -147,39 +135,6 @@ } /** - * Returns a human-formatted message identifying what clients have connected - * but have not yet reported results for this test. It is used in a timeout - * condition, to identify what we're still waiting on. - * - * @return human readable message - */ - public String getWorkingClients() { - synchronized (clientStatusesLock) { - StringBuilder buf = new StringBuilder(); - int itemCount = 0; - for (ClientStatus clientStatus : clientStatuses.values()) { - if (clientStatus.hasRequestedCurrentTest - && clientStatus.currentTestResults == null) { - if (itemCount > 0) { - buf.append(", "); - } - buf.append(clientStatus.clientId); - ++itemCount; - } - } - int difference = numClients - itemCount; - if (difference > 0) { - if (itemCount > 0) { - buf.append('\n'); - } - buf.append(difference - + " other client(s) haven't responded back to JUnitShell since the start of the test."); - } - return buf.toString(); - } - } - - /** * Called by the servlet to report the results of the last test to run. * * @param testInfo the testInfo the result is for @@ -208,6 +163,18 @@ } /** + * Gets a human-readable string. + * + * @return Fetches a human-readable representation of the current test object + */ + String getCurrentTestName() { + if (currentTest == null) { + return "(no test)"; + } + return currentTest.toString(); + } + + /** * Returns any new clients that have contacted the server since the last call. * The same client will never be returned from this method twice. */ @@ -293,6 +260,39 @@ } /** + * Returns a human-formatted message identifying what clients have connected + * but have not yet reported results for this test. It is used in a timeout + * condition, to identify what we're still waiting on. + * + * @return human readable message + */ + String getWorkingClients() { + synchronized (clientStatusesLock) { + StringBuilder buf = new StringBuilder(); + int itemCount = 0; + for (ClientStatus clientStatus : clientStatuses.values()) { + if (clientStatus.hasRequestedCurrentTest + && clientStatus.currentTestResults == null) { + if (itemCount > 0) { + buf.append(", "); + } + buf.append(clientStatus.clientId); + ++itemCount; + } + } + int difference = numClients - itemCount; + if (difference > 0) { + if (itemCount > 0) { + buf.append('\n'); + } + buf.append(difference + + " other client(s) haven't responded back to JUnitShell since the start of the test."); + } + return buf.toString(); + } + } + + /** * Called by the shell to see if the currently-running test has completed. * * @return If the test has completed, <code>true</code>, otherwise