changeset 48229:703732bb4a32

8181118: update java/time tests to use RandomFactory from the top level testlibrary Reviewed-by: rriggs
author iignatyev
date Fri, 08 Dec 2017 11:03:37 -0800
parents 584a3ba42176
children b9a19d1e61f2
files test/jdk/TEST.ROOT test/jdk/java/time/tck/TEST.properties test/jdk/java/time/test/TEST.properties test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java test/jdk/lib/testlibrary/jdk/testlibrary/RandomFactory.java
diffstat 5 files changed, 7 insertions(+), 115 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/TEST.ROOT	Fri Dec 08 11:05:42 2017 -0800
+++ b/test/jdk/TEST.ROOT	Fri Dec 08 11:03:37 2017 -0800
@@ -39,7 +39,7 @@
     vm.cds
 
 # Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b09
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
--- a/test/jdk/java/time/tck/TEST.properties	Fri Dec 08 11:05:42 2017 -0800
+++ b/test/jdk/java/time/tck/TEST.properties	Fri Dec 08 11:03:37 2017 -0800
@@ -1,5 +1,5 @@
 # java.time tests use TestNG
 TestNG.dirs = ..
 othervm.dirs = java/time/chrono
-lib.dirs = ../../../lib/testlibrary
-lib.build = jdk.testlibrary.RandomFactory
+lib.dirs = /test/lib
+lib.build = jdk.test.lib.RandomFactory
--- a/test/jdk/java/time/test/TEST.properties	Fri Dec 08 11:05:42 2017 -0800
+++ b/test/jdk/java/time/test/TEST.properties	Fri Dec 08 11:03:37 2017 -0800
@@ -1,5 +1,5 @@
 # java.time tests use TestNG
 TestNG.dirs = ..
 othervm.dirs = java/time/chrono java/time/format
-lib.dirs = ../../../lib/testlibrary
-lib.build = jdk.testlibrary.RandomFactory
+lib.dirs = /test/lib
+lib.build = jdk.test.lib.RandomFactory
--- a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java	Fri Dec 08 11:05:42 2017 -0800
+++ b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java	Fri Dec 08 11:03:37 2017 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -42,7 +42,7 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.TimeZone;
-import jdk.testlibrary.RandomFactory;
+import jdk.test.lib.RandomFactory;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
--- a/test/jdk/lib/testlibrary/jdk/testlibrary/RandomFactory.java	Fri Dec 08 11:05:42 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2015, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.testlibrary;
-
-import java.util.Random;
-import java.util.SplittableRandom;
-
-/**
- * Factory class which generates and prints to STDOUT a long-valued seed
- * for use in initializing a PRNG.  An instance of {@code Random} or
- * {@code SplittableRandom} may likewise be obtained.
- *
- * @deprecated  This class is deprecated. Use the one from
- *              {@code <root>/test/lib/jdk/test/lib}
- *
- */
-@Deprecated
-public class RandomFactory {
-    /**
-     * Attempt to obtain the seed from the value of the "seed" property.
-     * @return The seed or {@code null} if the "seed" property was not set or
-     *         could not be parsed.
-     */
-    private static Long getSystemSeed() {
-        Long seed = null;
-        try {
-            // note that Long.valueOf(null) also throws a
-            // NumberFormatException so if the property is undefined this
-            // will still work correctly
-            seed = Long.valueOf(System.getProperty("seed"));
-        } catch (NumberFormatException e) {
-            // do nothing: seed is still null
-        }
-
-        return seed;
-    }
-
-    /**
-     * Obtain a seed from an independent PRNG.
-     *
-     * @return A random seed.
-     */
-    private static long getRandomSeed() {
-        return new Random().nextLong();
-    }
-
-    /**
-     * Obtain and print to STDOUT a seed appropriate for initializing a PRNG.
-     * If the system property "seed" is set and has value which may be correctly
-     * parsed it is used, otherwise a seed is generated using an independent
-     * PRNG.
-     *
-     * @return The seed.
-     */
-    public static long getSeed() {
-        Long seed = getSystemSeed();
-        if (seed == null) {
-            seed = getRandomSeed();
-        }
-        System.out.println("Seed from RandomFactory = "+seed+"L");
-        return seed;
-    }
-
-    /**
-     * Obtain and print to STDOUT a seed and use it to initialize a new
-     * {@code Random} instance which is returned. If the system
-     * property "seed" is set and has value which may be correctly parsed it
-     * is used, otherwise a seed is generated using an independent PRNG.
-     *
-     * @return The {@code Random} instance.
-     */
-    public static Random getRandom() {
-        return new Random(getSeed());
-    }
-
-    /**
-     * Obtain and print to STDOUT a seed and use it to initialize a new
-     * {@code SplittableRandom} instance which is returned. If the system
-     * property "seed" is set and has value which may be correctly parsed it
-     * is used, otherwise a seed is generated using an independent PRNG.
-     *
-     * @return The {@code SplittableRandom} instance.
-     */
-    public static SplittableRandom getSplittableRandom() {
-        return new SplittableRandom(getSeed());
-    }
-}