changeset 4915:29001eb39fd8

8169203: (jdeprscan) eliminate duplicate "can't find class" errors Reviewed-by: jjg
author smarks
date Wed, 26 Apr 2017 15:49:33 -0700
parents 6a8ceafed0e8
children af62fa3a3a89
files src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java test/tools/jdeprscan/tests/jdk/jdeprscan/TestNotFound.java
diffstat 2 files changed, 118 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java	Wed Apr 26 08:15:40 2017 -0700
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java	Wed Apr 26 15:49:33 2017 -0700
@@ -34,7 +34,9 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
@@ -63,6 +65,7 @@
     final boolean verbose;
 
     final ClassFinder finder;
+    final Set<String> classesNotFound = new HashSet<>();
     boolean errorOccurred = false;
 
     public Scan(PrintStream out,
@@ -229,7 +232,10 @@
 
     void errorNoClass(String className) {
         errorOccurred = true;
-        err.println(Messages.get("scan.err.noclass", className));
+        if (classesNotFound.add(className)) {
+            // print message only first time the class can't be found
+            err.println(Messages.get("scan.err.noclass", className));
+        }
     }
 
     void errorNoFile(String fileName) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/jdeprscan/tests/jdk/jdeprscan/TestNotFound.java	Wed Apr 26 15:49:33 2017 -0700
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 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.
+ */
+
+/*
+ * @test
+ * @bug 8168444
+ * @summary Test of jdeprscan handling of primitives and primitive arrays.
+ * @modules jdk.jdeps/com.sun.tools.jdeprscan
+ * @run main jdk.jdeprscan.TestNotFound
+ */
+
+package jdk.jdeprscan;
+
+import com.sun.tools.jdeprscan.Main;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Scanner;
+
+public class TestNotFound {
+
+    public static void main(String[] args) throws IOException {
+        final String SEP = File.separator;
+        final String TESTCLASSES = System.getProperty("test.classes");
+        final String THISCLASS =
+            TESTCLASSES + SEP + "jdk" + SEP + "jdeprscan" + SEP + "TestNotFound.class";
+
+        ByteArrayOutputStream outBaos = new ByteArrayOutputStream();
+        ByteArrayOutputStream errBaos = new ByteArrayOutputStream();
+        boolean mainResult;
+
+        // Causes 5 Methodrefs to be generated, thus 5 occurrences
+        // of the Target class not being found. But only one message
+        // should be emitted.
+
+        Target.method1();
+        Target.method2();
+        Target.method3();
+        Target.method4();
+        Target.method5();
+
+        try (PrintStream out = new PrintStream(outBaos, false, "UTF-8");
+             PrintStream err = new PrintStream(errBaos, false, "UTF-8")) {
+            // Call jdeprscan without the proper classpath, so Target isn't found.
+            // Result is checked below after output is dumped.
+            mainResult = Main.call(out, err, THISCLASS);
+        }
+
+        byte[] outBytes = outBaos.toByteArray();
+        byte[] errBytes = errBaos.toByteArray();
+        ByteArrayInputStream outbais = new ByteArrayInputStream(outBytes);
+        ByteArrayInputStream errbais = new ByteArrayInputStream(errBytes);
+
+        System.out.println("--- stdout ---");
+        outbais.transferTo(System.out);
+        System.out.println("--- end stdout ---");
+
+        System.out.println("--- stderr ---");
+        errbais.transferTo(System.out);
+        System.out.println("--- end stderr ---");
+
+        long errCount = new Scanner(new String(errBytes, "UTF-8")).findAll("error:").count();
+
+        System.out.println("mainResult = " + mainResult);
+        System.out.println("errCount = " + errCount);
+
+        if (!mainResult) {
+            System.out.println("FAIL: mainResult should be true");
+        }
+
+        if (errCount != 1L) {
+            System.out.println("FAIL: errCount should equal 1");
+        }
+
+        if (!mainResult || errCount != 1L) {
+            throw new AssertionError("Test failed.");
+        } else {
+            System.out.println("Test passed.");
+        }
+    }
+
+    static class Target {
+        static void method1() { }
+        static void method2() { }
+        static void method3() { }
+        static void method4() { }
+        static void method5() { }
+    }
+}