Fixes another build break from 3073. Some Java compilers allow "aByte += 1" where
aByte is of type Byte. Others do not. This patch changes the relevant test to use a Long
instead of a Byte.
Review by: scottb
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.5@3078 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/test/com/google/gwt/dev/jjs/test/AutoboxTest.java b/user/test/com/google/gwt/dev/jjs/test/AutoboxTest.java
index ea9559e..6c481a3 100644
--- a/user/test/com/google/gwt/dev/jjs/test/AutoboxTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/AutoboxTest.java
@@ -111,96 +111,6 @@
}
/**
- * Tests operations like += and *= where the left-hand side is a boxed type.
- */
- public void testCompoundAssignmentsWithByte() {
- {
- Long long1 = 10L;
- Long long2 = long1;
- long2 += 5;
- assertEquals(10L, (long) long1);
- assertEquals(15L, (long) long2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 += 1;
- assertEquals(10, (byte) b);
- assertEquals(11, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 -= 1;
- assertEquals(10, (byte) b);
- assertEquals(9, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 *= 2;
- assertEquals(10, (byte) b);
- assertEquals(20, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 /= 2;
- assertEquals(10, (byte) b);
- assertEquals(5, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 %= 3;
- assertEquals(10, (byte) b);
- assertEquals(1, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 <<= 1;
- assertEquals(10, (byte) b);
- assertEquals(20, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 >>= 1;
- assertEquals(10, (byte) b);
- assertEquals(5, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 >>>= 1;
- assertEquals(10, (byte) b);
- assertEquals(5, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 &= 8;
- assertEquals(10, (byte) b);
- assertEquals(8, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 |= 1;
- assertEquals(10, (byte) b);
- assertEquals(11, (byte) b2);
- }
- {
- Byte b = (byte) 10;
- Byte b2 = b;
- b2 ^= 1;
- assertEquals(10, (byte) b);
- assertEquals(11, (byte) b2);
- }
- }
-
- /**
* Test ++, --, and compound assignments like += when the left-hand side is a
* boxed Integer. Use assertNotSame to ensure that a new Integer is created
* instead of modifying the original integer in place. (Issue 2446).
@@ -356,6 +266,96 @@
}
/**
+ * Tests operations like += and *= where the left-hand side is a boxed Long.
+ */
+ public void testCompoundAssignmentsWithLong() {
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 += 5;
+ assertEquals(10L, (long) long1);
+ assertEquals(15L, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 += 1;
+ assertEquals(10, (long) long1);
+ assertEquals(11, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 -= 1;
+ assertEquals(10, (long) long1);
+ assertEquals(9, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 *= 2;
+ assertEquals(10, (long) long1);
+ assertEquals(20, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 /= 2;
+ assertEquals(10, (long) long1);
+ assertEquals(5, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 %= 3;
+ assertEquals(10, (long) long1);
+ assertEquals(1, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 <<= 1;
+ assertEquals(10, (long) long1);
+ assertEquals(20, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 >>= 1;
+ assertEquals(10, (long) long1);
+ assertEquals(5, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 >>>= 1;
+ assertEquals(10, (long) long1);
+ assertEquals(5, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 &= 8;
+ assertEquals(10, (long) long1);
+ assertEquals(8, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 |= 1;
+ assertEquals(10, (long) long1);
+ assertEquals(11, (long) long2);
+ }
+ {
+ Long long1 = 10L;
+ Long long2 = long1;
+ long2 ^= 1;
+ assertEquals(10, (long) long1);
+ assertEquals(11, (long) long2);
+ }
+ }
+
+ /**
* Tests ++ and -- on all boxed types. Use assertNotSame to ensure that a new
* wrapper is created instead of modifying the original boxed value in place.
* (Issue 2446).
