summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2011-10-18 13:49:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-18 13:49:20 -0700
commitbea6b3d20eabc4c9bc03708955e26e696cff5c22 (patch)
tree4d3f4c7c05f26398a163b0eb62d778be882814b2
parent0aaf7fc35b83966eda91a41d896e3bc8b447d3d1 (diff)
parent72ef3ad97f1a396a4c55e5fbc16edee843aa8f12 (diff)
downloadlibcore-bea6b3d20eabc4c9bc03708955e26e696cff5c22.zip
libcore-bea6b3d20eabc4c9bc03708955e26e696cff5c22.tar.gz
libcore-bea6b3d20eabc4c9bc03708955e26e696cff5c22.tar.bz2
Merge "Don't require exception priority to match any particular implementation." into ics-mr0
-rw-r--r--luni/src/test/java/tests/api/java/util/ArraysTest.java56
1 files changed, 0 insertions, 56 deletions
diff --git a/luni/src/test/java/tests/api/java/util/ArraysTest.java b/luni/src/test/java/tests/api/java/util/ArraysTest.java
index 81a5fc2..2ca8e70 100644
--- a/luni/src/test/java/tests/api/java/util/ArraysTest.java
+++ b/luni/src/test/java/tests/api/java/util/ArraysTest.java
@@ -972,13 +972,6 @@ public class ArraysTest extends junit.framework.TestCase {
fail("ArrayIndexOutOfBoundsException expected (2)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
- //exception order testing
- try {
- Arrays.sort(new byte[1], startIndex + 1, startIndex);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException ignore) {
- }
}
/**
@@ -1038,13 +1031,6 @@ public class ArraysTest extends junit.framework.TestCase {
fail("ArrayIndexOutOfBoundsException expected (2)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
- //exception order testing
- try {
- Arrays.sort(new char[1], startIndex + 1, startIndex);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException ignore) {
- }
}
/**
@@ -1127,13 +1113,6 @@ public class ArraysTest extends junit.framework.TestCase {
fail("ArrayIndexOutOfBoundsException expected (2)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
- //exception order testing
- try {
- Arrays.sort(new double[1], startIndex + 1, startIndex);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException ignore) {
- }
}
/**
@@ -1216,13 +1195,6 @@ public class ArraysTest extends junit.framework.TestCase {
fail("ArrayIndexOutOfBoundsException expected (2)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
- //exception order testing
- try {
- Arrays.sort(new float[1], startIndex + 1, startIndex);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException ignore) {
- }
}
/**
@@ -1281,13 +1253,6 @@ public class ArraysTest extends junit.framework.TestCase {
fail("ArrayIndexOutOfBoundsException expected (2)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
- //exception order testing
- try {
- Arrays.sort(new int[1], startIndex + 1, startIndex);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException ignore) {
- }
}
/**
@@ -1347,13 +1312,6 @@ public class ArraysTest extends junit.framework.TestCase {
fail("ArrayIndexOutOfBoundsException expected (2)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
- //exception order testing
- try {
- Arrays.sort(new long[1], startIndex + 1, startIndex);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException ignore) {
- }
}
/**
@@ -1425,13 +1383,6 @@ public class ArraysTest extends junit.framework.TestCase {
} catch (ArrayIndexOutOfBoundsException ignore) {
}
- //exception order testing
- try {
- Arrays.sort(new Object[1], startIndex + 1, startIndex);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException ignore) {
- }
-
Arrays.fill(reversedArray, 0, reversedArray.length/2, "String");
Arrays.fill(reversedArray, reversedArray.length/2, reversedArray.length, new Integer(1));
@@ -1585,13 +1536,6 @@ public class ArraysTest extends junit.framework.TestCase {
fail("ArrayIndexOutOfBoundsException expected (2)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
- //exception order testing
- try {
- Arrays.sort(new short[1], startIndex + 1, startIndex);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException ignore) {
- }
}
/**