Sort & format.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1659 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/test/com/google/gwt/emultest/java/lang/ByteTest.java b/user/test/com/google/gwt/emultest/java/lang/ByteTest.java
index 14361e0..bf4ab4a 100644
--- a/user/test/com/google/gwt/emultest/java/lang/ByteTest.java
+++ b/user/test/com/google/gwt/emultest/java/lang/ByteTest.java
@@ -26,6 +26,12 @@
return "com.google.gwt.emultest.EmulSuite";
}
+ public void testConstants() {
+ assertEquals(-128, Byte.MIN_VALUE);
+ assertEquals(127, Byte.MAX_VALUE);
+ assertEquals(8, Byte.SIZE);
+ }
+
public void testStatics() {
// test the new 1.5 statics... older stuff "assumed to work"
assertEquals(0, Byte.valueOf((byte) 0).intValue());
@@ -33,10 +39,4 @@
assertEquals(-128, Byte.valueOf((byte) -128).intValue());
assertEquals(-1, Byte.valueOf((byte) 255).intValue());
}
-
- public void testConstants() {
- assertEquals(-128, Byte.MIN_VALUE);
- assertEquals(127, Byte.MAX_VALUE);
- assertEquals(8, Byte.SIZE);
- }
}
diff --git a/user/test/com/google/gwt/emultest/java/lang/DoubleTest.java b/user/test/com/google/gwt/emultest/java/lang/DoubleTest.java
index ff33ebe..283763b 100644
--- a/user/test/com/google/gwt/emultest/java/lang/DoubleTest.java
+++ b/user/test/com/google/gwt/emultest/java/lang/DoubleTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 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
@@ -58,8 +58,10 @@
assertTrue(Double.MIN_VALUE < Double.MAX_VALUE);
assertFalse(Double.NaN == Double.NaN);
assertEquals(64, Double.SIZE);
- // jdk1.6 assertEquals(Math.getExponent(Double.MAX_VALUE), Double.MAX_EXPONENT);
- // jdk1.6 assertEquals(Math.getExponent(Double.MIN_NORMAL), Double.MIN_EXPONENT);
+ // jdk1.6 assertEquals(Math.getExponent(Double.MAX_VALUE),
+ // Double.MAX_EXPONENT);
+ // jdk1.6 assertEquals(Math.getExponent(Double.MIN_NORMAL),
+ // Double.MIN_EXPONENT);
}
public void testParse() {
@@ -70,9 +72,11 @@
assertTrue(2.98e8 == Double.parseDouble("2.98e8"));
assertTrue(-2.98e-8 == Double.parseDouble("-2.98e-8"));
assertTrue(+2.98E+8 == Double.parseDouble("+2.98E+8"));
- assertTrue("Can't parse MIN_VALUE",
- Double.MIN_VALUE == Double.parseDouble(String.valueOf(Double.MIN_VALUE)));
- assertTrue("Can't parse MAX_VALUE",
- Double.MAX_VALUE == Double.parseDouble(String.valueOf(Double.MAX_VALUE)));
+ assertTrue(
+ "Can't parse MIN_VALUE",
+ Double.MIN_VALUE == Double.parseDouble(String.valueOf(Double.MIN_VALUE)));
+ assertTrue(
+ "Can't parse MAX_VALUE",
+ Double.MAX_VALUE == Double.parseDouble(String.valueOf(Double.MAX_VALUE)));
}
}
diff --git a/user/test/com/google/gwt/emultest/java/lang/FloatTest.java b/user/test/com/google/gwt/emultest/java/lang/FloatTest.java
index 4ddbc55..b6ca4fe 100644
--- a/user/test/com/google/gwt/emultest/java/lang/FloatTest.java
+++ b/user/test/com/google/gwt/emultest/java/lang/FloatTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 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
@@ -19,7 +19,7 @@
import com.google.gwt.junit.client.GWTTestCase;
/**
- * Unit tests for the Javascript emulation of the Float/float autoboxed
+ * Unit tests for the Javascript emulation of the Float/float autoboxed
* fundamental type.
*/
public class FloatTest extends GWTTestCase {
@@ -59,8 +59,10 @@
assertTrue(Float.MIN_VALUE < Float.MAX_VALUE);
assertFalse(Float.NaN == Float.NaN);
assertEquals(Float.SIZE, 32);
- // jdk1.6 assertEquals(Float.MIN_EXPONENT, Math.getExponent(Float.MIN_NORMAL));
- // jdk1.6 assertEquals(Float.MAX_EXPONENT, Math.getExponent(Float.MAX_VALUE));
+ // jdk1.6 assertEquals(Float.MIN_EXPONENT,
+ // Math.getExponent(Float.MIN_NORMAL));
+ // jdk1.6 assertEquals(Float.MAX_EXPONENT,
+ // Math.getExponent(Float.MAX_VALUE));
}
public void testParse() {
diff --git a/user/test/com/google/gwt/emultest/java/lang/ObjectTest.java b/user/test/com/google/gwt/emultest/java/lang/ObjectTest.java
index 4925954..ed6ec53 100644
--- a/user/test/com/google/gwt/emultest/java/lang/ObjectTest.java
+++ b/user/test/com/google/gwt/emultest/java/lang/ObjectTest.java
@@ -21,18 +21,18 @@
* TODO: document me.
*/
public class ObjectTest extends GWTTestCase {
+ public String getModuleName() {
+ return "com.google.gwt.emultest.EmulSuite";
+ }
+
/*
* Test method for 'java.lang.Object.hashCode()'
*/
public void testHashCode() {
Object obj1 = new Object();
assertEquals(obj1.hashCode(), obj1.hashCode());
-
+
Object obj2 = new Object();
assertEquals(obj2.hashCode(), obj2.hashCode());
}
-
- public String getModuleName() {
- return "com.google.gwt.emultest.EmulSuite";
- }
}
diff --git a/user/test/com/google/gwt/emultest/java/lang/StringBufferTest.java b/user/test/com/google/gwt/emultest/java/lang/StringBufferTest.java
index a8c86c0..685cdcd 100644
--- a/user/test/com/google/gwt/emultest/java/lang/StringBufferTest.java
+++ b/user/test/com/google/gwt/emultest/java/lang/StringBufferTest.java
@@ -24,7 +24,7 @@
/**
* This method gets the module name.
- *
+ *
* @return the module name.
* @see com.google.gwt.junit.client.GWTTestCase#getModuleName()
*/
diff --git a/user/test/com/google/gwt/emultest/java/lang/StringTest.java b/user/test/com/google/gwt/emultest/java/lang/StringTest.java
index 373ab1a..d765091 100644
--- a/user/test/com/google/gwt/emultest/java/lang/StringTest.java
+++ b/user/test/com/google/gwt/emultest/java/lang/StringTest.java
@@ -27,12 +27,10 @@
return "com.google.gwt.emultest.EmulSuite";
}
- /** tests charAt() */
public void testCharAt() {
assertEquals("abc".charAt(1), 'b');
}
- /** tests concat */
public void testConcat() {
assertEquals("abcdef", "abc" + "def");
assertEquals("abcdef", "abc".concat("def"));
@@ -47,7 +45,6 @@
assertEquals("abcd", s);
}
- /** Tests string creation and equality */
public void testContructor() {
char[] chars = {'a', 'b', 'c', 'd', 'e', 'f'};
String constant = "abcdef";
@@ -60,7 +57,6 @@
assertEquals(new String(new char[] {}), "");
}
- /** tests endsWith */
public void testEndsWith() {
String haystack = "abcdefghi";
assertTrue("a", haystack.endsWith("defghi"));
@@ -90,18 +86,6 @@
assertFalse("".equalsIgnoreCase(null));
}
- /** tests indexOf */
- public void testIndexOf() {
- String haystack = "abcdefghi";
- assertEquals(haystack.indexOf("q"), -1);
- assertEquals(haystack.indexOf('q'), -1);
- assertEquals(haystack.indexOf("a"), 0);
- assertEquals(haystack.indexOf('a'), 0);
- assertEquals(haystack.indexOf('a', 1), -1);
- assertEquals(haystack.indexOf("bc"), 1);
- assertEquals(haystack.indexOf(""), 0);
- }
-
/**
* Tests hashing with strings.
*
@@ -136,7 +120,17 @@
}
}
- /** tests lastIndexOf */
+ public void testIndexOf() {
+ String haystack = "abcdefghi";
+ assertEquals(haystack.indexOf("q"), -1);
+ assertEquals(haystack.indexOf('q'), -1);
+ assertEquals(haystack.indexOf("a"), 0);
+ assertEquals(haystack.indexOf('a'), 0);
+ assertEquals(haystack.indexOf('a', 1), -1);
+ assertEquals(haystack.indexOf("bc"), 1);
+ assertEquals(haystack.indexOf(""), 0);
+ }
+
public void testLastIndexOf() {
String x = "abcdeabcdef";
assertEquals(9, x.lastIndexOf("e"));
@@ -153,7 +147,6 @@
assertEquals(1 << 16, str.length());
}
- /** tests toLowerCase */
public void testLowerCase() {
assertEquals("abc", "AbC".toLowerCase());
assertEquals("abc", "abc".toLowerCase());
@@ -177,7 +170,6 @@
assertEquals("nullnull", a);
}
- /** tests replace */
public void testReplace() {
assertEquals("axax".replace('x', 'a'), "aaaa");
assertEquals("aaaa".replace('x', 'a'), "aaaa");
@@ -191,7 +183,6 @@
}
}
- /** tests replaceAll */
public void testReplaceAll() {
assertEquals("abcdef", "xxxxabcxxdexf".replaceAll("x*", ""));
assertEquals("1\\1abc123\\123de1234\\1234f", "1abc123de1234f".replaceAll(
@@ -202,7 +193,6 @@
assertEquals("$$x$", "x".replaceAll("(x)", "\\$\\$$1\\$"));
}
- /** tests split */
public void testSplit() {
compareList("fullSplit", new String[] {"abc", "", "", "de", "f"},
"abcxxxdexfxx".split("x"));
@@ -225,7 +215,6 @@
"boo", "and", "foo"});
}
- /** tests startsWith */
public void testStartsWith() {
String haystack = "abcdefghi";
assertTrue(haystack.startsWith("abc"));
@@ -241,7 +230,6 @@
assertEquals("bcdef", "abcdef".substring(1));
}
- /** tests toCharArray */
public void testToCharArray() {
char[] a1 = "abc".toCharArray();
char[] a2 = new char[] {'a', 'b', 'c'};
@@ -250,7 +238,6 @@
}
}
- /** tests trim */
public void testTrim() {
trimRightAssertEquals("abc", " \t abc \n ");
trimRightAssertEquals("abc", "abc".trim());
@@ -263,21 +250,6 @@
trimRightAssertEquals("", " \t ".trim());
}
- /**
- * Helper method for testTrim to avoid compiler optimizations.
- */
- public void trimRightAssertSame(String left, String right) {
- assertSame(left, right.trim());
- }
-
- /**
- * Helper method for testTrim to avoid compiler optimizations.
- */
- public void trimRightAssertEquals(String left, String right) {
- assertEquals(left, right.trim());
- }
-
- /** tests toUpperCase */
public void testUpperCase() {
assertEquals("abc", "AbC".toLowerCase());
assertEquals("abc", "abc".toLowerCase());
@@ -297,6 +269,20 @@
assertEquals(C.TRUE_STRING, String.valueOf(C.TRUE_VALUE));
}
+ /**
+ * Helper method for testTrim to avoid compiler optimizations.
+ */
+ public void trimRightAssertEquals(String left, String right) {
+ assertEquals(left, right.trim());
+ }
+
+ /**
+ * Helper method for testTrim to avoid compiler optimizations.
+ */
+ public void trimRightAssertSame(String left, String right) {
+ assertSame(left, right.trim());
+ }
+
private void compareList(String category, String[] desired, String[] got) {
assertEquals(category + " length", desired.length, got.length);
for (int i = 0; i < desired.length; i++) {
