sort & format
missed these test files in commit 3366.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@3383 8db76d5a-ed1c-0410-87a9-c151d255dfc7
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 514bfa6..678f0ea 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
@@ -118,18 +118,15 @@
AbstractTreeLogger logger = new PrintWriterTreeLogger();
logger.setMaxDetail(TreeLogger.ERROR);
- api1 =
- new ApiContainer("Api1", logger,
- ApiContainerTest.getNewTypeOracleFromCompilationUnits(
- ApiContainerTest.getScuArray(), logger));
- apiSameAs1 =
- new ApiContainer("Api2", logger,
- ApiContainerTest.getNewTypeOracleFromCompilationUnits(
- ApiContainerTest.getScuArray(), logger));
- api2 =
- new ApiContainer("Api2", logger,
- ApiContainerTest.getNewTypeOracleFromCompilationUnits(
- getScuArray(), logger));
+ api1 = new ApiContainer("Api1", logger,
+ ApiContainerTest.getNewTypeOracleFromCompilationUnits(
+ ApiContainerTest.getScuArray(), logger));
+ apiSameAs1 = new ApiContainer("Api2", logger,
+ ApiContainerTest.getNewTypeOracleFromCompilationUnits(
+ ApiContainerTest.getScuArray(), logger));
+ api2 = new ApiContainer("Api2", logger,
+ ApiContainerTest.getNewTypeOracleFromCompilationUnits(getScuArray(),
+ logger));
}
// setup is called before every test*. To avoid the overhead of setUp() each
@@ -145,12 +142,10 @@
hashSet).size());
ApiDiffGenerator apiDiff = new ApiDiffGenerator(api2, api1);
boolean removeDuplicates = false;
- String strWithDuplicates =
- getStringRepresentation(ApiCompatibilityChecker.getApiDiff(apiDiff,
- hashSet, removeDuplicates));
- String strWithoutDuplicates =
- getStringRepresentation(ApiCompatibilityChecker.getApiDiff(apiDiff,
- hashSet, !removeDuplicates));
+ String strWithDuplicates = getStringRepresentation(ApiCompatibilityChecker.getApiDiff(
+ apiDiff, hashSet, removeDuplicates));
+ String strWithoutDuplicates = getStringRepresentation(ApiCompatibilityChecker.getApiDiff(
+ apiDiff, hashSet, !removeDuplicates));
String delimiter = ApiDiffGenerator.DELIMITER;
// test if missing packages are reported correctly
@@ -198,8 +193,7 @@
+ ApiChange.Status.MISSING, strWithoutDuplicates));
// test returnType error
- String methodSignature =
- "checkParametersAndReturnTypes(Ltest/apicontainer/ApiClass;)";
+ String methodSignature = "checkParametersAndReturnTypes(Ltest/apicontainer/ApiClass;)";
assertEquals(1, countPresence(methodSignature + delimiter
+ ApiChange.Status.RETURN_TYPE_ERROR, strWithoutDuplicates));
// test method exceptions
@@ -218,14 +212,12 @@
private void checkWhiteList() throws NotFoundException {
ApiDiffGenerator apiDiff = new ApiDiffGenerator(api2, api1);
boolean removeDuplicates = false;
- String whiteList =
- "java.newpackage" + ApiDiffGenerator.DELIMITER
- + ApiChange.Status.MISSING;
+ String whiteList = "java.newpackage" + ApiDiffGenerator.DELIMITER
+ + ApiChange.Status.MISSING;
HashSet<String> hashSet = new HashSet<String>();
hashSet.add(whiteList);
- String strWithoutDuplicates =
- getStringRepresentation(ApiCompatibilityChecker.getApiDiff(apiDiff,
- hashSet, !removeDuplicates));
+ String strWithoutDuplicates = getStringRepresentation(ApiCompatibilityChecker.getApiDiff(
+ apiDiff, hashSet, !removeDuplicates));
// test if missing packages are reported correctly
assertEquals(0, countPresence(whiteList, strWithoutDuplicates));
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 c2d17fa..b851a4b 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
@@ -100,8 +100,8 @@
throws UnableToCompleteException {
TypeOracleMediator mediator = new TypeOracleMediator();
- Set<CompilationUnit> units =
- new HashSet<CompilationUnit>(Arrays.asList(tempScuArray));
+ Set<CompilationUnit> units = new HashSet<CompilationUnit>(
+ Arrays.asList(tempScuArray));
JdtCompiler.compile(units);
mediator.refresh(logger, units);
return mediator.getTypeOracle();
@@ -205,15 +205,13 @@
public void setUp() throws UnableToCompleteException {
AbstractTreeLogger logger = new PrintWriterTreeLogger();
logger.setMaxDetail(com.google.gwt.core.ext.TreeLogger.ERROR);
- apiCheckLoop =
- new ApiContainer("ApiClassTest", logger,
- getNewTypeOracleFromCompilationUnits(
- new StaticCompilationUnit[] {new StaticCompilationUnit(
- "java.lang.Object", getSourceForNewObject()),}, logger));
+ apiCheckLoop = new ApiContainer("ApiClassTest", logger,
+ getNewTypeOracleFromCompilationUnits(
+ new StaticCompilationUnit[] {new StaticCompilationUnit(
+ "java.lang.Object", getSourceForNewObject()),}, logger));
- apiCheck =
- new ApiContainer("ApiContainerTest", logger,
- getNewTypeOracleFromCompilationUnits(getScuArray(), logger));
+ apiCheck = new ApiContainer("ApiContainerTest", logger,
+ getNewTypeOracleFromCompilationUnits(getScuArray(), logger));
}
public void testEverything() {
@@ -251,14 +249,12 @@
*
*/
void checkApiMembers() {
- ApiClass object =
- apiCheck.getApiPackage("java.lang").getApiClass("java.lang.Object");
- ApiClass apiClass =
- apiCheck.getApiPackage("test.apicontainer").getApiClass(
- "test.apicontainer.ApiClass");
- ApiClass innerClass =
- apiCheck.getApiPackage("test.apicontainer").getApiClass(
- "test.apicontainer.NonApiClass.ApiClassInNonApiClass");
+ ApiClass object = apiCheck.getApiPackage("java.lang").getApiClass(
+ "java.lang.Object");
+ ApiClass apiClass = apiCheck.getApiPackage("test.apicontainer").getApiClass(
+ "test.apicontainer.ApiClass");
+ ApiClass innerClass = apiCheck.getApiPackage("test.apicontainer").getApiClass(
+ "test.apicontainer.NonApiClass.ApiClassInNonApiClass");
// constructors
assertEquals(1, innerClass.getApiMemberNames(
