--- old/test/jdk/sanity/releaseFile/CheckSource.java 2018-06-14 11:33:55.790167949 -0700 +++ /dev/null 2018-05-25 16:30:56.425740436 -0700 @@ -1,120 +0,0 @@ - -/* - * Copyright (c) 2018, 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. - */ - -/* - * @test - * @bug 8193660 - * @summary Check SOURCE line in "release" file for closedjdk - * @run main CheckSource - */ - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.FileNotFoundException; -import java.io.IOException; - -public class CheckSource { - - CheckSource(String dataFile, boolean isOpenJDK) { - // Read data files - readFile(dataFile, isOpenJDK); - } - - private void readFile(String fileName, boolean isOpenJDK) { - String fishForSOURCE = null; - - File file = new File(fileName); - - // open the stream to read in for Entries - try (BufferedReader buffRead = - new BufferedReader(new FileReader(fileName))) { - - // this is the string read - String readIn; - - // let's read some strings! - while ((readIn = buffRead.readLine()) != null) { - readIn = readIn.trim(); - - // throw out blank lines - if (readIn.length() == 0) - continue; - - // grab SOURCE line - if (readIn.startsWith("SOURCE=")) { - fishForSOURCE = readIn; - break; - } - } - } catch (FileNotFoundException fileExcept) { - throw new RuntimeException("File " + fileName + - " not found reading data!", fileExcept); - } catch (IOException ioExcept) { - throw new RuntimeException("Unexpected problem reading data!", - ioExcept); - } - - // was SOURCE even found? - if (fishForSOURCE == null) { - throw new RuntimeException("SOURCE line was not found!"); - } else { - // OK it was found, did it have correct sources? - System.out.println("The source string found: " + fishForSOURCE); - - // First it MUST have .: regardless of closed or openJDK - if (!fishForSOURCE.contains(".:")) { - throw new RuntimeException("The test failed, .: not found!"); - } - // take out the .: source path - fishForSOURCE = fishForSOURCE.replace(".:", ""); - - // if its closedJDK it MUST have open: - if (!isOpenJDK && !fishForSOURCE.contains("open:")) { - throw new RuntimeException("The test failed, open: not found!"); - } - // take out the open: source path - fishForSOURCE = fishForSOURCE.replace("open:", ""); - - // if any other source exists, that's an error - if (fishForSOURCE.contains(":")) { - throw new RuntimeException("The test failed, additional sources found!"); - } - } - - // Everything was fine - System.out.println("The test passed!"); - } - - public static void main(String args[]) { - String jdkPath = System.getProperty("test.jdk"); - String runtime = System.getProperty("java.runtime.name"); - - System.out.println("JDK Path : " + jdkPath); - System.out.println("Runtime Name : " + runtime); - - new CheckSource(jdkPath + "/release", - runtime.contains("OpenJDK")); - } -} --- /dev/null 2018-05-25 16:30:56.425740436 -0700 +++ new/test/jdk/build/releaseFile/CheckSource.java 2018-06-14 11:33:55.454167960 -0700 @@ -0,0 +1,120 @@ + +/* + * Copyright (c) 2018, 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. + */ + +/* + * @test + * @bug 8193660 + * @summary Check SOURCE line in "release" file for closedjdk + * @run main CheckSource + */ + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FileNotFoundException; +import java.io.IOException; + +public class CheckSource { + + CheckSource(String dataFile, boolean isOpenJDK) { + // Read data files + readFile(dataFile, isOpenJDK); + } + + private void readFile(String fileName, boolean isOpenJDK) { + String fishForSOURCE = null; + + File file = new File(fileName); + + // open the stream to read in for Entries + try (BufferedReader buffRead = + new BufferedReader(new FileReader(fileName))) { + + // this is the string read + String readIn; + + // let's read some strings! + while ((readIn = buffRead.readLine()) != null) { + readIn = readIn.trim(); + + // throw out blank lines + if (readIn.length() == 0) + continue; + + // grab SOURCE line + if (readIn.startsWith("SOURCE=")) { + fishForSOURCE = readIn; + break; + } + } + } catch (FileNotFoundException fileExcept) { + throw new RuntimeException("File " + fileName + + " not found reading data!", fileExcept); + } catch (IOException ioExcept) { + throw new RuntimeException("Unexpected problem reading data!", + ioExcept); + } + + // was SOURCE even found? + if (fishForSOURCE == null) { + throw new RuntimeException("SOURCE line was not found!"); + } else { + // OK it was found, did it have correct sources? + System.out.println("The source string found: " + fishForSOURCE); + + // First it MUST have .: regardless of closed or openJDK + if (!fishForSOURCE.contains(".:")) { + throw new RuntimeException("The test failed, .: not found!"); + } + // take out the .: source path + fishForSOURCE = fishForSOURCE.replace(".:", ""); + + // if its closedJDK it MUST have open: + if (!isOpenJDK && !fishForSOURCE.contains("open:")) { + throw new RuntimeException("The test failed, open: not found!"); + } + // take out the open: source path + fishForSOURCE = fishForSOURCE.replace("open:", ""); + + // if any other source exists, that's an error + if (fishForSOURCE.contains(":")) { + throw new RuntimeException("The test failed, additional sources found!"); + } + } + + // Everything was fine + System.out.println("The test passed!"); + } + + public static void main(String args[]) { + String jdkPath = System.getProperty("test.jdk"); + String runtime = System.getProperty("java.runtime.name"); + + System.out.println("JDK Path : " + jdkPath); + System.out.println("Runtime Name : " + runtime); + + new CheckSource(jdkPath + "/release", + runtime.contains("OpenJDK")); + } +}