Added small generator testing framework that allows developers to
create a generator context from synthetic sources outside a GWT
compilation run.
Also moving test/com/google/gwt/dev/javac/impl to
src/com/google/gwt/dev/javac/testing/impl.
Review at http://gwt-code-reviews.appspot.com/1424805
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10049 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/javac/testing/GeneratorContextBuilder.java b/dev/core/src/com/google/gwt/dev/javac/testing/GeneratorContextBuilder.java
new file mode 100644
index 0000000..5201480
--- /dev/null
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/GeneratorContextBuilder.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.javac.testing;
+
+import com.google.gwt.core.ext.GeneratorContext;
+import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.dev.javac.CompilationState;
+import com.google.gwt.dev.javac.CompilationStateBuilder;
+import com.google.gwt.dev.javac.StandardGeneratorContext;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockResource;
+import com.google.gwt.dev.resource.Resource;
+import com.google.gwt.dev.util.collect.HashSet;
+import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Set;
+
+/**
+ * Builder creating a new generator context for testing purposes, based on the
+ * sources provided.
+ */
+public class GeneratorContextBuilder {
+
+ /**
+ * Creates a new {@link GeneratorContextBuilder} that is pre-populated with a
+ * number of basic types provided by
+ * {@link JavaResourceBase#getStandardResources()}.
+ *
+ * @return pre-populated context builder
+ */
+ public static GeneratorContextBuilder newCoreBasedBuilder() {
+ Set<Resource> resources = new HashSet<Resource>();
+ resources.addAll(Arrays.asList(JavaResourceBase.getStandardResources()));
+ return new GeneratorContextBuilder(resources);
+ }
+
+ /**
+ * Creates a new empty {@link GeneratorContextBuilder}. Note that this
+ * builder does <b>not</b> contain any base java types.
+ *
+ * @return empty context builder
+ */
+ public static GeneratorContextBuilder newEmptyBuilder() {
+ return new GeneratorContextBuilder(new HashSet<Resource>());
+ }
+
+ private final Set<Resource> resources;
+ private TreeLogger treeLogger;
+
+ private GeneratorContextBuilder(Set<Resource> resources) {
+ this.resources = resources;
+ }
+
+ /**
+ * Adds the provided source to this builder, it will be included in any
+ * subsequently built generator context.
+ *
+ * @param source source to be added
+ */
+ public GeneratorContextBuilder add(Source source) {
+ resources.add(new StubResource(source));
+ return this;
+ }
+
+ /**
+ * Returns a newly created {@link GeneratorContext} based on the sources
+ * added to this builder.
+ */
+ public GeneratorContext buildGeneratorContext() {
+ // TODO: Add ability to add property values later and add them to this
+ // context.
+ return new StandardGeneratorContext(buildCompilationState(), null, null, null, false);
+ }
+
+ /**
+ * Sets a custom logger on for this generator context.
+ * <p>
+ * If no custom logger is set, errors will be printed to {@code System.err}.
+ */
+ public void setTreeLogger(TreeLogger treeLogger) {
+ this.treeLogger = treeLogger;
+ }
+
+ private CompilationState buildCompilationState() {
+ TreeLogger logger = treeLogger != null ? treeLogger : createLogger();
+ return new CompilationStateBuilder().doBuildFrom(logger, resources, null, false);
+ }
+
+ private TreeLogger createLogger() {
+ PrintWriterTreeLogger logger = new PrintWriterTreeLogger(new PrintWriter(
+ System.err, true));
+ logger.setMaxDetail(TreeLogger.ERROR);
+ return logger;
+ }
+
+ private static class StubResource extends MockResource {
+
+ private final Source source;
+
+ public StubResource(Source source) {
+ super(source.getPath());
+ this.source = source;
+ }
+
+ @Override
+ public CharSequence getContent() {
+ return source.getSource();
+ }
+ }
+}
diff --git a/dev/core/src/com/google/gwt/dev/javac/testing/JavaSource.java b/dev/core/src/com/google/gwt/dev/javac/testing/JavaSource.java
new file mode 100644
index 0000000..d432753
--- /dev/null
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/JavaSource.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.javac.testing;
+
+import com.google.gwt.dev.javac.Shared;
+
+/**
+ * Convenience base class for java sources used during testing.
+ */
+public abstract class JavaSource implements Source {
+
+ private final String path;
+
+ /**
+ * Constructs a new source with the given fully qualified java type name.
+ *
+ * @param typeName fully qualified java type name, cannot be a nested class
+ */
+ public JavaSource(String typeName) {
+ this.path = Shared.toPath(typeName);
+ }
+
+ @Override
+ public String getPath() {
+ return path;
+ }
+}
diff --git a/dev/core/src/com/google/gwt/dev/javac/testing/Source.java b/dev/core/src/com/google/gwt/dev/javac/testing/Source.java
new file mode 100644
index 0000000..4544a2f
--- /dev/null
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/Source.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.javac.testing;
+
+/**
+ * Sources used to provide content to a {@link GeneratorContext} when testing
+ * generators.
+ */
+public interface Source {
+
+ /**
+ * Returns the source path of this source fragment within the compilation,
+ * for example {@code com/example/client/Foo.java} or
+ * {@code com/example/public/bar.css}.
+ */
+ String getPath();
+
+ /**
+ * Returns the contents of this source fragment.
+ */
+ String getSource();
+}
diff --git a/dev/core/test/com/google/gwt/dev/javac/impl/JavaResourceBase.java b/dev/core/src/com/google/gwt/dev/javac/testing/impl/JavaResourceBase.java
similarity index 92%
rename from dev/core/test/com/google/gwt/dev/javac/impl/JavaResourceBase.java
rename to dev/core/src/com/google/gwt/dev/javac/testing/impl/JavaResourceBase.java
index 016e933..2153f51 100644
--- a/dev/core/test/com/google/gwt/dev/javac/impl/JavaResourceBase.java
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/impl/JavaResourceBase.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.dev.javac.impl;
+package com.google.gwt.dev.javac.testing.impl;
/**
* Contains standard Java source files for testing.
@@ -23,7 +23,7 @@
public static final MockJavaResource ANNOTATION = new MockJavaResource(
"java.lang.annotation.Annotation") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang.annotation;\n");
code.append("public interface Annotation {\n");
@@ -33,7 +33,7 @@
};
public static final MockJavaResource BAR = new MockJavaResource("test.Bar") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Bar extends Foo {\n");
@@ -45,7 +45,7 @@
public static final MockJavaResource BYTE = new MockJavaResource(
"java.lang.Byte") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Byte extends Number {\n");
@@ -62,7 +62,7 @@
public static final MockJavaResource CHARACTER = new MockJavaResource(
"java.lang.Character") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Character {\n");
@@ -79,7 +79,7 @@
public static final MockJavaResource CLASS = new MockJavaResource(
"java.lang.Class") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Class<T> {\n");
@@ -92,7 +92,7 @@
public static final MockJavaResource CLASS_NOT_FOUND_EXCEPTION = new MockJavaResource(
"java.lang.ClassNotFoundException") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class ClassNotFoundException extends Exception {\n");
@@ -108,7 +108,7 @@
public static final MockJavaResource COLLECTION = new MockJavaResource(
"java.util.Collection") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.util;\n");
code.append("public interface Collection<E> {\n");
@@ -119,7 +119,7 @@
public static final MockJavaResource DOUBLE = new MockJavaResource(
"java.lang.Double") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Double extends Number {\n");
@@ -137,7 +137,7 @@
public static final MockJavaResource ENUM = new MockJavaResource(
"java.lang.Enum") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("import java.io.Serializable;\n");
@@ -152,7 +152,7 @@
public static final MockJavaResource ERROR = new MockJavaResource(
"java.lang.Error") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Error extends Throwable {\n");
@@ -163,7 +163,7 @@
public static final MockJavaResource EXCEPTION = new MockJavaResource(
"java.lang.Exception") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Exception extends Throwable {\n");
@@ -174,7 +174,7 @@
public static final MockJavaResource FLOAT = new MockJavaResource(
"java.lang.Float") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Float extends Number {\n");
@@ -190,7 +190,7 @@
};
public static final MockJavaResource FOO = new MockJavaResource("test.Foo") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Foo {\n");
@@ -202,7 +202,7 @@
public static final MockJavaResource INTEGER = new MockJavaResource(
"java.lang.Integer") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Integer extends Number {\n");
@@ -219,7 +219,7 @@
public static final MockJavaResource IS_SERIALIZABLE = new MockJavaResource(
"com.google.gwt.user.client.rpc.IsSerializable") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.rpc;\n");
code.append("public interface IsSerializable {\n");
@@ -230,7 +230,7 @@
public static final MockJavaResource JAVASCRIPTOBJECT = new MockJavaResource(
"com.google.gwt.core.client.JavaScriptObject") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.core.client;\n");
code.append("public class JavaScriptObject {\n");
@@ -244,7 +244,7 @@
public static final MockJavaResource LONG = new MockJavaResource(
"java.lang.Long") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Long extends Number {\n");
@@ -261,7 +261,7 @@
public static final MockJavaResource MAP = new MockJavaResource(
"java.util.Map") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.util;\n");
code.append("public interface Map<K,V> { }\n");
@@ -271,7 +271,7 @@
public static final MockJavaResource NO_CLASS_DEF_FOUND_ERROR = new MockJavaResource(
"java.lang.NoClassDefFoundError") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class NoClassDefFoundError extends Error {\n");
@@ -284,7 +284,7 @@
public static final MockJavaResource NUMBER = new MockJavaResource(
"java.lang.Number") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Number implements java.io.Serializable {\n");
@@ -296,7 +296,7 @@
public static final MockJavaResource OBJECT = new MockJavaResource(
"java.lang.Object") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Object {\n");
@@ -310,7 +310,7 @@
public static final MockJavaResource SERIALIZABLE = new MockJavaResource(
"java.io.Serializable") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.io;\n");
code.append("public interface Serializable { }\n");
@@ -320,7 +320,7 @@
public static final MockJavaResource SHORT = new MockJavaResource(
"java.lang.Short") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Short extends Number {\n");
@@ -337,7 +337,7 @@
public static final MockJavaResource STRING = new MockJavaResource(
"java.lang.String") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("import java.io.Serializable;\n");
@@ -365,7 +365,7 @@
public static final MockJavaResource STRING_BUILDER = new MockJavaResource(
"java.lang.StringBuilder") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public final class StringBuilder {\n");
@@ -376,7 +376,7 @@
public static final MockJavaResource SUPPRESS_WARNINGS = new MockJavaResource(
"java.lang.SuppressWarnings") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public @interface SuppressWarnings {\n");
@@ -388,7 +388,7 @@
public static final MockJavaResource THROWABLE = new MockJavaResource(
"java.lang.Throwable") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class Throwable {\n");
diff --git a/dev/core/test/com/google/gwt/dev/javac/impl/MockJavaResource.java b/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockJavaResource.java
similarity index 88%
rename from dev/core/test/com/google/gwt/dev/javac/impl/MockJavaResource.java
rename to dev/core/src/com/google/gwt/dev/javac/testing/impl/MockJavaResource.java
index 2bef3eb..4fe71c1 100644
--- a/dev/core/test/com/google/gwt/dev/javac/impl/MockJavaResource.java
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockJavaResource.java
@@ -13,10 +13,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.dev.javac.impl;
+package com.google.gwt.dev.javac.testing.impl;
import com.google.gwt.dev.javac.Shared;
+/**
+ * Convenience base class for mock resources representing a java type.
+ */
public abstract class MockJavaResource extends MockResource {
private final String qualifiedTypeName;
diff --git a/dev/core/test/com/google/gwt/dev/javac/impl/MockResource.java b/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResource.java
similarity index 95%
rename from dev/core/test/com/google/gwt/dev/javac/impl/MockResource.java
rename to dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResource.java
index cef9012..3113831 100644
--- a/dev/core/test/com/google/gwt/dev/javac/impl/MockResource.java
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResource.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.dev.javac.impl;
+package com.google.gwt.dev.javac.testing.impl;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.Util;
@@ -48,6 +48,8 @@
this.path = path;
}
+ public abstract CharSequence getContent();
+
@Override
public long getLastModified() {
return creationTime;
@@ -77,8 +79,6 @@
return false;
}
- protected abstract CharSequence getContent();
-
protected void touch() {
creationTime = getNextCreationTime();
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/impl/MockResourceOracle.java b/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResourceOracle.java
similarity index 81%
rename from dev/core/test/com/google/gwt/dev/javac/impl/MockResourceOracle.java
rename to dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResourceOracle.java
index a280b1b..5e57523 100644
--- a/dev/core/test/com/google/gwt/dev/javac/impl/MockResourceOracle.java
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResourceOracle.java
@@ -13,13 +13,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.dev.javac.impl;
+package com.google.gwt.dev.javac.testing.impl;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.resource.ResourceOracle;
-import junit.framework.Assert;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -42,7 +40,10 @@
Map<String, Resource> newMap = new HashMap<String, Resource>(exportedMap);
for (Resource resource : resources) {
String path = resource.getPath();
- Assert.assertFalse(newMap.containsKey(path));
+ if (newMap.containsKey(path)) {
+ throw new IllegalArgumentException(String.format(
+ "Encountered two resources with the same path [%s]", path));
+ }
newMap.put(path, resource);
}
export(newMap);
@@ -75,7 +76,10 @@
Map<String, Resource> newMap = new HashMap<String, Resource>(exportedMap);
for (String path : paths) {
Resource oldValue = newMap.remove(path);
- Assert.assertNotNull(oldValue);
+ if (oldValue == null) {
+ throw new IllegalArgumentException(String.format(
+ "Attempted to remove non-existing resource with path [%s]", path));
+ }
}
export(newMap);
}
@@ -84,7 +88,10 @@
Map<String, Resource> newMap = new HashMap<String, Resource>(exportedMap);
for (Resource resource : resources) {
String path = resource.getPath();
- Assert.assertTrue(newMap.containsKey(path));
+ if (!newMap.containsKey(path)) {
+ throw new IllegalArgumentException(String.format(
+ "Attempted to replace non-existing resource with path [%s]", path));
+ }
newMap.put(path, resource);
}
export(newMap);
diff --git a/dev/core/test/com/google/gwt/dev/javac/impl/StaticJavaResource.java b/dev/core/src/com/google/gwt/dev/javac/testing/impl/StaticJavaResource.java
similarity index 86%
rename from dev/core/test/com/google/gwt/dev/javac/impl/StaticJavaResource.java
rename to dev/core/src/com/google/gwt/dev/javac/testing/impl/StaticJavaResource.java
index ddfaf64..2917a68 100644
--- a/dev/core/test/com/google/gwt/dev/javac/impl/StaticJavaResource.java
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/impl/StaticJavaResource.java
@@ -13,8 +13,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.dev.javac.impl;
+package com.google.gwt.dev.javac.testing.impl;
+/**
+ * Java resource with unchanging contents.
+ */
public class StaticJavaResource extends MockJavaResource {
private final CharSequence source;
@@ -25,7 +28,7 @@
}
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return source;
}
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/BytecodeSignatureMakerTest.java b/dev/core/test/com/google/gwt/dev/javac/BytecodeSignatureMakerTest.java
index 8cf53b0..fa1d8ec 100644
--- a/dev/core/test/com/google/gwt/dev/javac/BytecodeSignatureMakerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/BytecodeSignatureMakerTest.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.javac;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import org.eclipse.jdt.core.compiler.CategorizedProblem;
@@ -29,7 +29,7 @@
final MockJavaResource CLASS_DEP_ORIG =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -50,7 +50,7 @@
final MockJavaResource CLASS_DEP_NO_CHANGE =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -70,7 +70,7 @@
final MockJavaResource CLASS_DEP_NO_PRIVATE =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -90,7 +90,7 @@
final MockJavaResource CLASS_DEP_NO_PROTECTED_FIELD =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -110,7 +110,7 @@
final MockJavaResource CLASS_DEP_NO_DEFAULT_FIELD =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -130,7 +130,7 @@
final MockJavaResource CLASS_DEP_NO_PUBLIC_FIELD =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -150,7 +150,7 @@
final MockJavaResource CLASS_DEP_FIELD_VALUE_CHANGE =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -171,7 +171,7 @@
final MockJavaResource CLASS_DEP_ORDER =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -193,7 +193,7 @@
final MockJavaResource CLASS_DEP_INNER =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -217,7 +217,7 @@
final MockJavaResource CLASS_DEP_DEPRECATED_FIELD =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -238,7 +238,7 @@
final MockJavaResource CLASS_DEP_DEPRECATED_METHOD =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -260,7 +260,7 @@
final MockJavaResource CLASS_DEP_ANNOTATED_FIELD =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -281,7 +281,7 @@
final MockJavaResource CLASS_DEP_ANNOTATED_METHOD =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -302,7 +302,7 @@
final MockJavaResource CLASS_DEP_JAVADOC =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -326,7 +326,7 @@
final MockJavaResource TEST_ANNOTATION =
new MockJavaResource("test.TestAnnotation") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public @interface TestAnnotation {\n");
@@ -364,7 +364,7 @@
MockJavaResource ILLEGAL_STATE_EXCEPTION =
new MockJavaResource("java.lang.IllegalStateException") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class IllegalStateException extends Throwable {}\n");
@@ -374,7 +374,7 @@
MockJavaResource NUMBER_FORMAT_EXCEPTION =
new MockJavaResource("java.lang.NumberFormatException") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("public class NumberFormatException extends Throwable {}\n");
@@ -384,7 +384,7 @@
MockJavaResource CLASS_DEP_EXCEPTION_ORIG =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -399,7 +399,7 @@
MockJavaResource CLASS_DEP_EXCEPTION_MOD1 =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -412,7 +412,7 @@
MockJavaResource CLASS_DEP_EXCEPTION_MOD2 =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -428,7 +428,7 @@
MockJavaResource CLASS_DEP_EXCEPTION_MOD3 =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency {\n");
@@ -456,7 +456,7 @@
MockJavaResource CLASS_DEP_GENERIC_ORIG =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class ClassDependency<T> {\n");
@@ -468,7 +468,7 @@
MockJavaResource CLASS_DEP_GENERIC_PARAMETERIZED =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import java.util.Map;");
@@ -487,7 +487,7 @@
MockJavaResource CLASS_DEP_INTERFACE_ORIG =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import java.util.Map;");
@@ -501,7 +501,7 @@
MockJavaResource CLASS_DEP_INTERFACE_MOD1 =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import java.util.Map;");
@@ -516,7 +516,7 @@
MockJavaResource CLASS_DEP_INTERFACE_MOD2 =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import java.util.Map;");
@@ -531,7 +531,7 @@
MockJavaResource CLASS_DEP_INTERFACE_MOD3 =
new MockJavaResource(CLASS_DEP_TYPE_NAME) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import java.util.Map;");
diff --git a/dev/core/test/com/google/gwt/dev/javac/CheckerTestCase.java b/dev/core/test/com/google/gwt/dev/javac/CheckerTestCase.java
index 35db317..81bbe10 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CheckerTestCase.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CheckerTestCase.java
@@ -18,7 +18,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.UnitTestTreeLogger;
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java b/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java
index 3bc7f6c..864df5d 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java
@@ -16,10 +16,9 @@
package com.google.gwt.dev.javac;
import com.google.gwt.dev.javac.Dependencies.Ref;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
-import com.google.gwt.dev.javac.impl.MockResourceOracle;
-import com.google.gwt.dev.javac.impl.TweakedMockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockResourceOracle;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.js.JsParser;
import com.google.gwt.dev.js.JsSourceGenerationVisitor;
@@ -51,7 +50,7 @@
private static final MockJavaResource FOO_DIFF_API =
new MockJavaResource("test.Foo") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Foo {\n");
@@ -65,7 +64,7 @@
private static final MockJavaResource FOO_SAME_API =
new MockJavaResource("test.Foo") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Foo {\n");
@@ -147,7 +146,7 @@
MockJavaResource badFoo =
new MockJavaResource(Shared.getTypeName(JavaResourceBase.FOO)) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return "compilation error LOL!";
}
};
@@ -252,7 +251,7 @@
public void testMethodArgs() {
MockJavaResource resource = new MockJavaResource("test.MethodArgsTest") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public abstract class MethodArgsTest {\n");
@@ -303,7 +302,7 @@
MockJavaResource resource = new MockJavaResource("test.SerializationTest") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public abstract class SerializationTest {\n");
@@ -587,4 +586,22 @@
// Need to test deserialization of origMethod.function()?
}
}
+
+ /**
+ * Java resource that modifies its content with a terminating newline.
+ */
+ public static class TweakedMockJavaResource extends MockJavaResource {
+
+ private MockJavaResource original;
+
+ public TweakedMockJavaResource(MockJavaResource original) {
+ super(original.getTypeName());
+ this.original = original;
+ }
+
+ @Override
+ public CharSequence getContent() {
+ return original.getContent() + "\n";
+ }
+ }
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompilationStateTestBase.java b/dev/core/test/com/google/gwt/dev/javac/CompilationStateTestBase.java
index 7f9b3b4..0bc1d59 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompilationStateTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompilationStateTestBase.java
@@ -16,9 +16,9 @@
package com.google.gwt.dev.javac;
import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockResource;
-import com.google.gwt.dev.javac.impl.MockResourceOracle;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockResource;
+import com.google.gwt.dev.javac.testing.impl.MockResourceOracle;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompilationUnitFileReferenceTest.java b/dev/core/test/com/google/gwt/dev/javac/CompilationUnitFileReferenceTest.java
index 5c6a2ce..c9e20ab 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompilationUnitFileReferenceTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompilationUnitFileReferenceTest.java
@@ -16,8 +16,8 @@
package com.google.gwt.dev.javac;
import com.google.gwt.dev.javac.Dependencies.Ref;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.resource.Resource;
import java.util.HashMap;
@@ -33,7 +33,7 @@
public static final MockJavaResource MEMBER_INNER_SUBCLASS =
new MockJavaResource("test.OuterSubclass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class OuterSubclass extends Outer {\n");
@@ -49,7 +49,7 @@
public static final MockJavaResource NOPACKAGE =
new MockJavaResource("NoPackage") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("public class NoPackage extends test.Top {\n");
code.append(" public String value() { return \"NoPackage\"; }\n");
@@ -61,7 +61,7 @@
public static final MockJavaResource NOPACKAGE2 =
new MockJavaResource("NoPackage2") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("public class NoPackage2 extends NoPackage {\n");
code.append(" public String value() { return \"NoPackage2\"; }\n");
@@ -73,7 +73,7 @@
public static final MockJavaResource OUTER =
new MockJavaResource("test.Outer") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Outer {\n");
@@ -92,7 +92,7 @@
public static final MockJavaResource STATIC_INNER_SUBCLASS =
new MockJavaResource("test.StaticInnerSubclass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class StaticInnerSubclass extends Outer.StaticInner {\n");
@@ -104,7 +104,7 @@
public static final MockJavaResource TOP = new MockJavaResource("test.Top") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Top {\n");
@@ -120,7 +120,7 @@
public static final MockJavaResource TOP3 =
new MockJavaResource("test.Top3") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Top3 extends Top2 {\n");
@@ -161,7 +161,8 @@
OUTER.getTypeName(), "test.Outer$StaticInner");
}
- private static void initializeExpectedDependency(MockJavaResource source,
+ private static void initializeExpectedDependency(
+ MockJavaResource source,
String... typeNames) {
Set<String> targetSet = new HashSet<String>();
for (String typeName : typeNames) {
diff --git a/dev/core/test/com/google/gwt/dev/javac/JSORestrictionsTest.java b/dev/core/test/com/google/gwt/dev/javac/JSORestrictionsTest.java
index 4508f09..c215bba 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JSORestrictionsTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/JSORestrictionsTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.dev.javac;
import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.UnitTestTreeLogger;
diff --git a/dev/core/test/com/google/gwt/dev/javac/JavaSourceParserTest.java b/dev/core/test/com/google/gwt/dev/javac/JavaSourceParserTest.java
index 2b7b4e8..6493df3 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JavaSourceParserTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/JavaSourceParserTest.java
@@ -18,7 +18,7 @@
import com.google.gwt.core.ext.typeinfo.JPrimitiveType;
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.javac.typemodel.JClassType;
import com.google.gwt.dev.javac.typemodel.JMethod;
@@ -32,7 +32,7 @@
private static final MockJavaResource BAR = new MockJavaResource("test.Bar") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Bar {\n");
@@ -46,7 +46,7 @@
private static final MockJavaResource BAZ = new MockJavaResource("test.Baz") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Baz {\n");
@@ -65,7 +65,7 @@
private static final MockJavaResource FOO = new MockJavaResource("test.Foo") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Foo {\n");
@@ -78,7 +78,7 @@
private static final MockJavaResource FOO_INT = new MockJavaResource(
"test.FooInt") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public interface FooInt {\n");
diff --git a/dev/core/test/com/google/gwt/dev/javac/JdtBehaviorTest.java b/dev/core/test/com/google/gwt/dev/javac/JdtBehaviorTest.java
index d23e9c9..f00e35f 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JdtBehaviorTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/JdtBehaviorTest.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.javac;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockResource;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java b/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java
index 03185bf..6b1c417 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.dev.javac;
import com.google.gwt.dev.javac.CompilationUnitBuilder.ResourceCompilationUnitBuilder;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
import com.google.gwt.dev.resource.Resource;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/javac/JsniCollectorTest.java b/dev/core/test/com/google/gwt/dev/javac/JsniCollectorTest.java
index afe4107..b11e2f7 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JsniCollectorTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/JsniCollectorTest.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.javac;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.js.ast.JsContext;
import com.google.gwt.dev.js.ast.JsNameRef;
diff --git a/dev/core/test/com/google/gwt/dev/javac/TypeOracleMediatorTestBase.java b/dev/core/test/com/google/gwt/dev/javac/TypeOracleMediatorTestBase.java
index 364d47d..e2cd44a 100644
--- a/dev/core/test/com/google/gwt/dev/javac/TypeOracleMediatorTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/javac/TypeOracleMediatorTestBase.java
@@ -32,8 +32,6 @@
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.core.ext.typeinfo.TypeOracleException;
import com.google.gwt.dev.javac.TypeOracleMediator.TypeData;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
import com.google.gwt.dev.javac.mediatortest.AfterAssimilate;
import com.google.gwt.dev.javac.mediatortest.BaseInterface;
import com.google.gwt.dev.javac.mediatortest.BeforeAssimilate;
@@ -60,6 +58,8 @@
import com.google.gwt.dev.javac.mediatortest.OuterInt;
import com.google.gwt.dev.javac.mediatortest.ReferencesGenericListConstant;
import com.google.gwt.dev.javac.mediatortest.ReferencesParameterizedTypeBeforeItsGenericFormHasBeenProcessed;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
@@ -192,7 +192,7 @@
* Looks for the source data on the classpath.
*/
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
String source = getSource();
if (source == null) {
try {
diff --git a/dev/core/test/com/google/gwt/dev/javac/TypeOracleTestingUtils.java b/dev/core/test/com/google/gwt/dev/javac/TypeOracleTestingUtils.java
index 3bfa0f4..a846741 100644
--- a/dev/core/test/com/google/gwt/dev/javac/TypeOracleTestingUtils.java
+++ b/dev/core/test/com/google/gwt/dev/javac/TypeOracleTestingUtils.java
@@ -17,7 +17,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
import com.google.gwt.dev.resource.Resource;
import java.util.Arrays;
diff --git a/dev/core/test/com/google/gwt/dev/javac/impl/TweakedMockJavaResource.java b/dev/core/test/com/google/gwt/dev/javac/impl/TweakedMockJavaResource.java
deleted file mode 100644
index 8e57cb8..0000000
--- a/dev/core/test/com/google/gwt/dev/javac/impl/TweakedMockJavaResource.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.dev.javac.impl;
-
-public class TweakedMockJavaResource extends MockJavaResource {
-
- private MockJavaResource original;
-
- public TweakedMockJavaResource(MockJavaResource original) {
- super(original.getTypeName());
- this.original = original;
- }
-
- @Override
- public CharSequence getContent() {
- return original.getContent() + "\n";
- }
-}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java b/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
index 10db7b3..97d8883 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
@@ -18,8 +18,8 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.CompilationState;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jdt.AbstractCompiler.CompilationResults;
import com.google.gwt.dev.jdt.BasicWebModeCompiler;
import com.google.gwt.dev.jdt.FindDeferredBindingSitesVisitor;
@@ -29,10 +29,10 @@
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.impl.AssertionNormalizer;
import com.google.gwt.dev.jjs.impl.BuildTypeMap;
-import com.google.gwt.dev.jjs.impl.ImplementClassLiteralsAsFields;
-import com.google.gwt.dev.jjs.impl.TypeLinker;
import com.google.gwt.dev.jjs.impl.FixAssignmentToUnbox;
import com.google.gwt.dev.jjs.impl.GenerateJavaAST;
+import com.google.gwt.dev.jjs.impl.ImplementClassLiteralsAsFields;
+import com.google.gwt.dev.jjs.impl.TypeLinker;
import com.google.gwt.dev.jjs.impl.TypeMap;
import com.google.gwt.dev.js.ast.JsProgram;
@@ -54,7 +54,7 @@
public static final MockJavaResource ARRAY = new MockJavaResource(
"com.google.gwt.lang.Array") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.lang;\n");
code.append("public final class Array {\n");
@@ -67,7 +67,7 @@
public static final MockJavaResource CAST = new MockJavaResource(
"com.google.gwt.lang.Cast") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.lang;\n");
code.append("public final class Cast {\n");
@@ -83,7 +83,7 @@
public static final MockJavaResource CLASS = new MockJavaResource(
"java.lang.Class") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
// This has extra code in the createForEnum method, to keep it from being inlined
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
@@ -122,7 +122,7 @@
public static final MockJavaResource CLASSLITERALHOLDER = new MockJavaResource(
"com.google.gwt.lang.ClassLiteralHolder") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.lang;\n");
code.append("final class ClassLiteralHolder {\n");
@@ -133,7 +133,7 @@
public static final MockJavaResource ENUM = new MockJavaResource(
"java.lang.Enum") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package java.lang;\n");
code.append("import java.io.Serializable;\n");
@@ -160,7 +160,7 @@
public static final MockJavaResource GWT = new MockJavaResource(
"com.google.gwt.core.client.GWT") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.core.client;\n");
code.append("public final class GWT {\n");
@@ -176,7 +176,7 @@
public static final MockJavaResource RUNASYNCCALLBACK = new MockJavaResource(
"com.google.gwt.core.client.RunAsyncCallback") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.core.client;\n");
code.append("public interface RunAsyncCallback { }\n");
@@ -186,7 +186,7 @@
public static final MockJavaResource STATS = new MockJavaResource(
"com.google.gwt.lang.Stats") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.lang;\n");
code.append("public class Stats {\n");
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/AdditionalTypeProviderDelegateTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/AdditionalTypeProviderDelegateTest.java
index fe732e7..03c9120 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/AdditionalTypeProviderDelegateTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/AdditionalTypeProviderDelegateTest.java
@@ -18,7 +18,7 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.GeneratedUnit;
import com.google.gwt.dev.javac.JdtCompiler.AdditionalTypeProviderDelegate;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
@@ -76,7 +76,7 @@
// Create a source class that passes fine (just to test infrastructure.)
sourceOracle.addOrReplace(new MockJavaResource("test.A") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("class A {\n");
@@ -92,7 +92,7 @@
// by the AdditionalTypeProviderDelegate.
sourceOracle.addOrReplace(new MockJavaResource("test.B") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import myPackage.InsertedClass;");
@@ -111,7 +111,7 @@
// class anyway?
sourceOracle.addOrReplace(new MockJavaResource("test.B1") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("class B1 {\n");
@@ -127,7 +127,7 @@
// Create a source file containing a reference to an unknown class.
sourceOracle.addOrReplace(new MockJavaResource("test.C") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import myPackage.UnknownClass;");
@@ -145,7 +145,7 @@
// import statement.
sourceOracle.addOrReplace(new MockJavaResource("test.D") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("class D {\n");
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
index 6291398..8488901 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.dev.jjs.impl;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JField;
import com.google.gwt.dev.jjs.ast.JMethod;
@@ -105,7 +105,7 @@
public void testRescueJavaScriptObjectFromJsni() throws Exception {
sourceOracle.addOrReplace(new MockJavaResource("test.JsoIntf") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;");
code.append("import com.google.gwt.core.client.JavaScriptObject;\n");
@@ -118,7 +118,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.UpRefIntf") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;");
code.append("import com.google.gwt.core.client.JavaScriptObject;\n");
@@ -131,7 +131,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.NonImplementor") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;");
code.append("import com.google.gwt.core.client.JavaScriptObject;\n");
@@ -145,7 +145,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.VirtualUpRef") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;");
code.append("import com.google.gwt.core.client.JavaScriptObject;\n");
@@ -159,7 +159,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.SingleJso") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;");
code.append("import com.google.gwt.core.client.JavaScriptObject;\n");
@@ -175,7 +175,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.Foo") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import com.google.gwt.core.client.JavaScriptObject;\n");
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ExpressionAnalyzerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ExpressionAnalyzerTest.java
index bdf7ffa..7cf1909 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ExpressionAnalyzerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ExpressionAnalyzerTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.dev.jjs.impl;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JMethodBody;
import com.google.gwt.dev.jjs.ast.JProgram;
@@ -119,7 +119,7 @@
public void testFieldAccessClinit() throws Exception {
sourceOracle.addOrReplace(new MockJavaResource("test.Foo") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Foo {\n");
@@ -135,7 +135,7 @@
public void testFieldAccessInstance() throws Exception {
sourceOracle.addOrReplace(new MockJavaResource("test.Foo") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import com.google.gwt.core.client.JavaScriptObject;\n");
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/JEnumTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/JEnumTest.java
index a8904f5..8274374 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/JEnumTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/JEnumTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.dev.jjs.impl;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JEnumField;
import com.google.gwt.dev.jjs.ast.JField;
@@ -33,7 +33,7 @@
public void setUp() {
sourceOracle.addOrReplace(new MockJavaResource("test.Simple") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public enum Simple {\n");
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
index 82f673f..21ae7b5 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
@@ -20,8 +20,8 @@
import com.google.gwt.dev.javac.CompilationState;
import com.google.gwt.dev.javac.CompilationStateBuilder;
import com.google.gwt.dev.javac.JdtCompiler.AdditionalTypeProviderDelegate;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
-import com.google.gwt.dev.javac.impl.MockResourceOracle;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockResourceOracle;
import com.google.gwt.dev.jjs.JavaAstConstructor;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
@@ -216,7 +216,7 @@
throws UnableToCompleteException {
sourceOracle.addOrReplace(new MockJavaResource("test.EntryPoint") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
for (String snippetImport : snippetImports) {
@@ -245,7 +245,7 @@
protected void addBuiltinClasses(MockResourceOracle sourceOracle) {
sourceOracle.addOrReplace(new MockJavaResource("java.lang.RuntimeException") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return "package java.lang;" +
"public class RuntimeException extends Exception { }";
}
@@ -253,7 +253,7 @@
sourceOracle.addOrReplace(new MockJavaResource("com.google.gwt.lang.Exceptions") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return "package com.google.gwt.lang;" +
"public class Exceptions { static boolean throwAssertionError() { throw new RuntimeException(); } }";
}
@@ -261,7 +261,7 @@
sourceOracle.addOrReplace(new MockJavaResource("java.lang.String") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return "package java.lang;" +
"public class String {" +
" public int length() { return 0; }" +
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/JsniRefLookupTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/JsniRefLookupTest.java
index f9a6557..2b850ca 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/JsniRefLookupTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/JsniRefLookupTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.dev.jjs.impl;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jjs.ast.JField;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JNode;
@@ -51,7 +51,7 @@
public void setUp() {
sourceOracle.addOrReplace(new MockJavaResource("test.Intf") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public interface Intf {\n");
@@ -66,7 +66,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.Foo") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Foo implements Intf {\n");
@@ -87,7 +87,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.Bar") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class Bar extends Foo {\n");
@@ -102,7 +102,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.GenericClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public abstract class GenericClass<T> {\n");
@@ -114,7 +114,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.ClassWithBridge") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("class ClassWithBridge extends GenericClass<String> {\n");
@@ -126,7 +126,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.PrivateSup") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class PrivateSup {\n");
@@ -141,7 +141,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.PrivateSub") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public class PrivateSub extends PrivateSup {\n");
@@ -155,7 +155,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.DiffRetSuper") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public interface DiffRetSuper {\n");
@@ -167,7 +167,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.DiffRetSub") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("public interface DiffRetSub extends DiffRetSuper {\n");
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncsErrorMessagesTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncsErrorMessagesTest.java
index 2c57702..d71ca6f 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncsErrorMessagesTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncsErrorMessagesTest.java
@@ -18,7 +18,7 @@
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.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.util.UnitTestTreeLogger;
@@ -37,7 +37,7 @@
public void testAmbiguousClassLiteral() {
sourceOracle.addOrReplace(new MockJavaResource("test.SplitPoint3") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import com.google.gwt.core.client.GWT;\n");
@@ -73,7 +73,7 @@
sourceOracle.addOrReplace(new MockJavaResource(
"com.google.gwt.lang.asyncloaders.AsyncLoader" + sp) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.lang.asyncloaders;\n");
code.append("import com.google.gwt.core.client.RunAsyncCallback;");
@@ -92,7 +92,7 @@
"com.google.gwt.lang.asyncloaders.AsyncLoader" + sp
+ FragmentLoaderCreator.CALLBACK_LIST_SUFFIX) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.lang.asyncloaders;\n");
code.append("import com.google.gwt.core.client.RunAsyncCallback;");
@@ -116,7 +116,7 @@
sourceOracle.addOrReplace(new MockJavaResource(
"com.google.gwt.core.client.impl.AsyncFragmentLoader") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.core.client.impl;\n");
code.append("public class AsyncFragmentLoader {\n");
@@ -135,7 +135,7 @@
sourceOracle.addOrReplace(new MockJavaResource(
"com.google.gwt.core.client.prefetch.RunAsyncCode") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.core.client.prefetch;\n");
code.append("public class RunAsyncCode {\n");
@@ -150,7 +150,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.SplitPoint1") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import com.google.gwt.core.client.GWT;\n");
@@ -166,7 +166,7 @@
sourceOracle.addOrReplace(new MockJavaResource("test.SplitPoint2") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import com.google.gwt.core.client.GWT;\n");
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
index f1406f7..758c9b8 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
@@ -17,7 +17,7 @@
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.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.util.UnitTestTreeLogger;
/**
@@ -29,7 +29,7 @@
public void setUp() {
sourceOracle.addOrReplace(new MockJavaResource("test.CallRunAsync") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
code.append("import com.google.gwt.core.client.GWT;\n");
diff --git a/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiCompatibilityTest.java b/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiCompatibilityTest.java
index 862090e..ce90559 100644
--- a/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiCompatibilityTest.java
+++ b/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiCompatibilityTest.java
@@ -18,7 +18,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
diff --git a/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiCompatibilityUnitTest.java b/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiCompatibilityUnitTest.java
index 9289570..0fc43bb 100644
--- a/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiCompatibilityUnitTest.java
+++ b/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiCompatibilityUnitTest.java
@@ -18,7 +18,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
diff --git a/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiContainerTest.java b/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiContainerTest.java
index ee9b8b1..f85282c 100644
--- a/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiContainerTest.java
+++ b/tools/api-checker/test/com/google/gwt/tools/apichecker/ApiContainerTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.JAbstractMethod;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
diff --git a/user/test/com/google/gwt/editor/rebind/model/EditorModelTest.java b/user/test/com/google/gwt/editor/rebind/model/EditorModelTest.java
index 3b8d70a..54f9691 100644
--- a/user/test/com/google/gwt/editor/rebind/model/EditorModelTest.java
+++ b/user/test/com/google/gwt/editor/rebind/model/EditorModelTest.java
@@ -22,8 +22,8 @@
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.CompilationState;
import com.google.gwt.dev.javac.CompilationStateBuilder;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.UnitTestTreeLogger;
import com.google.gwt.dev.util.Util;
@@ -91,7 +91,7 @@
}
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return code;
}
}
@@ -101,13 +101,14 @@
* directly tested by this test. Note that use of this class requires your
* source files to be on your classpath.
*/
- private static class RealJavaResource extends MockJavaResource {
+ private static class RealJavaResource extends
+ MockJavaResource {
public RealJavaResource(Class<?> clazz) {
super(clazz.getName());
}
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
String resourceName = getTypeName().replace('.', '/') + ".java";
InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(
resourceName);
@@ -506,7 +507,7 @@
private Set<Resource> getJavaResources() {
MockJavaResource[] javaFiles = {new MockJavaResource("t.AddressProxy") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + EntityProxy.class.getName() + ";\n");
@@ -520,7 +521,7 @@
}
}, new MockJavaResource("t.AddressEditor") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -533,7 +534,7 @@
}
}, new MockJavaResource("t.CompositeProxy") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + EntityProxy.class.getName() + ";\n");
@@ -545,7 +546,7 @@
}
}, new MockJavaResource("t.CompositeEditor") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -557,7 +558,7 @@
}
}, new MockJavaResource("t.CompositeEditorDriver") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactoryEditorDriver.class.getName()
@@ -569,7 +570,7 @@
}, new MockJavaResource("t.CyclicEditorDriver") {
// Tests error-detection when the editor graph isn't a DAG
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -593,7 +594,7 @@
}, new MockJavaResource("t.DottedPathEditorDriver") {
// Tests error-detection when the editor graph isn't a DAG
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -615,7 +616,7 @@
}, new MockJavaResource("t.ListEditor") {
// Tests error-detection when the editor graph isn't a DAG
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + CompositeEditor.class.getName() + ";\n");
@@ -626,7 +627,7 @@
}
}, new MockJavaResource("t.ListEditorDriver") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactoryEditorDriver.class.getName()
@@ -639,7 +640,7 @@
// Tests error-detection when the editor structure doesn't match the
// proxy
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -660,7 +661,7 @@
}
}, new MockJavaResource("t.PersonProxy") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + EntityProxy.class.getName() + ";\n");
@@ -676,7 +677,7 @@
}
}, new MockJavaResource("t.PersonEditor") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -693,7 +694,7 @@
}
}, new MockJavaResource("t.PersonEditorWithAliasedSubEditors") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -706,7 +707,7 @@
}
}, new MockJavaResource("t.PersonEditorWithAliasedSubEditorsDriver") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactoryEditorDriver.class.getName()
@@ -718,7 +719,7 @@
}
}, new MockJavaResource("t.PersonEditorWithBadPrimitiveAccess") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -730,7 +731,7 @@
}
}, new MockJavaResource("t.PersonEditorWithBadPrimitiveAccessDriver") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactoryEditorDriver.class.getName()
@@ -742,7 +743,7 @@
}
}, new MockJavaResource("t.PersonEditorUsingMethods") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -758,7 +759,7 @@
}
}, new MockJavaResource("t.PersonEditorDriver") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactoryEditorDriver.class.getName()
@@ -770,7 +771,7 @@
}
}, new MockJavaResource("t.PersonEditorDriverUsingMethods") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactoryEditorDriver.class.getName()
@@ -782,7 +783,7 @@
}
}, new MockJavaResource("t.PersonRequestFactory") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactory.class.getName() + ";\n");
@@ -793,7 +794,7 @@
}, new MockJavaResource("t.TooManyInterfacesEditorDriver") {
// Tests a Driver interface that extends more than RFED
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactoryEditorDriver.class.getName()
@@ -808,7 +809,7 @@
// Tests error-detection when the editor structure doesn't match the
// proxy
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -830,7 +831,7 @@
// Tests error-detection when the editor structure doesn't match the
// proxy
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -860,7 +861,7 @@
// Tests error-detection when the editor structure doesn't match the
// proxy
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -895,7 +896,7 @@
* editor-like fields within the LeafValueEditor are ignored.
*/
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Editor.class.getName() + ";\n");
@@ -926,7 +927,7 @@
}, new MockJavaResource("java.util.List") {
// Tests a Driver interface that extends more than RFED
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package java.util;\n");
code.append("public interface List<T> {\n");
diff --git a/user/test/com/google/gwt/i18n/rebind/LocalizableLinkageCreatorTest.java b/user/test/com/google/gwt/i18n/rebind/LocalizableLinkageCreatorTest.java
index 4706957..bb95f09 100644
--- a/user/test/com/google/gwt/i18n/rebind/LocalizableLinkageCreatorTest.java
+++ b/user/test/com/google/gwt/i18n/rebind/LocalizableLinkageCreatorTest.java
@@ -20,7 +20,7 @@
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.TypeOracleTestingUtils;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.shell.FailErrorLogger;
import com.google.gwt.i18n.server.GwtLocaleFactoryImpl;
import com.google.gwt.i18n.shared.GwtLocale;
@@ -39,7 +39,7 @@
private static final MockJavaResource LOCALIZABLE = new MockJavaResource(
"com.google.gwt.i18n.client.Localizable") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.i18n.client;\n");
code.append("public interface Localizable { }\n");
@@ -50,7 +50,7 @@
private static final MockJavaResource TEST = new MockJavaResource(
"foo.Test") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package foo;\n");
code.append("import com.google.gwt.i18n.client.Localizable;\n");
@@ -62,7 +62,7 @@
private static final MockJavaResource TEST_HE = new MockJavaResource(
"foo.Test_he") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package foo;\n");
code.append("public class Test_he extends Test { }\n");
@@ -73,7 +73,7 @@
private static final MockJavaResource TEST_IW = new MockJavaResource(
"foo.Test_iw") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package foo;\n");
code.append("public class Test_iw extends Test { }\n");
diff --git a/user/test/com/google/gwt/place/rebind/EmptyMockJavaResource.java b/user/test/com/google/gwt/place/rebind/EmptyMockJavaResource.java
index 588b059..eaba417 100644
--- a/user/test/com/google/gwt/place/rebind/EmptyMockJavaResource.java
+++ b/user/test/com/google/gwt/place/rebind/EmptyMockJavaResource.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.place.rebind;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
/**
* Constructs an empty interface representation of a type.
@@ -48,7 +48,7 @@
}
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return code;
}
}
diff --git a/user/test/com/google/gwt/place/rebind/MostToLeastDerivedPlaceTypeComparatorTest.java b/user/test/com/google/gwt/place/rebind/MostToLeastDerivedPlaceTypeComparatorTest.java
index ac66a88..1ae34de 100644
--- a/user/test/com/google/gwt/place/rebind/MostToLeastDerivedPlaceTypeComparatorTest.java
+++ b/user/test/com/google/gwt/place/rebind/MostToLeastDerivedPlaceTypeComparatorTest.java
@@ -20,7 +20,7 @@
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.CompilationState;
import com.google.gwt.dev.javac.CompilationStateBuilder;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
import com.google.gwt.place.shared.Place;
diff --git a/user/test/com/google/gwt/place/rebind/PlaceHistoryGeneratorContextTest.java b/user/test/com/google/gwt/place/rebind/PlaceHistoryGeneratorContextTest.java
index c53795f..623fa5d 100644
--- a/user/test/com/google/gwt/place/rebind/PlaceHistoryGeneratorContextTest.java
+++ b/user/test/com/google/gwt/place/rebind/PlaceHistoryGeneratorContextTest.java
@@ -22,8 +22,8 @@
import com.google.gwt.core.ext.typeinfo.NotFoundException;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.CompilationStateBuilder;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.UnitTestTreeLogger;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
@@ -96,7 +96,7 @@
MockJavaResource intf = new MockJavaResource("my.MyPlaceHistoryMapper") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package my;\n");
code.append("import com.google.gwt.place.shared.PlaceHistoryMapper;\n");
@@ -231,7 +231,7 @@
MockJavaResource intf = new MockJavaResource("my.MyPlaceHistoryMapper") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package my;\n");
code.append("import com.google.gwt.place.shared.PlaceHistoryMapperWithFactory;\n");
@@ -276,7 +276,7 @@
MockJavaResource intf = new MockJavaResource("my.MyPlaceHistoryMapper") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package my;\n");
code.append("import com.google.gwt.place.shared.PlaceHistoryMapperWithFactory;\n");
@@ -322,7 +322,7 @@
MockJavaResource intf = new MockJavaResource("my.MyPlaceHistoryMapper") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package my;\n");
code.append("import com.google.gwt.place.shared.Place;\n");
diff --git a/user/test/com/google/gwt/place/rebind/RealJavaResource.java b/user/test/com/google/gwt/place/rebind/RealJavaResource.java
index d527758..27b9ff2 100644
--- a/user/test/com/google/gwt/place/rebind/RealJavaResource.java
+++ b/user/test/com/google/gwt/place/rebind/RealJavaResource.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.place.rebind;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.util.Util;
import java.io.InputStream;
@@ -34,7 +34,7 @@
}
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
String resourceName = getTypeName().replace('.', '/') + ".java";
InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(
resourceName);
diff --git a/user/test/com/google/gwt/resources/ext/ResourceGeneratorUtilTest.java b/user/test/com/google/gwt/resources/ext/ResourceGeneratorUtilTest.java
index 8830a4a..3da8a0a 100644
--- a/user/test/com/google/gwt/resources/ext/ResourceGeneratorUtilTest.java
+++ b/user/test/com/google/gwt/resources/ext/ResourceGeneratorUtilTest.java
@@ -24,8 +24,8 @@
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.CompilationState;
import com.google.gwt.dev.javac.CompilationStateBuilder;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
@@ -190,7 +190,7 @@
Arrays.asList(JavaResourceBase.getStandardResources()));
res.add(new MockJavaResource("test.A") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package test;");
code.append("interface A {");
@@ -205,7 +205,7 @@
});
res.add(new MockJavaResource("test.B") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package test;");
code.append("abstract class B {");
@@ -217,7 +217,7 @@
});
res.add(new MockJavaResource("test.C") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package test;");
code.append("interface C {");
@@ -228,7 +228,7 @@
});
res.add(new MockJavaResource("test.D") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package test;");
code.append("interface D {");
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/DateLabelParserTest.java b/user/test/com/google/gwt/uibinder/elementparsers/DateLabelParserTest.java
index 131f614..fe84b35 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/DateLabelParserTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/DateLabelParserTest.java
@@ -16,10 +16,10 @@
package com.google.gwt.uibinder.elementparsers;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.gwt.i18n.client.TimeZone;
import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
+import com.google.gwt.i18n.client.TimeZone;
import com.google.gwt.uibinder.rebind.FieldWriter;
import com.google.gwt.user.client.ui.DateLabel;
@@ -36,7 +36,7 @@
private static final MockJavaResource DATELABEL_SUBCLASS_NO_CONSTRUCTOR = new MockJavaResource(
"my.MyDateLabel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.DateLabel;\n");
@@ -48,7 +48,7 @@
private static final MockJavaResource DATELABEL_SUBCLASS_FORMAT_CONSTRUCTOR = new MockJavaResource(
"my.MyConstructedDateLabel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.DateLabel;\n");
@@ -62,7 +62,7 @@
private static final MockJavaResource DATELABEL_SUBCLASS_FORMAT_AND_TZ_CONSTRUCTOR = new MockJavaResource(
"my.MyConstructedDateLabel2") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.DateLabel;\n");
@@ -77,7 +77,7 @@
private static final MockJavaResource DATELABEL_SUBCLASS_TZ_CONSTRUCTOR = new MockJavaResource(
"my.MyConstructedDateLabel3") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.DateLabel;\n");
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/DialogBoxParserTest.java b/user/test/com/google/gwt/uibinder/elementparsers/DialogBoxParserTest.java
index f602362..4dce3fa 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/DialogBoxParserTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/DialogBoxParserTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.uibinder.elementparsers;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.uibinder.rebind.FieldWriter;
import com.google.gwt.user.client.ui.DialogBox;
@@ -35,7 +35,7 @@
private static final MockJavaResource CAPTION_SUBCLASS = new MockJavaResource(
"my.MyCaption") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.DialogBox;\n");
@@ -49,7 +49,7 @@
private static final MockJavaResource DIALOG_SUBCLASS = new MockJavaResource(
"my.MyDialogBox") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.DialogBox;\n");
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/ElementParserTester.java b/user/test/com/google/gwt/uibinder/elementparsers/ElementParserTester.java
index 3d9f200..8aea5b1 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/ElementParserTester.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/ElementParserTester.java
@@ -21,8 +21,8 @@
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.CompilationState;
import com.google.gwt.dev.javac.CompilationStateBuilder;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
-import com.google.gwt.dev.javac.impl.MockResourceOracle;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockResourceOracle;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
import com.google.gwt.uibinder.attributeparsers.AttributeParsers;
@@ -56,7 +56,7 @@
static final MockJavaResource BINDER_OWNER_JAVA = new MockJavaResource(
"my.Ui") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.Widget;\n");
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/ImageParserTest.java b/user/test/com/google/gwt/uibinder/elementparsers/ImageParserTest.java
index 9fd3279..3fa199b 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/ImageParserTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/ImageParserTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.uibinder.elementparsers;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.uibinder.rebind.FieldWriter;
import junit.framework.TestCase;
@@ -32,7 +32,7 @@
private static final MockJavaResource IMAGE_SUBCLASS_NO_CONSTRUCTOR = new MockJavaResource(
"my.MyImage") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.Image;\n");
@@ -44,7 +44,7 @@
private static final MockJavaResource IMAGE_SUBCLASS_RESOURCE_CONSTRUCTOR = new MockJavaResource(
"my.MyConstructedImage") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.Image;\n");
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/MenuBarParserTest.java b/user/test/com/google/gwt/uibinder/elementparsers/MenuBarParserTest.java
index 6b17f98..be0fa96 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/MenuBarParserTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/MenuBarParserTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.uibinder.elementparsers;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.uibinder.rebind.FieldWriter;
import com.google.gwt.user.client.ui.MenuItem;
import com.google.gwt.user.client.ui.MenuItemSeparator;
@@ -116,7 +116,7 @@
MockJavaResource itemSubclass = new MockJavaResource(
"com.google.gwt.user.client.ui.MyItem") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
String superName = MenuItem.class.getCanonicalName();
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
@@ -150,7 +150,7 @@
MockJavaResource itemSubclass = new MockJavaResource(
"com.google.gwt.user.client.ui.MySeparator") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
String superName = MenuItemSeparator.class.getCanonicalName();
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/MenuItemParserTest.java b/user/test/com/google/gwt/uibinder/elementparsers/MenuItemParserTest.java
index ee51770..f0e9b2e 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/MenuItemParserTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/MenuItemParserTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.uibinder.elementparsers;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.uibinder.rebind.FieldWriter;
import com.google.gwt.uibinder.rebind.XMLElement;
import com.google.gwt.user.client.ui.MenuBar;
@@ -108,7 +108,7 @@
MockJavaResource itemSubclass = new MockJavaResource(
"com.google.gwt.user.client.ui.MyItem") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
String superName = MenuItem.class.getCanonicalName();
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
@@ -137,7 +137,7 @@
MockJavaResource barSubclass = new MockJavaResource(
"com.google.gwt.user.client.ui.MyMenuBar") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
String superName = MenuBar.class.getCanonicalName();
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/NumberLabelParserTest.java b/user/test/com/google/gwt/uibinder/elementparsers/NumberLabelParserTest.java
index ddbf9d0..e5c2203 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/NumberLabelParserTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/NumberLabelParserTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.uibinder.elementparsers;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.uibinder.rebind.FieldWriter;
import com.google.gwt.user.client.ui.NumberLabel;
@@ -34,7 +34,7 @@
private static final MockJavaResource NUMBERLABEL_SUBCLASS_NO_CONSTRUCTOR = new MockJavaResource(
"my.MyNumberLabel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.NumberLabel;\n");
@@ -46,7 +46,7 @@
private static final MockJavaResource NUMBERLABEL_SUBCLASS_FORMAT_CONSTRUCTOR = new MockJavaResource(
"my.MyConstructedNumberLabel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package my;\n");
code.append("import com.google.gwt.user.client.ui.NumberLabel;\n");
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/UiChildParserTest.java b/user/test/com/google/gwt/uibinder/elementparsers/UiChildParserTest.java
index b44f18a..9842ee5 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/UiChildParserTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/UiChildParserTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.uibinder.elementparsers;
import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.uibinder.rebind.FieldWriter;
import com.google.gwt.uibinder.rebind.UiBinderContext;
@@ -39,7 +39,7 @@
super.setUp();
MockJavaResource itemSubclass = new MockJavaResource(PARSED_TYPE) {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.uibinder.client.UiChild;\n");
diff --git a/user/test/com/google/gwt/uibinder/rebind/DesignTimeUtilsTest.java b/user/test/com/google/gwt/uibinder/rebind/DesignTimeUtilsTest.java
index 68200eb..032730a 100644
--- a/user/test/com/google/gwt/uibinder/rebind/DesignTimeUtilsTest.java
+++ b/user/test/com/google/gwt/uibinder/rebind/DesignTimeUtilsTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.uibinder.rebind;
import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.dev.javac.impl.MockResourceOracle;
+import com.google.gwt.dev.javac.testing.impl.MockResourceOracle;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/uibinder/rebind/GwtResourceEntityResolverTest.java b/user/test/com/google/gwt/uibinder/rebind/GwtResourceEntityResolverTest.java
index 385f5f4..32b9ca4 100644
--- a/user/test/com/google/gwt/uibinder/rebind/GwtResourceEntityResolverTest.java
+++ b/user/test/com/google/gwt/uibinder/rebind/GwtResourceEntityResolverTest.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.uibinder.rebind;
-import com.google.gwt.dev.javac.impl.MockResource;
-import com.google.gwt.dev.javac.impl.MockResourceOracle;
+import com.google.gwt.dev.javac.testing.impl.MockResource;
+import com.google.gwt.dev.javac.testing.impl.MockResourceOracle;
import com.google.gwt.dev.resource.Resource;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
private static final Resource xhtmlEntResource = new MockResource(
"com/google/gwt/uibinder/resources/xhtml.ent") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return "";
}
};
diff --git a/user/test/com/google/gwt/uibinder/rebind/XMLElementTest.java b/user/test/com/google/gwt/uibinder/rebind/XMLElementTest.java
index 6904122..6d05932 100644
--- a/user/test/com/google/gwt/uibinder/rebind/XMLElementTest.java
+++ b/user/test/com/google/gwt/uibinder/rebind/XMLElementTest.java
@@ -20,7 +20,7 @@
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.CompilationState;
import com.google.gwt.dev.javac.CompilationStateBuilder;
-import com.google.gwt.dev.javac.impl.MockResourceOracle;
+import com.google.gwt.dev.javac.testing.impl.MockResourceOracle;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
import com.google.gwt.uibinder.attributeparsers.AttributeParsers;
import com.google.gwt.uibinder.attributeparsers.BundleAttributeParsers;
diff --git a/user/test/com/google/gwt/uibinder/rebind/model/OwnerClassTest.java b/user/test/com/google/gwt/uibinder/rebind/model/OwnerClassTest.java
index b79a637..63ea0c8 100644
--- a/user/test/com/google/gwt/uibinder/rebind/model/OwnerClassTest.java
+++ b/user/test/com/google/gwt/uibinder/rebind/model/OwnerClassTest.java
@@ -24,7 +24,7 @@
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.CompilationState;
import com.google.gwt.dev.javac.CompilationStateBuilder;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
import com.google.gwt.uibinder.client.UiHandler;
@@ -78,7 +78,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.EmptyOwnerClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("public class EmptyOwnerClass {\n");
@@ -89,7 +89,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.BadUiFactoryClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.uibinder.client.UiFactory;\n");
@@ -102,7 +102,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.UiFieldsClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.user.client.ui.Button;\n");
@@ -118,7 +118,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.UiHandlersClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.event.dom.client.ClickEvent;\n");
@@ -134,7 +134,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.BadUiFieldsClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.uibinder.client.UiField;\n");
@@ -147,7 +147,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.UiFactoryClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.uibinder.client.UiFactory;\n");
@@ -161,7 +161,7 @@
},
new MockJavaResource("com.google.gwt.uibinder.rebind.model.Abstract") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("public class Abstract<T> {");
@@ -172,7 +172,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.WildcardWidgetFactory") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.uibinder.client.UiFactory;\n");
@@ -186,7 +186,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.ParamterizedWidgetFactory") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.uibinder.client.UiFactory;\n");
@@ -200,7 +200,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.TooManyGenerics") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.uibinder.client.UiFactory;\n");
@@ -216,7 +216,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.DuplicateUiFactoryClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.uibinder.client.UiFactory;\n");
@@ -233,7 +233,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.ParentUiBinderClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.event.dom.client.MouseOverEvent;\n");
@@ -253,7 +253,7 @@
new MockJavaResource(
"com.google.gwt.uibinder.rebind.model.ChildUiBinderClass") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.rebind.model;\n");
code.append("import com.google.gwt.event.dom.client.ClickEvent;\n");
diff --git a/user/test/com/google/gwt/uibinder/test/UiJavaResources.java b/user/test/com/google/gwt/uibinder/test/UiJavaResources.java
index 22678eb..c31ac24 100644
--- a/user/test/com/google/gwt/uibinder/test/UiJavaResources.java
+++ b/user/test/com/google/gwt/uibinder/test/UiJavaResources.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.uibinder.test;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.collect.HashSet;
import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
@@ -33,7 +33,7 @@
public static final MockJavaResource ABSOLUTE_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.AbsolutePanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class AbsolutePanel extends Widget {\n");
@@ -44,7 +44,7 @@
public static final MockJavaResource BUTTON = new MockJavaResource(
"com.google.gwt.user.client.ui.Button") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.event.dom.client.ClickEvent;\n");
@@ -62,7 +62,7 @@
public static final MockJavaResource CLICK_EVENT = new MockJavaResource(
"com.google.gwt.event.dom.client.ClickEvent") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.event.dom.client;\n");
code.append("import com.google.gwt.event.shared.GwtEvent;\n");
@@ -74,7 +74,7 @@
public static final MockJavaResource CLICK_HANDLER = new MockJavaResource(
"com.google.gwt.event.dom.client.ClickHandler") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.event.dom.client;\n");
code.append("import com.google.gwt.event.shared.EventHandler;\n");
@@ -87,7 +87,7 @@
public static final MockJavaResource COMMAND = new MockJavaResource(
"com.google.gwt.user.client.Command") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client;\n");
code.append("public interface Command {\n");
@@ -99,7 +99,7 @@
public static final MockJavaResource CURRENCY_DATA = new MockJavaResource(
"com.google.gwt.i18n.client.CurrencyData") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.i18n.client;\n");
code.append("public class CurrencyData {\n");
@@ -110,7 +110,7 @@
public static final MockJavaResource DATE_LABEL = new MockJavaResource(
"com.google.gwt.user.client.ui.DateLabel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.i18n.client.DateTimeFormat;\n");
@@ -126,7 +126,7 @@
public static final MockJavaResource DATE_TIME_FORMAT = new MockJavaResource(
"com.google.gwt.i18n.client.DateTimeFormat") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.i18n.client;\n");
code.append("public class DateTimeFormat {\n");
@@ -146,7 +146,7 @@
public static final MockJavaResource DIALOG_BOX = new MockJavaResource(
"com.google.gwt.user.client.ui.DialogBox") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class DialogBox extends Widget {\n");
@@ -160,7 +160,7 @@
public static final MockJavaResource DISCLOSURE_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.DisclosurePanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class DisclosurePanel extends Widget {\n");
@@ -171,7 +171,7 @@
public static final MockJavaResource DOCK_LAYOUT_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.DockLayoutPanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class DockLayoutPanel extends Widget {\n");
@@ -182,7 +182,7 @@
public static final MockJavaResource ELEMENT = new MockJavaResource(
"com.google.gwt.dom.client.Element") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.dom.client;\n");
code.append("public class Element {\n");
@@ -193,7 +193,7 @@
public static final MockJavaResource EVENT_HANDLER = new MockJavaResource(
"com.google.gwt.event.shared.EventHandler") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.event.shared;\n");
code.append("public interface EventHandler {\n");
@@ -204,7 +204,7 @@
public static final MockJavaResource GRID = new MockJavaResource(
"com.google.gwt.user.client.ui.Grid") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class Grid extends Widget {\n");
@@ -215,7 +215,7 @@
public static final MockJavaResource GWT_EVENT = new MockJavaResource(
"com.google.gwt.event.shared.GwtEvent") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.event.shared;\n");
code.append("public abstract class GwtEvent<H extends EventHandler> {\n");
@@ -226,7 +226,7 @@
public static final MockJavaResource HANDLER_REGISTRATION = new MockJavaResource(
"com.google.gwt.event.shared.HandlerRegistration") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.event.shared;\n");
code.append("public interface HandlerRegistration {\n");
@@ -238,7 +238,7 @@
public static final MockJavaResource HAS_CLICK_HANDLERS = new MockJavaResource(
"com.google.gwt.event.dom.client.HasClickHandlers") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.event.dom.client;\n");
code.append("import com.google.gwt.event.shared.HandlerRegistration;\n");
@@ -251,7 +251,7 @@
public static final MockJavaResource HAS_HORIZONTAL_ALIGNMENT = new MockJavaResource(
"com.google.gwt.user.client.ui.HasHorizontalAlignment") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class HasHorizontalAlignment {\n");
@@ -264,7 +264,7 @@
public static final MockJavaResource HAS_VERTICAL_ALIGNMENT = new MockJavaResource(
"com.google.gwt.user.client.ui.HasVerticalAlignment") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class HasVerticalAlignment {\n");
@@ -277,7 +277,7 @@
public static final MockJavaResource IMAGE = new MockJavaResource(
"com.google.gwt.user.client.ui.Image") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.resources.client.ImageResource;\n");
@@ -291,7 +291,7 @@
public static final MockJavaResource IMAGE_RESOURCE = new MockJavaResource(
"com.google.gwt.resources.client.ImageResource") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.resources.client;\n");
code.append("public class ImageResource {\n");
@@ -303,7 +303,7 @@
public static final MockJavaResource IS_WIDGET = new MockJavaResource(
"com.google.gwt.user.client.ui.IsWidget") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public interface IsWidget {\n");
@@ -315,7 +315,7 @@
public static final MockJavaResource LABEL = new MockJavaResource(
"com.google.gwt.user.client.ui.Label") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.event.dom.client.ClickEvent;\n");
@@ -333,7 +333,7 @@
public static final MockJavaResource LAYOUT_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.LayoutPanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class LayoutPanel extends Widget {\n");
@@ -344,7 +344,7 @@
public static final MockJavaResource LIST_BOX = new MockJavaResource(
"com.google.gwt.user.client.ui.ListBox") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class ListBox extends Widget {\n");
@@ -355,7 +355,7 @@
public static final MockJavaResource MENU_BAR = new MockJavaResource(
"com.google.gwt.user.client.ui.MenuBar") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class MenuBar extends Widget {\n");
@@ -366,7 +366,7 @@
public static final MockJavaResource MENU_ITEM = new MockJavaResource(
"com.google.gwt.user.client.ui.MenuItem") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.user.client.Command;\n");
@@ -380,7 +380,7 @@
public static final MockJavaResource MENU_ITEM_SEPARATOR = new MockJavaResource(
"com.google.gwt.user.client.ui.MenuItemSeparator") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.user.client.Command;\n");
@@ -392,7 +392,7 @@
public static final MockJavaResource MOUSE_OVER_EVENT = new MockJavaResource(
"com.google.gwt.event.dom.client.MouseOverEvent") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.event.dom.client;\n");
code.append("import com.google.gwt.event.shared.GwtEvent;\n");
@@ -404,7 +404,7 @@
public static final MockJavaResource MOUSE_OVER_HANDLER = new MockJavaResource(
"com.google.gwt.event.dom.client.MouseOverHandler") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.event.dom.client;\n");
code.append("import com.google.gwt.event.shared.EventHandler;\n");
@@ -417,7 +417,7 @@
public static final MockJavaResource NUMBER_LABEL = new MockJavaResource(
"com.google.gwt.user.client.ui.NumberLabel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.i18n.client.NumberFormat;\n");
@@ -431,7 +431,7 @@
public static final MockJavaResource NUMBER_FORMAT = new MockJavaResource(
"com.google.gwt.i18n.client.NumberFormat") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.i18n.client;\n");
code.append("public class NumberFormat {\n");
@@ -442,7 +442,7 @@
public static final MockJavaResource RENDERER = new MockJavaResource(
"com.google.gwt.text.shared.Renderer") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.text.shared;\n");
code.append("public class Renderer<T> {\n");
@@ -453,7 +453,7 @@
public static final MockJavaResource SPLIT_LAYOUT_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.SplitLayoutPanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class SplitLayoutPanel extends DockLayoutPanel {\n");
@@ -464,7 +464,7 @@
public static final MockJavaResource STACK_LAYOUT_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.StackLayoutPanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class StackLayoutPanel extends Widget {\n");
@@ -475,7 +475,7 @@
public static final MockJavaResource STACK_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.StackPanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class StackPanel extends Widget {\n");
@@ -486,7 +486,7 @@
public static final MockJavaResource STYLE = new MockJavaResource(
"com.google.gwt.dom.client.Style") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.dom.client;\n");
code.append("public class Style {\n");
@@ -498,7 +498,7 @@
public static final MockJavaResource TAB_LAYOUT_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.TabLayoutPanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class TabLayoutPanel extends Widget {\n");
@@ -509,7 +509,7 @@
public static final MockJavaResource TAB_PANEL = new MockJavaResource(
"com.google.gwt.user.client.ui.TabPanel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class TabPanel extends Widget {\n");
@@ -520,7 +520,7 @@
public static final MockJavaResource TEXT_BOX_BASE = new MockJavaResource(
"com.google.gwt.user.client.ui.TextBoxBase") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class TextBoxBase {\n");
@@ -533,7 +533,7 @@
public static final MockJavaResource TREE = new MockJavaResource(
"com.google.gwt.user.client.ui.Tree") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class Tree extends Widget {\n");
@@ -544,7 +544,7 @@
public static final MockJavaResource TREE_ITEM = new MockJavaResource(
"com.google.gwt.user.client.ui.TreeItem") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class TreeItem extends UIObject {\n");
@@ -555,7 +555,7 @@
public static final MockJavaResource TIME_ZONE = new MockJavaResource(
"com.google.gwt.i18n.client.TimeZone") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.i18n.client;\n");
code.append("public class TimeZone {\n");
@@ -566,7 +566,7 @@
public static final MockJavaResource UI_BINDER = new MockJavaResource(
"com.google.gwt.uibinder.client.UiBinder") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.client;\n");
code.append("public interface UiBinder<U, O> {\n");
@@ -577,7 +577,7 @@
public static final MockJavaResource UI_FACTORY = new MockJavaResource(
"com.google.gwt.uibinder.client.UiFactory") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.uibinder.client;\n");
code.append("import java.lang.annotation.Target;\n");
@@ -590,7 +590,7 @@
public static final MockJavaResource UI_OBJECT = new MockJavaResource(
"com.google.gwt.user.client.ui.UIObject") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class UIObject {\n");
@@ -601,7 +601,7 @@
public static final MockJavaResource VALUE_LABEL = new MockJavaResource(
"com.google.gwt.user.client.ui.ValueLabel") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("import com.google.gwt.text.shared.Renderer;\n");
@@ -614,7 +614,7 @@
public static final MockJavaResource WIDGET = new MockJavaResource(
"com.google.gwt.user.client.ui.Widget") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.user.client.ui;\n");
code.append("public class Widget extends UIObject {\n");
diff --git a/user/test/com/google/gwt/user/rebind/rpc/BlacklistTypeFilterTest.java b/user/test/com/google/gwt/user/rebind/rpc/BlacklistTypeFilterTest.java
index 56197d1..86153ba 100644
--- a/user/test/com/google/gwt/user/rebind/rpc/BlacklistTypeFilterTest.java
+++ b/user/test/com/google/gwt/user/rebind/rpc/BlacklistTypeFilterTest.java
@@ -25,9 +25,9 @@
import com.google.gwt.core.ext.typeinfo.NotFoundException;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.TypeOracleTestingUtils;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java b/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
index 45a4a5b..3d2cd21 100644
--- a/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
+++ b/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
@@ -29,19 +29,19 @@
import com.google.gwt.core.ext.typeinfo.JRawType;
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.JTypeParameter;
+import com.google.gwt.core.ext.typeinfo.JWildcardType.BoundType;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
-import com.google.gwt.core.ext.typeinfo.JWildcardType.BoundType;
import com.google.gwt.dev.cfg.BindingProperty;
import com.google.gwt.dev.cfg.ConfigurationProperty;
import com.google.gwt.dev.cfg.ModuleDef;
import com.google.gwt.dev.cfg.ModuleDefLoader;
import com.google.gwt.dev.cfg.StaticPropertyOracle;
import com.google.gwt.dev.javac.TypeOracleTestingUtils;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
import com.google.gwt.dev.javac.rebind.CachedRebindResult;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.resource.ResourceOracle;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
diff --git a/user/test/com/google/gwt/user/rebind/rpc/TypeHierarchyUtilsTest.java b/user/test/com/google/gwt/user/rebind/rpc/TypeHierarchyUtilsTest.java
index 9d5beca..b5fa77b 100644
--- a/user/test/com/google/gwt/user/rebind/rpc/TypeHierarchyUtilsTest.java
+++ b/user/test/com/google/gwt/user/rebind/rpc/TypeHierarchyUtilsTest.java
@@ -20,7 +20,7 @@
import com.google.gwt.core.ext.typeinfo.NotFoundException;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.TypeOracleTestingUtils;
-import com.google.gwt.dev.javac.impl.StaticJavaResource;
+import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
diff --git a/user/test/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestFactoryModelTest.java b/user/test/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestFactoryModelTest.java
index 14af62b..2690c7e 100644
--- a/user/test/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestFactoryModelTest.java
+++ b/user/test/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestFactoryModelTest.java
@@ -20,8 +20,8 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.CompilationState;
import com.google.gwt.dev.javac.CompilationStateBuilder;
-import com.google.gwt.dev.javac.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.impl.MockJavaResource;
+import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
+import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.UnitTestTreeLogger;
import com.google.gwt.dev.util.Util;
@@ -85,7 +85,7 @@
}
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
return code;
}
}
@@ -102,7 +102,7 @@
}
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
String resourceName = getTypeName().replace('.', '/') + ".java";
InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(
resourceName);
@@ -173,7 +173,7 @@
Set<Resource> javaResources = getJavaResources(proxyClass);
javaResources.add(new MockJavaResource("t.TestRequestFactory") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + RequestFactory.class.getName() + ";\n");
@@ -185,7 +185,7 @@
});
javaResources.add(new MockJavaResource("t.TestContext") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + Request.class.getName() + ";\n");
@@ -230,7 +230,7 @@
private Set<Resource> getJavaResources(final String proxyClass) {
MockJavaResource[] javaFiles = {new MockJavaResource("t.AddressProxy") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + ProxyFor.class.getName() + ";\n");
@@ -245,7 +245,7 @@
}
}, new MockJavaResource("t.ProxyWithRepeatedGetters") {
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package t;\n");
code.append("import " + ProxyFor.class.getName() + ";\n");
@@ -262,7 +262,7 @@
}, new MockJavaResource("java.util.List") {
// Tests a Driver interface that extends more than RFED
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package java.util;\n");
code.append("public interface List<T> extends Collection<T> {\n");
@@ -272,7 +272,7 @@
}, new MockJavaResource("java.util.Set") {
// Tests a Driver interface that extends more than RFED
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package java.util;\n");
code.append("public interface Set<T> extends Collection<T> {\n");
@@ -282,7 +282,7 @@
}, new MockJavaResource("java.util.SortedSet") {
// Tests a Driver interface that extends more than RFED
@Override
- protected CharSequence getContent() {
+ public CharSequence getContent() {
StringBuilder code = new StringBuilder();
code.append("package java.util;\n");
code.append("public interface SortedSet<T> extends Set<T> {\n");
