Mon, 03 Oct 2016 11:21:14 -0700
Added tag jdk8u122-b02 for changeset 2baeb96fa198
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /* |
aoqi@0 | 25 | * @test |
aoqi@0 | 26 | * @bug 8032819 |
aoqi@0 | 27 | * @summary Extra empty line between field declarations for the "-v -c" and "-v -l" combination of options |
aoqi@0 | 28 | * @compile -g T8032819.java |
aoqi@0 | 29 | * @run main T8032819 |
aoqi@0 | 30 | */ |
aoqi@0 | 31 | |
aoqi@0 | 32 | import java.io.*; |
aoqi@0 | 33 | import java.util.*; |
aoqi@0 | 34 | |
aoqi@0 | 35 | public class T8032819 { |
aoqi@0 | 36 | static class Fields { |
aoqi@0 | 37 | int f1; |
aoqi@0 | 38 | int f2; |
aoqi@0 | 39 | } |
aoqi@0 | 40 | |
aoqi@0 | 41 | public static void main(String... args) throws Exception { |
aoqi@0 | 42 | new T8032819().run(); |
aoqi@0 | 43 | } |
aoqi@0 | 44 | |
aoqi@0 | 45 | void run() throws Exception { |
aoqi@0 | 46 | Class<?> clazz = Fields.class; |
aoqi@0 | 47 | test(clazz); |
aoqi@0 | 48 | test(clazz, "-c"); |
aoqi@0 | 49 | test(clazz, "-l"); |
aoqi@0 | 50 | test(clazz, "-l", "-c"); |
aoqi@0 | 51 | test(clazz, "-v"); |
aoqi@0 | 52 | test(clazz, "-v", "-c"); |
aoqi@0 | 53 | test(clazz, "-v", "-l"); |
aoqi@0 | 54 | test(clazz, "-v", "-l", "-c"); |
aoqi@0 | 55 | |
aoqi@0 | 56 | if (errors > 0) |
aoqi@0 | 57 | throw new Exception(errors + " errors occurred"); |
aoqi@0 | 58 | } |
aoqi@0 | 59 | |
aoqi@0 | 60 | static final String sep = System.getProperty("line.separator"); |
aoqi@0 | 61 | static final String doubleBlankLine = sep + sep + sep; |
aoqi@0 | 62 | |
aoqi@0 | 63 | void test(Class<?> clazz, String... opts) throws Exception { |
aoqi@0 | 64 | System.err.println("test " + Arrays.asList(opts)); |
aoqi@0 | 65 | List<String> args = new ArrayList<String>(); |
aoqi@0 | 66 | args.addAll(Arrays.asList(opts)); |
aoqi@0 | 67 | args.addAll(Arrays.asList("-classpath", System.getProperty("test.classes"))); |
aoqi@0 | 68 | args.add(clazz.getName()); |
aoqi@0 | 69 | StringWriter sw = new StringWriter(); |
aoqi@0 | 70 | PrintWriter pw = new PrintWriter(sw); |
aoqi@0 | 71 | int rc = com.sun.tools.javap.Main.run(args.toArray(new String[args.size()]), pw); |
aoqi@0 | 72 | pw.close(); |
aoqi@0 | 73 | String out = sw.toString(); |
aoqi@0 | 74 | if (rc != 0) |
aoqi@0 | 75 | throw new Exception("javap failed unexpectedly: rc=" + rc); |
aoqi@0 | 76 | |
aoqi@0 | 77 | int count = 0; |
aoqi@0 | 78 | int i = out.indexOf(doubleBlankLine, 0); |
aoqi@0 | 79 | while (i != -1) { |
aoqi@0 | 80 | count++; |
aoqi@0 | 81 | i = out.indexOf(doubleBlankLine, i + doubleBlankLine.length()); |
aoqi@0 | 82 | } |
aoqi@0 | 83 | |
aoqi@0 | 84 | if (count > 0) |
aoqi@0 | 85 | error(count + " double blank lines found"); |
aoqi@0 | 86 | } |
aoqi@0 | 87 | |
aoqi@0 | 88 | void error(String msg) { |
aoqi@0 | 89 | System.err.println("Error: " + msg); |
aoqi@0 | 90 | errors++; |
aoqi@0 | 91 | } |
aoqi@0 | 92 | |
aoqi@0 | 93 | int errors = 0; |
aoqi@0 | 94 | } |
aoqi@0 | 95 |