Shuffles some test classes around; adds missing tests to JavaCompilationSuite convenience test suite.
Review by: bobv
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6789 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/test/com/google/gwt/dev/javac/JavaCompilationSuite.java b/dev/core/test/com/google/gwt/dev/javac/JavaCompilationSuite.java
index 7085918..cadfed8 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JavaCompilationSuite.java
+++ b/dev/core/test/com/google/gwt/dev/javac/JavaCompilationSuite.java
@@ -15,6 +15,9 @@
*/
package com.google.gwt.dev.javac;
+import com.google.gwt.dev.javac.asm.CollectClassDataTest;
+import com.google.gwt.dev.javac.asm.CollectReferencesVisitorTest;
+import com.google.gwt.dev.javac.asm.ResolveGenericsTest;
import com.google.gwt.dev.javac.impl.JdtBehaviorTest;
import junit.framework.Test;
@@ -27,18 +30,28 @@
public static Test suite() {
TestSuite suite = new TestSuite(JavaCompilationSuite.class.getName());
+ suite.addTestSuite(ArtificialRescueCheckerTest.class);
suite.addTestSuite(BinaryTypeReferenceRestrictionsCheckerTest.class);
suite.addTestSuite(CompilationStateTest.class);
suite.addTestSuite(CompilationUnitFileReferenceTest.class);
suite.addTestSuite(GWTProblemTest.class);
suite.addTestSuite(JavaSourceParserTest.class);
- suite.addTestSuite(JdtBehaviorTest.class);
suite.addTestSuite(JdtCompilerTest.class);
- suite.addTestSuite(JProgramLastFragmentLoadingBeforeTest.class);
suite.addTestSuite(JSORestrictionsTest.class);
suite.addTestSuite(JsniCheckerTest.class);
suite.addTestSuite(TypeOracleMediatorTest.class);
+ suite.addTestSuite(CollectClassDataTest.class);
+ suite.addTestSuite(CollectReferencesVisitorTest.class);
+ suite.addTestSuite(ResolveGenericsTest.class);
+
+ suite.addTestSuite(JdtBehaviorTest.class);
+
+ // TODO: Move these to another package.
+ suite.addTestSuite(GeneratedClassnameComparatorTest.class);
+ suite.addTestSuite(GeneratedClassnameFinderTest.class);
+ suite.addTestSuite(GeneratedClassnameTest.class);
+
return suite;
}
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/JProgramLastFragmentLoadingBeforeTest.java b/dev/core/test/com/google/gwt/dev/jjs/ast/JProgramLastFragmentLoadingBeforeTest.java
similarity index 98%
rename from dev/core/test/com/google/gwt/dev/javac/JProgramLastFragmentLoadingBeforeTest.java
rename to dev/core/test/com/google/gwt/dev/jjs/ast/JProgramLastFragmentLoadingBeforeTest.java
index 585f38e..06e20fa 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JProgramLastFragmentLoadingBeforeTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/ast/JProgramLastFragmentLoadingBeforeTest.java
@@ -13,9 +13,8 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.dev.javac;
+package com.google.gwt.dev.jjs.ast;
-import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.util.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
index 651c312..d7e7a59 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
@@ -35,7 +35,7 @@
import java.util.TreeSet;
/**
- * Tests {@link DeadCodeElimination}.
+ * A useful base class for tests that build JJS ASTs.
*/
public abstract class OptimizerTestBase extends TestCase {
diff --git a/dev/core/test/com/google/gwt/dev/javac/RunAsyncNameTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
similarity index 94%
rename from dev/core/test/com/google/gwt/dev/javac/RunAsyncNameTest.java
rename to dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
index ad433e5..21774b7 100644
--- a/dev/core/test/com/google/gwt/dev/javac/RunAsyncNameTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
@@ -13,12 +13,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.dev.javac;
+package com.google.gwt.dev.jjs.impl;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.impl.MockJavaResource;
-import com.google.gwt.dev.jjs.impl.OptimizerTestBase;
import com.google.gwt.dev.util.UnitTestTreeLogger;
/**
@@ -54,7 +53,7 @@
* Tests that it's an error to call the 2-argument version of GWT.runAsync
* with anything but a class literal.
*/
- public void testNonLiteralInCall() throws UnableToCompleteException {
+ public void testNonLiteralInCall() {
UnitTestTreeLogger logger;
{
UnitTestTreeLogger.Builder builder = new UnitTestTreeLogger.Builder();
