Revision: 7196
Author: [email protected]
Date: Sun Nov 29 20:24:51 2009
Log: Merge trunk r7194 into this branch
Make RunStyle public, improve docs.
svn merge --ignore-ancestry -c7194 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=7196
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/branch-info.txt Wed Nov 25 10:12:27 2009
+++ /releases/2.0/branch-info.txt Sun Nov 29 20:24:51 2009
@@ -1092,3 +1092,7 @@
Removed index.html from distro-source because it is obsolete
svn merge --ignore-ancestry -c7190
https://google-web-toolkit.googlecode.com/svn/trunk .
+tr...@7194 was merged into this branch
+ Make RunStyle public, improve docs.
+ svn merge --ignore-ancestry -c7194 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
--- /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Tue Nov 24
12:40:22 2009
+++ /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Sun Nov 29
20:24:51 2009
@@ -243,7 +243,8 @@
return "Selects the runstyle to use for this test. The name is "
+ "a suffix of com.google.gwt.junit.RunStyle or is a fully "
+ "qualified class name, and may be followed with a colon
and "
- + "an argument for this runstyle.";
+ + "an argument for this runstyle. The specified class must"
+ + "extend RunStyle.";
}
@Override
=======================================
--- /releases/2.0/user/src/com/google/gwt/junit/RunStyle.java Mon Nov 16
19:22:20 2009
+++ /releases/2.0/user/src/com/google/gwt/junit/RunStyle.java Sun Nov 29
20:24:51 2009
@@ -24,7 +24,7 @@
/**
* An abstract class that handles the details of launching a browser.
*/
-abstract class RunStyle {
+public abstract class RunStyle {
/**
* The containing shell.
@@ -71,6 +71,8 @@
/**
* Returns the number of times this test should be tried to run. A test
* succeeds if it succeeds even once.
+ *
+ * @return the number of attempts
*/
public int getTries() {
return tries;
@@ -95,6 +97,12 @@
public abstract void launchModule(String moduleName)
throws UnableToCompleteException;
+ /**
+ * Sets the number of times a test should be tried -- it succeeds if any
+ * attempt succeeds.
+ *
+ * @param tries number of attempts
+ */
public void setTries(int tries) {
this.tries = tries;
}
@@ -113,11 +121,13 @@
}
/**
- * Whether the embedded server should ever generate resources. Hosted
mode
- * needs this, but not noserver hosted. TODO(spoon) does web mode get
simpler
- * if this is turned on?
+ * Whether the embedded server should ever generate resources.
Development
+ * mode needs this, but not with -noserver.
+ *
+ * @return true if resources should be automatically generated by the
server.
*/
public boolean shouldAutoGenerateResources() {
+ // TODO(spoon) does web mode get simpler if this is turned on?
return true;
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors