Merge

jdk/test/java/math/BigInteger/BitLengthOverflow.java

@@ -41,6 +41,10 @@ public class BitLengthOverflow {
         } catch (ArithmeticException e) {
             // expected
             System.out.println("Overflow is reported by ArithmeticException, as expected");
+        } catch (OutOfMemoryError e) {
+            // possible
+            System.err.println("BitLengthOverflow skipped: OutOfMemoryError");
+            System.err.println("Run jtreg with -javaoption:-Xmx8g");
         }
     }
 }

jdk/test/java/math/BigInteger/DoubleValueOverflow.java

@@ -41,6 +41,10 @@ public class DoubleValueOverflow {
         } catch (ArithmeticException e) {
             // expected
             System.out.println("Overflow is reported by ArithmeticException, as expected");
+        } catch (OutOfMemoryError e) {
+            // possible
+            System.err.println("DoubleValueOverflow skipped: OutOfMemoryError");
+            System.err.println("Run jtreg with -javaoption:-Xmx8g");
         }
     }
 }

jdk/test/java/util/Arrays/Correct.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,44 +23,49 @@
 
 /*
  * @test
- * @bug 4726380
+ * @bug 4726380 8037097
  * @summary Check that different sorts give equivalent results.
+ * @run testng Correct
  */
 
 import java.util.*;
 
+import org.testng.annotations.Test;
+import org.testng.annotations.DataProvider;
+import static org.testng.Assert.fail;
+import static org.testng.Assert.assertEquals;
+
 public class Correct {
 
-    static Random rnd = new Random();
+    static final Random rnd = new Random();
     static final int ITERATIONS = 1000;
     static final int TEST_SIZE = 1000;
 
-    public static void main(String[] args) throws Exception {
+    @Test
-        Object[] array1 = null;
+    public void testDefaultSort() {
-        Object[] array2 = null;
-
         for (int i=0; i<ITERATIONS; i++) {
             int size = rnd.nextInt(TEST_SIZE) + 1;
-            array1 = (Object[])getIntegerArray(size);
+            Integer[] array1 = getIntegerArray(size);
-            array2 = (Object[])array1.clone();
+            Integer[] array2 = Arrays.copyOf(array1, array1.length);
             Arrays.sort(array1, array1.length/3, array1.length/2);
             stupidSort(array2, array2.length/3, array2.length/2);
-            if(!Arrays.equals(array1, array2))
+            assertEquals(array1, array2, "Arrays did not match. size=" + size);
-                throw new RuntimeException("failed!");
+        }
     }
 
+    @Test(dataProvider = "Comparators")
+    public void testComparatorSort(Comparator<Integer> comparator) {
         for (int i=0; i<ITERATIONS; i++) {
             int size = rnd.nextInt(TEST_SIZE) + 1;
-            array1 = (Object[])getIntegerArray(size);
+            Integer[] array1 = getIntegerArray(size);
-            array2 = (Object[])array1.clone();
+            Integer[] array2 = Arrays.copyOf(array1, array1.length);
-            Arrays.sort(array1, array1.length/3, array1.length/2, TEST_ORDER);
+            Arrays.sort(array1, array1.length/3, array1.length/2, comparator);
-            stupidSort(array2, array2.length/3, array2.length/2);
+            stupidSort(array2, array2.length/3, array2.length/2, comparator);
-            if(!Arrays.equals(array1, array2))
+            assertEquals(array1, array2, "Arrays did not match. size=" + size);
-                throw new RuntimeException("failed!");
         }
     }
 
-    static Integer[] getIntegerArray(int size) throws Exception {
+    static Integer[] getIntegerArray(int size) {
         Integer[] blah = new Integer[size];
         for (int x=0; x<size; x++) {
             blah[x] = new Integer(rnd.nextInt());
@@ -68,11 +73,14 @@ public class Correct {
         return blah;
     }
 
-    static void stupidSort(Object[] a1, int from, int to) throws Exception {
+    static void stupidSort(Integer[] a1, int from, int to) {
+        if (from > to - 1 )
+          return;
+
         for (int x=from; x<to; x++) {
-            Object lowest = new Integer(Integer.MAX_VALUE);
+            Integer lowest = a1[x];
-            int lowestIndex = 0;
+            int lowestIndex = x;
-            for (int y=x; y<to; y++) {
+            for (int y=x + 1; y<to; y++) {
                 if (((Comparable)a1[y]).compareTo((Comparable)lowest) < 0) {
                     lowest = a1[y];
                     lowestIndex = y;
@@ -84,19 +92,55 @@ public class Correct {
         }
     }
 
-    static void swap(Object x[], int a, int b) {
+    static void stupidSort(Integer[] a1, int from, int to, Comparator<Integer> comparator) {
-        Object t = x[a];
+        if (from > to - 1 )
+          return;
+
+        for (int x=from; x<to; x++) {
+            Integer lowest = a1[x];
+            int lowestIndex = x;
+            for (int y=x + 1; y<to; y++) {
+                if (comparator.compare(a1[y], lowest) < 0) {
+                    lowest = a1[y];
+                    lowestIndex = y;
+                }
+            }
+            if (lowestIndex != x) {
+                swap(a1, x, lowestIndex);
+            }
+        }
+    }
+
+    static <T> void swap(T[] x, int a, int b) {
+        T t = x[a];
         x[a] = x[b];
         x[b] = t;
     }
 
-    private static final Comparator TEST_ORDER = new IntegerComparator();
+    @DataProvider(name = "Comparators", parallel = true)
+    public static Iterator<Object[]> comparators() {
+        Object[][] comparators = new Object[][] {
+            new Object[] { Comparator.naturalOrder() },
+            new Object[] { Comparator.<Integer>naturalOrder().reversed() },
+            new Object[] { STANDARD_ORDER },
+            new Object[] { STANDARD_ORDER.reversed() },
+            new Object[] { REVERSE_ORDER },
+            new Object[] { REVERSE_ORDER.reversed() },
+            new Object[] { Comparator.comparingInt(Integer::intValue) }
+        };
 
-    private static class IntegerComparator implements Comparator {
+        return Arrays.asList(comparators).iterator();
-        public int compare(Object o1, Object o2) {
-            Comparable c1 = (Comparable)o1;
-            Comparable c2 = (Comparable)o2;
-            return  c1.compareTo(c2);
     }
+
+    private static final Comparator<Integer> STANDARD_ORDER = new Comparator<Integer>() {
+        public int compare(Integer o1, Integer o2) {
+            return  o1.compareTo(o2);
         }
+    };
+
+    private static final Comparator<Integer> REVERSE_ORDER = new Comparator<Integer>() {
+        public int compare(Integer o1, Integer o2) {
+            return - o1.compareTo(o2);
+        }
+    };
 }