Fixes incorrectly-ordered arguments to calls to assertEquals.
This change has been automatically generated by an Error Prone check
that detects incorrect argument ordering on calls to assertEquals-style
methods.
Change-Id: Ife5125497d24f2bc49063338b678fddb939feadc
Review-Link: https://gwt-review.googlesource.com/#/c/18600/
diff --git a/user/test/com/google/gwt/canvas/dom/client/Context2dTest.java b/user/test/com/google/gwt/canvas/dom/client/Context2dTest.java
index 58c06d2..8cc312f 100644
--- a/user/test/com/google/gwt/canvas/dom/client/Context2dTest.java
+++ b/user/test/com/google/gwt/canvas/dom/client/Context2dTest.java
@@ -339,9 +339,9 @@
// test that edge cases don't blow up: fall off the CanvasPixelArray end
int aPixel = clampArrayGet.get(9999);
- assertEquals("CanvasPixelArray should return 0 for values off its end", aPixel, 0);
+ assertEquals("CanvasPixelArray should return 0 for values off its end", 0, aPixel);
int bPixel = clampArrayGet.get(-9999);
- assertEquals("CanvasPixelArray should return 0 for values off its end", bPixel, 0);
+ assertEquals("CanvasPixelArray should return 0 for values off its end", 0, bPixel);
}
public void testIsPointInPath() {
diff --git a/user/test/com/google/gwt/dev/jjs/test/CompilerTest.java b/user/test/com/google/gwt/dev/jjs/test/CompilerTest.java
index 9d72028..f9bb6b9 100644
--- a/user/test/com/google/gwt/dev/jjs/test/CompilerTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/CompilerTest.java
@@ -353,12 +353,12 @@
Object[][] oaa;
oaa = new Object[4][4];
oaa[0][0] = "foo";
- assertEquals(oaa[0][0], "foo");
+ assertEquals("foo", oaa[0][0]);
oaa = new Object[4][];
oaa[0] = new Object[4];
oaa[0][0] = "bar";
- assertEquals(oaa[0][0], "bar");
+ assertEquals("bar", oaa[0][0]);
Apple[] apple = TRUE ? new Granny[3] : new Apple[3];
Apple g = TRUE ? (Apple) new Granny() : (Apple) new Fuji();
@@ -952,32 +952,31 @@
int i;
for (i = 0; i < 10; ++i) {
}
- assertEquals(i, 10);
+ assertEquals(10, i);
}
{
int i, c;
for (i = 0, c = 10; i < c; ++i) {
}
- assertEquals(i, 10);
- assertEquals(c, 10);
+ assertEquals(10, i);
+ assertEquals(10, c);
}
{
int j = 0;
for (int i = 0; i < 10; ++i) {
++j;
}
- assertEquals(j, 10);
+ assertEquals(10, j);
}
{
int j = 0;
for (int i = 0, c = 10; i < c; ++i) {
++j;
}
- assertEquals(j, 10);
+ assertEquals(10, j);
}
}
-
/**
* Issue #615: Internal Compiler Error.
*/
@@ -1178,7 +1177,7 @@
}
}.toString();
- assertEquals(result, "foofoofoofoo");
+ assertEquals("foofoofoofoo", result);
}
/**
@@ -1241,7 +1240,7 @@
public void testNullFlowArray() {
UninstantiableType[] uta = new UninstantiableType[10];
- assertEquals(uta.length, 10);
+ assertEquals(10, uta.length);
assertEquals(uta[0], null);
uta[1] = null;
assertEquals(uta[1], null);
@@ -1289,9 +1288,9 @@
return;
}
}
- assertEquals(new Foo(0).i, 0);
- assertEquals(new Foo(1).i, 1);
- assertEquals(new Foo(2).i, 2);
+ assertEquals(0, new Foo(0).i);
+ assertEquals(1, new Foo(1).i);
+ assertEquals(2, new Foo(2).i);
}
public void testStaticMethodResolution() {
diff --git a/user/test/com/google/gwt/dev/jjs/test/CoverageTest.java b/user/test/com/google/gwt/dev/jjs/test/CoverageTest.java
index 0d46af9..88410ff 100644
--- a/user/test/com/google/gwt/dev/jjs/test/CoverageTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/CoverageTest.java
@@ -549,8 +549,7 @@
// StringLiteral
s = "f'oo\b\t\n\f\r\"\\";
- assertEquals(s, "f" + '\'' + 'o' + 'o' + '\b' + '\t' + '\n' + '\f' + '\r'
- + '"' + '\\');
+ assertEquals("f" + '\'' + 'o' + 'o' + '\b' + '\t' + '\n' + '\f' + '\r' + '"' + '\\', s);
// TrueLiteral
assertTrue(true);
diff --git a/user/test/com/google/gwt/dev/jjs/test/EnumsWithNameObfuscationTest.java b/user/test/com/google/gwt/dev/jjs/test/EnumsWithNameObfuscationTest.java
index 7f5d6f4..5fccd08 100644
--- a/user/test/com/google/gwt/dev/jjs/test/EnumsWithNameObfuscationTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/EnumsWithNameObfuscationTest.java
@@ -186,8 +186,8 @@
public void testValueOfOverload() {
BasicWithOverloadedValueOf valById1 = BasicWithOverloadedValueOf.valueOf(1);
BasicWithOverloadedValueOf valById2 = BasicWithOverloadedValueOf.valueOf(2);
- assertEquals(valById1.ordinal(),0);
- assertEquals(valById2.ordinal(),1);
+ assertEquals(0, valById1.ordinal());
+ assertEquals(1, valById2.ordinal());
}
private <T extends Enum<T>> void enumValuesTest(Class<T> enumClass) {
diff --git a/user/test/com/google/gwt/dev/jjs/test/HostedTest.java b/user/test/com/google/gwt/dev/jjs/test/HostedTest.java
index 933e38e..6db59ae 100644
--- a/user/test/com/google/gwt/dev/jjs/test/HostedTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/HostedTest.java
@@ -215,18 +215,18 @@
*/
public void testAutoBoxing() {
JavaScriptObject bvo = getBoxedBooleanAsObject(true);
- assertEquals(getJSOAsString(bvo), "true");
+ assertEquals("true", getJSOAsString(bvo));
JavaScriptObject nvo = getBoxedNumberAsObject(42);
- assertEquals(getJSOAsString(nvo), "42");
+ assertEquals("42", getJSOAsString(nvo));
}
public void testBasic() {
int iv = getInt(14);
- assertEquals(iv, -14);
+ assertEquals(-14, iv);
double dv = getDouble(31.5);
assertEquals(dv, -31.5, 0.0);
String sv = getString("test");
- assertEquals(sv, "testme");
+ assertEquals("testme", sv);
Object oin = String.class;
Object oout = getObject(oin);
assertEquals(oin, oout);
@@ -443,83 +443,66 @@
}
Inner inner = new Inner();
- assertEquals("nativeBoolean", inner.nativeBoolean(true), true);
- assertEquals("nativeBoolean", inner.nativeBoolean(false), false);
+ assertEquals("nativeBoolean", true, inner.nativeBoolean(true));
+ assertEquals("nativeBoolean", false, inner.nativeBoolean(false));
- assertEquals("nativeByte", inner.nativeByte((byte) 0), (byte) 0);
- assertEquals("nativeByte", inner.nativeByte((byte) 1), (byte) 1);
- assertEquals("nativeByte", inner.nativeByte((byte) -1), (byte) -1);
- assertEquals("nativeByte", inner.nativeByte((byte) 127), (byte) 127);
- assertEquals("nativeByte", inner.nativeByte((byte) -127), (byte) -127);
- assertEquals("nativeByte", inner.nativeByte(Byte.MAX_VALUE), Byte.MAX_VALUE);
- assertEquals("nativeByte", inner.nativeByte(Byte.MIN_VALUE), Byte.MIN_VALUE);
+ assertEquals("nativeByte", (byte) 0, inner.nativeByte((byte) 0));
+ assertEquals("nativeByte", (byte) 1, inner.nativeByte((byte) 1));
+ assertEquals("nativeByte", (byte) -1, inner.nativeByte((byte) -1));
+ assertEquals("nativeByte", (byte) 127, inner.nativeByte((byte) 127));
+ assertEquals("nativeByte", (byte) -127, inner.nativeByte((byte) -127));
+ assertEquals("nativeByte", Byte.MAX_VALUE, inner.nativeByte(Byte.MAX_VALUE));
+ assertEquals("nativeByte", Byte.MIN_VALUE, inner.nativeByte(Byte.MIN_VALUE));
- assertEquals("nativeCharacter", inner.nativeCharacter((char) 0), (char) 0);
- assertEquals("nativeCharacter", inner.nativeCharacter((char) 1), (char) 1);
- assertEquals("nativeCharacter", inner.nativeCharacter((char) -1), (char) -1);
- assertEquals("nativeCharacter", inner.nativeCharacter((char) 32767),
- (char) 32767);
- assertEquals("nativeCharacter", inner.nativeCharacter((char) -32767),
- (char) -32767);
- assertEquals("nativeCharacter", inner.nativeCharacter(Character.MAX_VALUE),
- Character.MAX_VALUE);
- assertEquals("nativeCharacter", inner.nativeCharacter(Character.MIN_VALUE),
- Character.MIN_VALUE);
+ assertEquals("nativeCharacter", (char) 0, inner.nativeCharacter((char) 0));
+ assertEquals("nativeCharacter", (char) 1, inner.nativeCharacter((char) 1));
+ assertEquals("nativeCharacter", (char) -1, inner.nativeCharacter((char) -1));
+ assertEquals("nativeCharacter", (char) 32767, inner.nativeCharacter((char) 32767));
+ assertEquals("nativeCharacter", (char) -32767, inner.nativeCharacter((char) -32767));
+ assertEquals(
+ "nativeCharacter", Character.MAX_VALUE, inner.nativeCharacter(Character.MAX_VALUE));
+ assertEquals(
+ "nativeCharacter", Character.MIN_VALUE, inner.nativeCharacter(Character.MIN_VALUE));
- assertEquals("nativeDouble", inner.nativeDouble(0.0), 0.0);
- assertEquals("nativeDouble", inner.nativeDouble(1.0), 1.0);
- assertEquals("nativeDouble", inner.nativeDouble(-1.0), -1.0);
- assertEquals("nativeDouble", inner.nativeDouble(100000000000.0),
- 100000000000.0);
- assertEquals("nativeDouble", inner.nativeDouble(-100000000000.0),
- -100000000000.0);
- assertEquals("nativeDouble MAX", inner.nativeDouble(Double.MAX_VALUE),
- Double.MAX_VALUE);
- assertEquals("nativeDouble MIN", inner.nativeDouble(Double.MIN_VALUE),
- Double.MIN_VALUE);
+ assertEquals("nativeDouble", 0.0, inner.nativeDouble(0.0));
+ assertEquals("nativeDouble", 1.0, inner.nativeDouble(1.0));
+ assertEquals("nativeDouble", -1.0, inner.nativeDouble(-1.0));
+ assertEquals("nativeDouble", 100000000000.0, inner.nativeDouble(100000000000.0));
+ assertEquals("nativeDouble", -100000000000.0, inner.nativeDouble(-100000000000.0));
+ assertEquals("nativeDouble MAX", Double.MAX_VALUE, inner.nativeDouble(Double.MAX_VALUE));
+ assertEquals("nativeDouble MIN", Double.MIN_VALUE, inner.nativeDouble(Double.MIN_VALUE));
- assertEquals("nativeFloat", inner.nativeFloat((float) 0.0), (float) 0.0);
- assertEquals("nativeFloat", inner.nativeFloat((float) 1.0), (float) 1.0);
- assertEquals("nativeFloat", inner.nativeFloat((float) -1.0), (float) -1.0);
- assertEquals("nativeFloat", inner.nativeFloat((float) 1000000.0),
- (float) 1000000.0);
- assertEquals("nativeFloat", inner.nativeFloat((float) -1000000.0),
- (float) -1000000.0);
- assertEquals("nativeFloat", inner.nativeFloat(Float.MAX_VALUE),
- Float.MAX_VALUE);
- assertEquals("nativeFloat", inner.nativeFloat(Float.MIN_VALUE),
- Float.MIN_VALUE);
+ assertEquals("nativeFloat", (float) 0.0, inner.nativeFloat((float) 0.0));
+ assertEquals("nativeFloat", (float) 1.0, inner.nativeFloat((float) 1.0));
+ assertEquals("nativeFloat", (float) -1.0, inner.nativeFloat((float) -1.0));
+ assertEquals("nativeFloat", (float) 1000000.0, inner.nativeFloat((float) 1000000.0));
+ assertEquals("nativeFloat", (float) -1000000.0, inner.nativeFloat((float) -1000000.0));
+ assertEquals("nativeFloat", Float.MAX_VALUE, inner.nativeFloat(Float.MAX_VALUE));
+ assertEquals("nativeFloat", Float.MIN_VALUE, inner.nativeFloat(Float.MIN_VALUE));
- assertEquals("nativeInteger", inner.nativeInteger(0), 0);
- assertEquals("nativeInteger", inner.nativeInteger(1), 1);
- assertEquals("nativeInteger", inner.nativeInteger(-1), -1);
- assertEquals("nativeInteger", inner.nativeInteger(2147483647), 2147483647);
- assertEquals("nativeInteger", inner.nativeInteger(-2147483647), -2147483647);
- assertEquals("nativeInteger MAX", inner.nativeInteger(Integer.MAX_VALUE),
- Integer.MAX_VALUE);
- assertEquals("nativeInteger MIN", inner.nativeInteger(Integer.MIN_VALUE),
- Integer.MIN_VALUE);
+ assertEquals("nativeInteger", 0, inner.nativeInteger(0));
+ assertEquals("nativeInteger", 1, inner.nativeInteger(1));
+ assertEquals("nativeInteger", -1, inner.nativeInteger(-1));
+ assertEquals("nativeInteger", 2147483647, inner.nativeInteger(2147483647));
+ assertEquals("nativeInteger", -2147483647, inner.nativeInteger(-2147483647));
+ assertEquals("nativeInteger MAX", Integer.MAX_VALUE, inner.nativeInteger(Integer.MAX_VALUE));
+ assertEquals("nativeInteger MIN", Integer.MIN_VALUE, inner.nativeInteger(Integer.MIN_VALUE));
- assertEquals("nativeLong", inner.nativeLong(0L), 0L);
- assertEquals("nativeLong", inner.nativeLong(1L), 1L);
- assertEquals("nativeLong", inner.nativeLong(-1L), -1L);
- assertEquals("nativeLong", inner.nativeLong(9223372036854775807L),
- 9223372036854775807L);
- assertEquals("nativeLong", inner.nativeLong(-9223372036854775807L),
- -9223372036854775807L);
- assertEquals("nativeLong", inner.nativeLong(Long.MAX_VALUE), Long.MAX_VALUE);
- assertEquals("nativeLong", inner.nativeLong(Long.MIN_VALUE), Long.MIN_VALUE);
+ assertEquals("nativeLong", 0L, inner.nativeLong(0L));
+ assertEquals("nativeLong", 1L, inner.nativeLong(1L));
+ assertEquals("nativeLong", -1L, inner.nativeLong(-1L));
+ assertEquals("nativeLong", 9223372036854775807L, inner.nativeLong(9223372036854775807L));
+ assertEquals("nativeLong", -9223372036854775807L, inner.nativeLong(-9223372036854775807L));
+ assertEquals("nativeLong", Long.MAX_VALUE, inner.nativeLong(Long.MAX_VALUE));
+ assertEquals("nativeLong", Long.MIN_VALUE, inner.nativeLong(Long.MIN_VALUE));
- assertEquals("nativeShort", inner.nativeShort((short) 0), (short) 0);
- assertEquals("nativeShort", inner.nativeShort((short) 1), (short) 1);
- assertEquals("nativeShort", inner.nativeShort((short) -1), (short) -1);
- assertEquals("nativeShort", inner.nativeShort((short) 32767), (short) 32767);
- assertEquals("nativeShort", inner.nativeShort((short) -32767),
- (short) -32767);
- assertEquals("nativeShort MAX", inner.nativeShort(Short.MAX_VALUE),
- Short.MAX_VALUE);
- assertEquals("nativeShort MIN", inner.nativeLong(Short.MIN_VALUE),
- Short.MIN_VALUE);
+ assertEquals("nativeShort", (short) 0, inner.nativeShort((short) 0));
+ assertEquals("nativeShort", (short) 1, inner.nativeShort((short) 1));
+ assertEquals("nativeShort", (short) -1, inner.nativeShort((short) -1));
+ assertEquals("nativeShort", (short) 32767, inner.nativeShort((short) 32767));
+ assertEquals("nativeShort", (short) -32767, inner.nativeShort((short) -32767));
+ assertEquals("nativeShort MAX", Short.MAX_VALUE, inner.nativeShort(Short.MAX_VALUE));
+ assertEquals("nativeShort MIN", Short.MIN_VALUE, inner.nativeLong(Short.MIN_VALUE));
}
/**
@@ -593,7 +576,7 @@
*/
public void testObjectReturns() {
String str = (String) getStringAsObject();
- assertEquals(str, "test");
+ assertEquals("test", str);
try {
getIntAsObject();
// should have thrown an exception in Development Mode,
diff --git a/user/test/com/google/gwt/dev/jjs/test/MemberShadowingTest.java b/user/test/com/google/gwt/dev/jjs/test/MemberShadowingTest.java
index 25c6f10..9a49dbd 100644
--- a/user/test/com/google/gwt/dev/jjs/test/MemberShadowingTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/MemberShadowingTest.java
@@ -89,7 +89,7 @@
s1.setSuperclassA(1);
s1.setSubclassA(2);
- assertEquals(s1.getSuperclassA(), 1);
+ assertEquals(1, s1.getSuperclassA());
}
public void testMethodShadowing() {
diff --git a/user/test/com/google/gwt/dev/jjs/test/NativeLongTest.java b/user/test/com/google/gwt/dev/jjs/test/NativeLongTest.java
index 55bdb7f..9b28f6f 100644
--- a/user/test/com/google/gwt/dev/jjs/test/NativeLongTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/NativeLongTest.java
@@ -93,9 +93,9 @@
public void testArrayInitializer() {
long[] longs = new long[3];
- assertEquals(longs[1], 0L);
+ assertEquals(0L, longs[1]);
long[][] longs2 = new long[3][3];
- assertEquals(longs2[1][1], 0L);
+ assertEquals(0L, longs2[1][1]);
}
public void testCasts() {
diff --git a/user/test/com/google/gwt/dom/client/ElementTest.java b/user/test/com/google/gwt/dom/client/ElementTest.java
index 73aa9ae..db8ba28 100644
--- a/user/test/com/google/gwt/dom/client/ElementTest.java
+++ b/user/test/com/google/gwt/dom/client/ElementTest.java
@@ -456,19 +456,19 @@
assertEquals("div", div.getTagName().toLowerCase(Locale.ROOT));
div.setClassName("myClass");
- assertEquals(div.getClassName(), "myClass");
+ assertEquals("myClass", div.getClassName());
div.setId("myId");
- assertEquals(div.getId(), "myId");
+ assertEquals("myId", div.getId());
div.setTitle("myTitle");
- assertEquals(div.getTitle(), "myTitle");
+ assertEquals("myTitle", div.getTitle());
div.setDir("rtl");
- assertEquals(div.getDir(), "rtl");
+ assertEquals("rtl", div.getDir());
div.setLang("fr-FR");
- assertEquals(div.getLang(), "fr-FR");
+ assertEquals("fr-FR", div.getLang());
}
/**
@@ -554,8 +554,8 @@
outer.setScrollTop(0);
// Ensure that we are no longer scrolled.
- assertEquals(outer.getScrollTop(), 0);
- assertEquals(outer.getScrollLeft(), 0);
+ assertEquals(0, outer.getScrollTop());
+ assertEquals(0, outer.getScrollLeft());
}
/**
diff --git a/user/test/com/google/gwt/emultest/java/io/FilterInputStreamTest.java b/user/test/com/google/gwt/emultest/java/io/FilterInputStreamTest.java
index a71cf81..05c9cda 100644
--- a/user/test/com/google/gwt/emultest/java/io/FilterInputStreamTest.java
+++ b/user/test/com/google/gwt/emultest/java/io/FilterInputStreamTest.java
@@ -209,7 +209,7 @@
public void testAvailable() throws IOException {
int available = filter.available();
assertTrue(mockInputStream.getAvailableCalled());
- assertEquals(available, MockInputStream.RETURNED_VALUE_FOR_AVAILABLE);
+ assertEquals(MockInputStream.RETURNED_VALUE_FOR_AVAILABLE, available);
}
public void testClose() throws IOException {
@@ -227,13 +227,13 @@
public void testMarkSupported() {
boolean markSupported = filter.markSupported();
assertTrue(mockInputStream.getMarkSupportedCalled());
- assertEquals(markSupported, MockInputStream.RETURNED_VALUE_FOR_MARK_SUPPORTED);
+ assertEquals(MockInputStream.RETURNED_VALUE_FOR_MARK_SUPPORTED, markSupported);
}
public void testReadValue() throws IOException {
int value = filter.read();
assertTrue(mockInputStream.getReadByteCalled());
- assertEquals(value, MockInputStream.RETURNED_VALUE_FOR_READ_BYTE);
+ assertEquals(MockInputStream.RETURNED_VALUE_FOR_READ_BYTE, value);
}
public void testReadArray() throws IOException {
@@ -243,7 +243,7 @@
assertEquals(b, mockInputStream.getRequestedReadBuffer());
assertEquals(0, mockInputStream.getRequestedReadOffset());
assertEquals(b.length, mockInputStream.getRequestedReadLength());
- assertEquals(bytesRead, MockInputStream.RETURNED_VALUE_FOR_READ_BYTES);
+ assertEquals(MockInputStream.RETURNED_VALUE_FOR_READ_BYTES, bytesRead);
}
public void testReadArrayRange() throws IOException {
@@ -255,7 +255,7 @@
assertEquals(b, mockInputStream.getRequestedReadBuffer());
assertEquals(offset, mockInputStream.getRequestedReadOffset());
assertEquals(length, mockInputStream.getRequestedReadLength());
- assertEquals(bytesRead, MockInputStream.RETURNED_VALUE_FOR_READ_BYTES);
+ assertEquals(MockInputStream.RETURNED_VALUE_FOR_READ_BYTES, bytesRead);
}
public void testReset() throws IOException {
diff --git a/user/test/com/google/gwt/emultest/java/io/InputStreamBaseTest.java b/user/test/com/google/gwt/emultest/java/io/InputStreamBaseTest.java
index 1b499ec..89698f9 100644
--- a/user/test/com/google/gwt/emultest/java/io/InputStreamBaseTest.java
+++ b/user/test/com/google/gwt/emultest/java/io/InputStreamBaseTest.java
@@ -104,7 +104,7 @@
final byte[] b = new byte[2];
final int result = inputStream.read(b, 1, 1);
assertEquals(1, result);
- assertEquals(b[0], 0);
+ assertEquals(0, b[0]);
assertEquals(b[1], TEST_BYTES[0]);
}
diff --git a/user/test/com/google/gwt/i18n/client/DateTimeParse_en_Test.java b/user/test/com/google/gwt/i18n/client/DateTimeParse_en_Test.java
index 9cd9b7e..1915d72 100644
--- a/user/test/com/google/gwt/i18n/client/DateTimeParse_en_Test.java
+++ b/user/test/com/google/gwt/i18n/client/DateTimeParse_en_Test.java
@@ -648,17 +648,17 @@
DateTimeFormat fmt = DateTimeFormat.getFormat("MM-dd-yyyy");
Date dateActual = new Date(87, 10, 22);
Date dateOnly = fmt.parse("11-22-1987");
- assertEquals(dateOnly.getHours(), 0);
- assertEquals(dateOnly.getMinutes(), 0);
- assertEquals(dateOnly.getSeconds(), 0);
+ assertEquals(0, dateOnly.getHours());
+ assertEquals(0, dateOnly.getMinutes());
+ assertEquals(0, dateOnly.getSeconds());
assertEquals(dateOnly.getTime(), dateActual.getTime());
// Only specify a time, should use current date
fmt = DateTimeFormat.getFormat("hha");
dateOnly = fmt.parse("4PM");
- assertEquals(dateOnly.getHours(), 16);
- assertEquals(dateOnly.getMinutes(), 0);
- assertEquals(dateOnly.getSeconds(), 0);
+ assertEquals(16, dateOnly.getHours());
+ assertEquals(0, dateOnly.getMinutes());
+ assertEquals(0, dateOnly.getSeconds());
}
public void testRFC3339() {
diff --git a/user/test/com/google/gwt/i18n/shared/BidiFormatterBaseTest.java b/user/test/com/google/gwt/i18n/shared/BidiFormatterBaseTest.java
index 4eaaf96..f679cc4 100644
--- a/user/test/com/google/gwt/i18n/shared/BidiFormatterBaseTest.java
+++ b/user/test/com/google/gwt/i18n/shared/BidiFormatterBaseTest.java
@@ -81,17 +81,17 @@
TestableBidiFormatterBase.getInstance(DEFAULT, true); // DEFAULT context
public void testGetInstance() {
- assertEquals(ltrFmt.getContextDir(), LTR);
- assertEquals(rtlFmt.getContextDir(), RTL);
- assertEquals(unkFmt.getContextDir(), DEFAULT);
+ assertEquals(LTR, ltrFmt.getContextDir());
+ assertEquals(RTL, rtlFmt.getContextDir());
+ assertEquals(DEFAULT, unkFmt.getContextDir());
assertFalse(ltrFmt.getAlwaysSpan());
assertFalse(rtlFmt.getAlwaysSpan());
assertFalse(unkFmt.getAlwaysSpan());
// Always-span formatters
- assertEquals(ltrAlwaysSpanFmt.getContextDir(), LTR);
- assertEquals(rtlAlwaysSpanFmt.getContextDir(), RTL);
- assertEquals(unkAlwaysSpanFmt.getContextDir(), DEFAULT);
+ assertEquals(LTR, ltrAlwaysSpanFmt.getContextDir());
+ assertEquals(RTL, rtlAlwaysSpanFmt.getContextDir());
+ assertEquals(DEFAULT, unkAlwaysSpanFmt.getContextDir());
assertTrue(ltrAlwaysSpanFmt.getAlwaysSpan());
assertTrue(rtlAlwaysSpanFmt.getAlwaysSpan());
assertTrue(unkAlwaysSpanFmt.getAlwaysSpan());
diff --git a/user/test/com/google/gwt/resources/client/TextResourceTest.java b/user/test/com/google/gwt/resources/client/TextResourceTest.java
index d59900a..d8ab954 100644
--- a/user/test/com/google/gwt/resources/client/TextResourceTest.java
+++ b/user/test/com/google/gwt/resources/client/TextResourceTest.java
@@ -55,7 +55,7 @@
final Resources r = GWT.create(Resources.class);
String result = r.bigTextResource().getText();
int length = result.length();
- assertEquals(length, 12737792);
+ assertEquals(12737792, length);
}
public void testInline() {
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/UiSafeHtmlInterpreterTest.java b/user/test/com/google/gwt/uibinder/elementparsers/UiSafeHtmlInterpreterTest.java
index fe44b3c..7f30b44 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/UiSafeHtmlInterpreterTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/UiSafeHtmlInterpreterTest.java
@@ -84,6 +84,6 @@
String interpretedValue = new UiSafeHtmlInterpreter(tester.writer)
.interpretElement(tester.getElem(tester.wrapXML(s).toString(), "ui:safehtml"));
- assertEquals(interpretedValue, "\" + \"--token--1--token--\" + \"");
+ assertEquals("\" + \"--token--1--token--\" + \"", interpretedValue);
}
}
diff --git a/user/test/com/google/gwt/uibinder/elementparsers/UiTextInterpreterTest.java b/user/test/com/google/gwt/uibinder/elementparsers/UiTextInterpreterTest.java
index 4d3aa67..93f3909 100644
--- a/user/test/com/google/gwt/uibinder/elementparsers/UiTextInterpreterTest.java
+++ b/user/test/com/google/gwt/uibinder/elementparsers/UiTextInterpreterTest.java
@@ -84,6 +84,6 @@
String interpretedValue = new UiTextInterpreter(tester.writer)
.interpretElement(tester.getElem(tester.wrapXML(s).toString(), "ui:text"));
- assertEquals(interpretedValue, "\" + \"--token--1--token--\" + \"");
+ assertEquals("\" + \"--token--1--token--\" + \"", interpretedValue);
}
}
diff --git a/user/test/com/google/gwt/user/cellview/client/CellTreeTest.java b/user/test/com/google/gwt/user/cellview/client/CellTreeTest.java
index 1e7e816..229a7e6 100644
--- a/user/test/com/google/gwt/user/cellview/client/CellTreeTest.java
+++ b/user/test/com/google/gwt/user/cellview/client/CellTreeTest.java
@@ -309,7 +309,7 @@
cellTree.setKeyboardSelectedTreeNode(l3Node, 0, true);
fail("should have thrown");
} catch (IllegalStateException e) {
- assertEquals(e.getMessage(), "TreeNode no longer exists.");
+ assertEquals("TreeNode no longer exists.", e.getMessage());
}
// Try to select a subtree node in closed subtree
@@ -317,7 +317,7 @@
cellTree.setKeyboardSelectedTreeNode(l2Node, 0, true);
fail("should have thrown");
} catch (IllegalStateException e) {
- assertEquals(e.getMessage(), "TreeNode no longer exists.");
+ assertEquals("TreeNode no longer exists.", e.getMessage());
}
// Still ok to select closed subtree node
@@ -337,7 +337,7 @@
cellTree.setKeyboardSelectedTreeNode(l1Node, 0, true);
fail("should have thrown");
} catch (IllegalArgumentException e) {
- assertEquals(e.getMessage(), "The tree node does not belong to the tree.");
+ assertEquals("The tree node does not belong to the tree.", e.getMessage());
}
}
@@ -347,11 +347,11 @@
// Open nodes: a and aj
TreeNode l1Node = root.setChildOpen(0, true); // a
- assertEquals(l1Node.getValue(), "a");
+ assertEquals("a", l1Node.getValue());
TreeNode l2Node = l1Node.setChildOpen(9, true); // aj
- assertEquals(l2Node.getValue(), "aj");
+ assertEquals("aj", l2Node.getValue());
// To force tree structure changes (internal flush()).
- assertEquals(l2Node.getChildCount(), 10);
+ assertEquals(10, l2Node.getChildCount());
// CellTree structure with node 'a' and 'aj' opened.
List<String> expectedNavigationPath = Arrays.asList("a",
@@ -360,7 +360,7 @@
"b", "c", "d", "e", "f", "g", "h", "i", "j");
// Default KeyboardSelected is at "a"
- assertEquals(cellTree.getKeyboardSelectedTreeNode().getValue(), "a");
+ assertEquals("a", cellTree.getKeyboardSelectedTreeNode().getValue());
int steps = expectedNavigationPath.size() - 1;
assertEquals(expectedNavigationPath, repeatKeyInTree(cellTree, KeyCodes.KEY_DOWN, steps));
diff --git a/user/test/com/google/gwt/user/client/CookieTest.java b/user/test/com/google/gwt/user/client/CookieTest.java
index 8f9073f..505d858 100644
--- a/user/test/com/google/gwt/user/client/CookieTest.java
+++ b/user/test/com/google/gwt/user/client/CookieTest.java
@@ -61,7 +61,7 @@
// Differentiate null cookie from '' cookie.
Cookies.setCookie("novalue", "", expires);
- assertEquals(Cookies.getCookie("novalue"), "");
+ assertEquals("", Cookies.getCookie("novalue"));
assertEquals(Cookies.getCookie("notpresent"), null);
}
@@ -103,24 +103,25 @@
delayTestFinish(7000);
// Wait until the cookie expires before checking it
- Timer timer = new Timer() {
- @Override
- public void run() {
- // Verify that the early expiring cookie does NOT exist
- assertNull(Cookies.getCookie(earlyCookie));
+ Timer timer =
+ new Timer() {
+ @Override
+ public void run() {
+ // Verify that the early expiring cookie does NOT exist
+ assertNull(Cookies.getCookie(earlyCookie));
- // Verify that the late expiring cookie does exist
- assertEquals(Cookies.getCookie(lateCookie), "late");
+ // Verify that the late expiring cookie does exist
+ assertEquals("late", Cookies.getCookie(lateCookie));
- // Verify the session cookie doesn't expire
- assertEquals(Cookies.getCookie(sessionCookie), "forever");
- Cookies.removeCookie(sessionCookie);
- assertNull(Cookies.getCookie(sessionCookie));
+ // Verify the session cookie doesn't expire
+ assertEquals("forever", Cookies.getCookie(sessionCookie));
+ Cookies.removeCookie(sessionCookie);
+ assertNull(Cookies.getCookie(sessionCookie));
- // Finish the test
- finishTest();
- }
- };
+ // Finish the test
+ finishTest();
+ }
+ };
timer.schedule(6000);
}
diff --git a/user/test/com/google/gwt/user/client/WindowTest.java b/user/test/com/google/gwt/user/client/WindowTest.java
index 4d1a29d..895dab3 100644
--- a/user/test/com/google/gwt/user/client/WindowTest.java
+++ b/user/test/com/google/gwt/user/client/WindowTest.java
@@ -142,42 +142,42 @@
// typical case
map = Window.Location.buildListParamMap("?fuzzy=bunnies&foo=bar&num=42");
- assertEquals(map.size(), 3);
- assertEquals(map.get("foo").get(0), "bar");
- assertEquals(map.get("fuzzy").get(0), "bunnies");
+ assertEquals(3, map.size());
+ assertEquals("bar", map.get("foo").get(0));
+ assertEquals("bunnies", map.get("fuzzy").get(0));
// multiple values for the same parameter
map = Window.Location.buildListParamMap(
"?fuzzy=bunnies&foo=bar&num=42&foo=baz");
- assertEquals(map.size(), 3);
- assertEquals(map.get("foo").get(0), "bar");
- assertEquals(map.get("foo").get(1), "baz");
+ assertEquals(3, map.size());
+ assertEquals("bar", map.get("foo").get(0));
+ assertEquals("baz", map.get("foo").get(1));
// no query parameters.
map = Window.Location.buildListParamMap("");
- assertEquals(map.size(), 0);
+ assertEquals(0, map.size());
// blank keys should be ignored, but blank values are OK. Also,
// keys can contain whitespace. (but the browser may give whitespace
// back as escaped).
map = Window.Location.buildListParamMap("?&& &a&b=&c=c&d=d=d&=e&f=2&f=1&");
- assertEquals(map.size(), 6);
- assertEquals(map.get(" ").get(0), "");
- assertEquals(map.get("a").get(0), "");
- assertEquals(map.get("b").get(0), "");
- assertEquals(map.get("c").get(0), "c");
- assertEquals(map.get("d").get(0), "d=d");
- assertEquals(map.get("f").get(0), "2");
- assertEquals(map.get("f").get(1), "1");
+ assertEquals(6, map.size());
+ assertEquals("", map.get(" ").get(0));
+ assertEquals("", map.get("a").get(0));
+ assertEquals("", map.get("b").get(0));
+ assertEquals("c", map.get("c").get(0));
+ assertEquals("d=d", map.get("d").get(0));
+ assertEquals("2", map.get("f").get(0));
+ assertEquals("1", map.get("f").get(1));
// Values escaped with hex codes should work too.
map = Window.Location.buildListParamMap("?foo=bar%20baz%3aqux");
- assertEquals(map.get("foo").get(0), "bar baz:qux");
+ assertEquals("bar baz:qux", map.get("foo").get(0));
// Malformed URI sequence should not make the app break (issue #7741)
map = Window.Location.buildListParamMap("?foo=%E4&bar=%3Aqux");
- assertEquals(map.get("foo").get(0), "%E4");
- assertEquals(map.get("bar").get(0), ":qux");
+ assertEquals("%E4", map.get("foo").get(0));
+ assertEquals(":qux", map.get("bar").get(0));
}
public void testNavigator() {
@@ -360,15 +360,15 @@
Window.addWindowResizeListener(r2);
ListenerTester.fire();
- assertEquals(ListenerTester.resize, 2);
+ assertEquals(2, ListenerTester.resize);
Window.removeWindowResizeListener(r1);
ListenerTester.fire();
- assertEquals(ListenerTester.resize, 1);
+ assertEquals(1, ListenerTester.resize);
Window.removeWindowResizeListener(r2);
ListenerTester.fire();
- assertEquals(ListenerTester.resize, 0);
+ assertEquals(0, ListenerTester.resize);
}
}
diff --git a/user/test/com/google/gwt/xml/client/XMLTest.java b/user/test/com/google/gwt/xml/client/XMLTest.java
index e979734..6a1396b 100644
--- a/user/test/com/google/gwt/xml/client/XMLTest.java
+++ b/user/test/com/google/gwt/xml/client/XMLTest.java
@@ -144,7 +144,7 @@
de.setAttribute("created", "true");
assertEquals("true", de.getAttribute("created"));
de.setAttribute("set", "toAValue");
- assertEquals(de.getAttribute("set"), "toAValue");
+ assertEquals("toAValue", de.getAttribute("set"));
assertTrue(de.getAttributeNode("set").getSpecified());
assertEquals(de.getAttributeNode("unset"), null);
}
@@ -196,9 +196,9 @@
public void testDocument() {
Document d = createTestDocument();
NodeList e1Nodes = d.getElementsByTagName("e1");
- assertEquals(e1Nodes.getLength(), 1);
+ assertEquals(1, e1Nodes.getLength());
Node e1Node = e1Nodes.item(0);
- assertEquals(((Element) e1Node).getTagName(), "e1");
+ assertEquals("e1", ((Element) e1Node).getTagName());
// It used to be that XML nodes without a DTD would never be returned by getElementById().
// In DOM 4, an Element's "id" attribute is always used as its id. [1]
@@ -227,9 +227,9 @@
Document d = createTestDocument();
Element top = d.getDocumentElement();
NodeList el = top.getElementsByTagName("e1");
- assertEquals(el.getLength(), 1);
+ assertEquals(1, el.getLength());
NodeList deepNodes = top.getElementsByTagName("deep");
- assertEquals(deepNodes.getLength(), 2);
+ assertEquals(2, deepNodes.getLength());
Element d1 = (Element) deepNodes.item(0);
assertTrue(d1.hasAttribute("depth"));
assertFalse(d1.hasAttribute("height"));
@@ -267,8 +267,8 @@
public void testNamedNodeMap() {
Document d = createTestDocument();
NamedNodeMap m = d.getDocumentElement().getAttributes();
- assertEquals(((Attr) m.getNamedItem("fluffy")).getValue(), "true");
- assertEquals(m.getLength(), 2);
+ assertEquals("true", ((Attr) m.getNamedItem("fluffy")).getValue());
+ assertEquals(2, m.getLength());
}
public void testNavigation() {
@@ -280,7 +280,7 @@
d.getChildNodes().item(2));
assertEquals("getDocumentElement", documentElement, d.getChildNodes().item(
1));
- assertEquals("getTagName", documentElement.getTagName(), "doc");
+ assertEquals("getTagName", "doc", documentElement.getTagName());
NodeList documentElementChildNodes = documentElement.getChildNodes();
int deChildNodesLength = documentElementChildNodes.getLength();
assertEquals("getFirstChild", documentElement.getFirstChild(),
@@ -305,17 +305,17 @@
top.appendChild(xxx);
Text yyy = ns.createTextNode("yyy");
top.appendChild(yyy);
- assertEquals(xxx.getNodeValue(), "xxx");
+ assertEquals("xxx", xxx.getNodeValue());
assertEquals(xxx.getParentNode(), top);
xxx.setNodeValue("x");
- assertEquals(xxx.getData(), "x");
+ assertEquals("x", xxx.getData());
assertEquals(xxx.getOwnerDocument(), ns);
top.removeChild(xxx);
- assertEquals(top.getChildNodes().getLength(), 1);
+ assertEquals(1, top.getChildNodes().getLength());
Comment commentNode = ns.createComment("comment ccc");
top.replaceChild(commentNode, yyy);
assertEquals(top.getFirstChild(), commentNode);
- assertEquals(top.getChildNodes().getLength(), 1);
+ assertEquals(1, top.getChildNodes().getLength());
}
/**
@@ -353,19 +353,19 @@
+ " xmlns:isbn=\'urn:ISBN:0-395-36341-6\'>\r\n"
+ " <bk:title>Cheaper by the Dozen</bk:title>\r\n"
+ " <isbn:number>1568491379</isbn:number>\r\n" + "</bk:book>");
- assertEquals(d.getDocumentElement().getNodeName(), "bk:book");
- assertEquals(d.getDocumentElement().getPrefix(), "bk");
- assertEquals(d.getElementsByTagName("book").getLength(), 1);
+ assertEquals("bk:book", d.getDocumentElement().getNodeName());
+ assertEquals("bk", d.getDocumentElement().getPrefix());
+ assertEquals(1, d.getElementsByTagName("book").getLength());
assertEquals(d.getElementsByTagName("book").item(0), d.getDocumentElement());
}
public void testProcessingInstruction() {
Document d = createTestDocument();
ProcessingInstruction pi = (ProcessingInstruction) d.getChildNodes().item(0);
- assertEquals(pi.getTarget(), "target");
- assertEquals(pi.getData(), "some data");
+ assertEquals("target", pi.getTarget());
+ assertEquals("some data", pi.getData());
pi.setData("other data");
- assertEquals(pi.getData(), "other data");
+ assertEquals("other data", pi.getData());
}
public void testText() {
@@ -434,22 +434,24 @@
assertEquals("t and leftT parent equality", t.getParentNode(),
rightT.getParentNode());
assertEquals("leftT.getPreviousSibling", rightT.getPreviousSibling(), t);
- assertEquals("t.length", t.getData().length(), 5);
- assertEquals("leftT.length", rightT.getData().length(), 5);
- assertEquals("t data", t.getData(), "01234");
- assertEquals("LeftT data", rightT.getData(), "56789");
+ assertEquals("t.length", 5, t.getData().length());
+ assertEquals("leftT.length", 5, rightT.getData().length());
+ assertEquals("t data", "01234", t.getData());
+ assertEquals("LeftT data", "56789", rightT.getData());
CDATASection cd = (CDATASection) d.getDocumentElement().getChildNodes().item(
7);
Text rightCD = cd.splitText(5);
assertEquals("cd and leftCd parent equality", cd.getParentNode(),
rightCD.getParentNode());
assertEquals("leftCD.getPreviousSibling", rightCD.getPreviousSibling(), cd);
- assertEquals("cd length", cd.getData().length(), 5);
- assertEquals("leftCD.length", rightCD.getData().length(), 5);
- assertEquals("cd data", cd.getData(), "klmno");
- assertEquals("leftCD data", rightCD.getData(), "pqrst");
+ assertEquals("cd length", 5, cd.getData().length());
+ assertEquals("leftCD.length", 5, rightCD.getData().length());
+ assertEquals("cd data", "klmno", cd.getData());
+ assertEquals("leftCD data", "pqrst", rightCD.getData());
d.getDocumentElement().normalize();
- assertEquals("normalized t", d.getDocumentElement().getChildNodes().item(
- 3).toString(), "0123456789abcdefghij");
+ assertEquals(
+ "normalized t",
+ "0123456789abcdefghij",
+ d.getDocumentElement().getChildNodes().item(3).toString());
}
}
diff --git a/user/test/com/google/web/bindery/autobean/shared/SplittableTest.java b/user/test/com/google/web/bindery/autobean/shared/SplittableTest.java
index c16b797..1977fc0 100644
--- a/user/test/com/google/web/bindery/autobean/shared/SplittableTest.java
+++ b/user/test/com/google/web/bindery/autobean/shared/SplittableTest.java
@@ -279,10 +279,10 @@
Splittable data = StringQuoter.split("[\"a\",\"b\",\"c\",\"d\"]");
SplittableList<String> list =
new SplittableList<String>(data, AutoBeanCodexImpl.valueCoder(String.class), testState);
- assertEquals(list.size(), 4);
+ assertEquals(4, list.size());
boolean removed = list.remove("b");
assertTrue(removed);
- assertEquals(list.size(), 3);
+ assertEquals(3, list.size());
assertTrue(list.equals(Arrays.asList("a", "c", "d")));
assertEquals("a", list.get(0));
assertTrue(list.contains("a"));
diff --git a/user/test/org/apache/commons/collections/TestArrayList.java b/user/test/org/apache/commons/collections/TestArrayList.java
index 63ef8b3..32eb554 100644
--- a/user/test/org/apache/commons/collections/TestArrayList.java
+++ b/user/test/org/apache/commons/collections/TestArrayList.java
@@ -15,7 +15,8 @@
*/
// MODIFIED BY GOOGLE
package org.apache.commons.collections;
- import java.util.List;
+
+import java.util.List;
/**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -33,18 +34,15 @@
public void testNewArrayList()
{
assertTrue("New list is empty", list.isEmpty());
- assertEquals("New list has size zero", list.size(), 0);
-
-
-
+ assertEquals("New list has size zero", 0, list.size());
}
public void testSearch()
{
list.add("First Item");
list.add("Last Item");
- assertEquals("First item is 'First Item'", list.get(0), "First Item");
- assertEquals("Last Item is 'Last Item'", list.get(1), "Last Item");
+ assertEquals("First item is 'First Item'", "First Item", list.get(0));
+ assertEquals("Last Item is 'Last Item'", "Last Item", list.get(1));
}
}
diff --git a/user/test/org/apache/commons/collections/TestList.java b/user/test/org/apache/commons/collections/TestList.java
index f00824a..e951855 100644
--- a/user/test/org/apache/commons/collections/TestList.java
+++ b/user/test/org/apache/commons/collections/TestList.java
@@ -15,7 +15,7 @@
*/
package org.apache.commons.collections;
- import java.util.AbstractCollection;
+import java.util.AbstractCollection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -25,7 +25,6 @@
import java.util.ListIterator;
import java.util.NoSuchElementException;
-
/**
* Tests base {@link java.util.List} methods and contracts.
* <p>
@@ -377,11 +376,9 @@
assertTrue("Iterator shouldn't have previous", !iter.hasPrevious());
int nextIndex = iter.nextIndex();
- assertEquals("nextIndex should be 0, actual value: " + nextIndex,
- nextIndex, 0);
+ assertEquals("nextIndex should be 0, actual value: " + nextIndex, 0, nextIndex);
int prevIndex = iter.previousIndex();
- assertEquals("previousIndex should be -1, actual value: " + prevIndex,
- prevIndex, -1);
+ assertEquals("previousIndex should be -1, actual value: " + prevIndex, -1, prevIndex);
try {
iter.previous();
@@ -581,8 +578,7 @@
Object[] other = getOtherElements();
for (int i = 0; i < other.length; i++) {
- assertEquals("indexOf should return -1 for nonexistent element",
- list1.indexOf(other[i]), -1);
+ assertEquals("indexOf should return -1 for nonexistent element", -1, list1.indexOf(other[i]));
verify();
}
}
@@ -606,8 +602,10 @@
Object[] other = getOtherElements();
for (int i = 0; i < other.length; i++) {
- assertEquals("lastIndexOf should return -1 for nonexistent " +
- "element", list1.lastIndexOf(other[i]), -1);
+ assertEquals(
+ "lastIndexOf should return -1 for nonexistent " + "element",
+ -1,
+ list1.lastIndexOf(other[i]));
verify();
}
}
