changeset 35998:4d6b098a501d

8149981: java/util/Formatter/Basic.java fails after JDK-8149896 Reviewed-by: rriggs, bpb
author darcy
date Tue, 16 Feb 2016 11:06:19 -0800
parents 394957e542bc
children b6bf26e04451
files jdk/test/java/util/Formatter/Basic-X.java.template jdk/test/java/util/Formatter/Basic.java jdk/test/java/util/Formatter/BasicBigDecimal.java jdk/test/java/util/Formatter/BasicBigInteger.java jdk/test/java/util/Formatter/BasicBoolean.java jdk/test/java/util/Formatter/BasicBooleanObject.java jdk/test/java/util/Formatter/BasicByte.java jdk/test/java/util/Formatter/BasicByteObject.java jdk/test/java/util/Formatter/BasicChar.java jdk/test/java/util/Formatter/BasicCharObject.java jdk/test/java/util/Formatter/BasicDateTime.java jdk/test/java/util/Formatter/BasicDouble.java jdk/test/java/util/Formatter/BasicDoubleObject.java jdk/test/java/util/Formatter/BasicFloat.java jdk/test/java/util/Formatter/BasicFloatObject.java jdk/test/java/util/Formatter/BasicInt.java jdk/test/java/util/Formatter/BasicIntObject.java jdk/test/java/util/Formatter/BasicLong.java jdk/test/java/util/Formatter/BasicLongObject.java jdk/test/java/util/Formatter/BasicShort.java jdk/test/java/util/Formatter/BasicShortObject.java
diffstat 21 files changed, 97 insertions(+), 90 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/test/java/util/Formatter/Basic-X.java.template	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/Basic-X.java.template	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -35,9 +35,6 @@
 import java.math.BigInteger;
 import java.text.DateFormatSymbols;
 import java.util.*;
-#if[double]
-import jdk.internal.math.DoubleConsts;
-#end[double]
 
 import static java.util.Calendar.*;
 #if[datetime]
@@ -1359,12 +1356,12 @@
         test("%.1a", "-0x1.0p0", -1.0);
         test("%.11a", "0x1.80000000000p1", 3.0);
         test("%.1a", "0x1.8p1", 3.0);
-        test("%.11a", "0x1.00000000000p-1022", DoubleConsts.MIN_NORMAL);
-        test("%.1a", "0x1.0p-1022", DoubleConsts.MIN_NORMAL);
+        test("%.11a", "0x1.00000000000p-1022", Double.MIN_NORMAL);
+        test("%.1a", "0x1.0p-1022", Double.MIN_NORMAL);
         test("%.11a", "0x1.00000000000p-1022",
-             Math.nextDown(DoubleConsts.MIN_NORMAL));
+             Math.nextDown(Double.MIN_NORMAL));
         test("%.1a", "0x1.0p-1022",
-             Math.nextDown(DoubleConsts.MIN_NORMAL));
+             Math.nextDown(Double.MIN_NORMAL));
         test("%.11a", "0x1.ffffffffffep-1023", 0x0.fffffffffffp-1022);
         test("%.1a", "0x1.0p-1022", 0x0.fffffffffffp-1022);
         test("%.30a", "0x0.000000000000100000000000000000p-1022", Double.MIN_VALUE);
--- a/jdk/test/java/util/Formatter/Basic.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/Basic.java	Tue Feb 16 11:06:19 2016 -0800
@@ -28,7 +28,7 @@
  *      6344623 6369500 6534606 6282094 6286592 6476425 5063507 6469160 6476168
  *      8059175
  *
- * @modules java.base/jdk.internal.math
+ * @modules java.base
  * @run shell/timeout=240 Basic.sh
  */
 
--- a/jdk/test/java/util/Formatter/BasicBigDecimal.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicBigDecimal.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1156,7 +1153,6 @@
 
         val = new BigDecimal(BigInteger.ZERO, 6);
         test("%.4f", "0.0000", val);
-
         val = new BigDecimal(BigInteger.ZERO, -6);
         test("%.4f", "0.0000", val);
 
--- a/jdk/test/java/util/Formatter/BasicBigInteger.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicBigInteger.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicBoolean.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicBoolean.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicBooleanObject.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicBooleanObject.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicByte.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicByte.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicByteObject.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicByteObject.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicChar.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicChar.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicCharObject.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicCharObject.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicDateTime.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicDateTime.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 import static java.util.SimpleTimeZone.*;
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicDouble.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicDouble.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-import jdk.internal.math.DoubleConsts;
-
-
 import static java.util.Calendar.*;
 
 
@@ -1359,12 +1356,12 @@
         test("%.1a", "-0x1.0p0", -1.0);
         test("%.11a", "0x1.80000000000p1", 3.0);
         test("%.1a", "0x1.8p1", 3.0);
-        test("%.11a", "0x1.00000000000p-1022", DoubleConsts.MIN_NORMAL);
-        test("%.1a", "0x1.0p-1022", DoubleConsts.MIN_NORMAL);
+        test("%.11a", "0x1.00000000000p-1022", Double.MIN_NORMAL);
+        test("%.1a", "0x1.0p-1022", Double.MIN_NORMAL);
         test("%.11a", "0x1.00000000000p-1022",
-             Math.nextDown(DoubleConsts.MIN_NORMAL));
+             Math.nextDown(Double.MIN_NORMAL));
         test("%.1a", "0x1.0p-1022",
-             Math.nextDown(DoubleConsts.MIN_NORMAL));
+             Math.nextDown(Double.MIN_NORMAL));
         test("%.11a", "0x1.ffffffffffep-1023", 0x0.fffffffffffp-1022);
         test("%.1a", "0x1.0p-1022", 0x0.fffffffffffp-1022);
         test("%.30a", "0x0.000000000000100000000000000000p-1022", Double.MIN_VALUE);
--- a/jdk/test/java/util/Formatter/BasicDoubleObject.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicDoubleObject.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1174,6 +1171,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %f - float, double, Double, BigDecimal
         //---------------------------------------------------------------------
--- a/jdk/test/java/util/Formatter/BasicFloat.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicFloat.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1157,6 +1154,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %f - float
         //---------------------------------------------------------------------
--- a/jdk/test/java/util/Formatter/BasicFloatObject.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicFloatObject.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1190,6 +1187,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %g
         //
--- a/jdk/test/java/util/Formatter/BasicInt.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicInt.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicIntObject.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicIntObject.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicLong.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicLong.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicLongObject.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicLongObject.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicShort.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicShort.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //
--- a/jdk/test/java/util/Formatter/BasicShortObject.java	Tue Feb 16 10:54:05 2016 -0800
+++ b/jdk/test/java/util/Formatter/BasicShortObject.java	Tue Feb 16 11:06:19 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -36,9 +36,6 @@
 import java.text.DateFormatSymbols;
 import java.util.*;
 
-
-
-
 import static java.util.Calendar.*;
 
 
@@ -1660,6 +1657,10 @@
 
 
 
+
+
+
+
         //---------------------------------------------------------------------
         // %t
         //