| Index: compiler/javatests/com/google/dart/compiler/type/TypeTest.java
|
| diff --git a/compiler/javatests/com/google/dart/compiler/type/TypeTest.java b/compiler/javatests/com/google/dart/compiler/type/TypeTest.java
|
| index 39199f9790f3eb0f2fc8de091285a8059f28adb4..cbb60e959f0ac44a5419948046d0726f76cd2776 100644
|
| --- a/compiler/javatests/com/google/dart/compiler/type/TypeTest.java
|
| +++ b/compiler/javatests/com/google/dart/compiler/type/TypeTest.java
|
| @@ -20,53 +20,46 @@ public class TypeTest extends TypeTestCase {
|
|
|
| public void testToString() {
|
| Assert.assertEquals("Object", itype(object).toString());
|
| - Assert.assertEquals("Array<Object>", objectArray.toString());
|
| - Assert.assertEquals("GrowableArray<Object>", growableObjectArray.toString());
|
| + Assert.assertEquals("List<Object>", objectList.toString());
|
| Assert.assertEquals("Map<Object, Object>", objectMap.toString());
|
| Assert.assertEquals("ReverseMap<Object, Object>", reverseObjectMap.toString());
|
|
|
| Assert.assertEquals("CLASS Object", object.toString());
|
| - Assert.assertEquals("CLASS Array", array.toString());
|
| - Assert.assertEquals("CLASS GrowableArray", growableArray.toString());
|
| + Assert.assertEquals("CLASS List", list.toString());
|
| Assert.assertEquals("CLASS Map", map.toString());
|
| Assert.assertEquals("CLASS ReverseMap", reverseMap.toString());
|
|
|
| Assert.assertEquals("Object", object.getType().toString());
|
| - Assert.assertEquals("Array<E>", array.getType().toString());
|
| - Assert.assertEquals("GrowableArray<E>", growableArray.getType().toString());
|
| + Assert.assertEquals("List<E>", list.getType().toString());
|
| Assert.assertEquals("Map<K, V>", map.getType().toString());
|
| Assert.assertEquals("ReverseMap<K, V>", reverseMap.getType().toString());
|
| }
|
|
|
| public void testRaw() {
|
| Assert.assertFalse(itype(object).isRaw());
|
| - Assert.assertFalse(objectArray.isRaw());
|
| - Assert.assertFalse(growableObjectArray.isRaw());
|
| + Assert.assertFalse(objectList.isRaw());
|
| Assert.assertFalse(objectMap.isRaw());
|
| Assert.assertFalse(reverseObjectMap.isRaw());
|
|
|
| - Assert.assertTrue(itype(array).isRaw());
|
| - Assert.assertTrue(itype(array, itype(object), itype(object)).isRaw());
|
| + Assert.assertTrue(itype(list).isRaw());
|
| + Assert.assertTrue(itype(list, itype(object), itype(object)).isRaw());
|
|
|
| - Assert.assertFalse(itype(array, objectMap).isRaw());
|
| + Assert.assertFalse(itype(list, objectMap).isRaw());
|
| }
|
|
|
| public void testAsInstanceOf() {
|
| - Assert.assertSame(growableObjectArray, types.asInstanceOf(growableObjectArray, growableArray));
|
| + Assert.assertEquals(itype(object), types.asInstanceOf(objectList, object));
|
| + Assert.assertEquals(objectList, types.asInstanceOf(objectList, list));
|
|
|
| - Assert.assertEquals(itype(object), types.asInstanceOf(growableObjectArray, object));
|
| - Assert.assertEquals(objectArray, types.asInstanceOf(growableObjectArray, array));
|
| + Assert.assertNull(types.asInstanceOf(objectList, map));
|
|
|
| - Assert.assertNull(types.asInstanceOf(growableObjectArray, map));
|
| -
|
| - Assert.assertNull(types.asInstanceOf(itype(object), array));
|
| + Assert.assertNull(types.asInstanceOf(itype(object), list));
|
|
|
| Assert.assertEquals(intStringMap, types.asInstanceOf(stringIntReverseMap, map));
|
|
|
| Assert.assertFalse(stringIntMap.equals(types.asInstanceOf(stringIntReverseMap, map)));
|
|
|
| - Assert.assertEquals(itype(array), types.asInstanceOf(itype(array), array));
|
| - Assert.assertEquals(itype(array), types.asInstanceOf(itype(growableArray), array));
|
| + Assert.assertEquals(itype(list), types.asInstanceOf(itype(list), list));
|
| }
|
|
|
| public void testSubst() {
|
| @@ -98,26 +91,17 @@ public class TypeTest extends TypeTestCase {
|
| checkStrictSubtype(itype(intElement), itype(object));
|
| checkNotAssignable(itype(string), itype(intElement));
|
|
|
| - checkStrictSubtype(objectArray, itype(object));
|
|
|
| - checkStrictSubtype(growableObjectArray, itype(object));
|
| - checkStrictSubtype(growableObjectArray, objectArray);
|
| + checkStrictSubtype(objectList, itype(object));
|
|
|
| checkStrictSubtype(objectMap, itype(object));
|
|
|
| checkStrictSubtype(reverseObjectMap, itype(object));
|
| checkStrictSubtype(reverseObjectMap, objectMap);
|
|
|
| - checkNotAssignable(objectMap, objectArray);
|
| - checkNotAssignable(reverseObjectMap, objectArray);
|
| - checkNotAssignable(objectMap, growableObjectArray);
|
| - checkNotAssignable(reverseObjectMap, growableObjectArray);
|
| -
|
| - checkSubtype(itype(growableArray), growableObjectArray);
|
| - checkSubtype(growableObjectArray, itype(growableArray));
|
| -
|
| - checkStrictSubtype(itype(growableArray), itype(object));
|
| - checkStrictSubtype(itype(growableArray), itype(array));
|
| - checkStrictSubtype(itype(growableArray), objectArray);
|
| + checkNotAssignable(objectMap, objectList);
|
| + checkNotAssignable(reverseObjectMap, objectList);
|
| + checkNotAssignable(objectMap, objectList);
|
| + checkNotAssignable(reverseObjectMap, objectList);
|
| }
|
| }
|
|
|