From: Dominik Stadler <centic@apache.org>
Date: Fri, 20 Apr 2018 09:46:47 +0000 (+0000)
Subject: OOXMLLite: improve progress output: count test-classes, not single test-methods
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc436fcc3d662fdbd09fe10a4c1443d1f08a3981;p=poi.git

OOXMLLite: improve progress output: count test-classes, not single test-methods

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1829641 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java b/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
index d8d4258180..06c57c464b 100644
--- a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
+++ b/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
@@ -29,8 +29,10 @@ import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.Vector;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -165,18 +167,23 @@ public final class OOXMLLite {
         //run tests
         JUnitCore jUnitCore = new JUnitCore();
         jUnitCore.addListener(new TextListener(System.out) {
+            private final Set<String> classes = new HashSet<>();
             private int count;
+
             @Override
             public void testStarted(Description description) {
+                // count how many test-classes we already saw
+                classes.add(description.getClassName());
                 count++;
                 if(count % 100 == 0) {
                     System.out.println();
-                    System.out.println(count + "/" + lst.size() + ": " + description.getDisplayName());
+                    System.out.println(classes.size() + "/" + lst.size() + ": " + description.getDisplayName());
                 }
+
                 super.testStarted(description);
             }
         });
-        Result result = jUnitCore.run(lst.toArray(new Class<?>[lst.size()]));
+        Result result = jUnitCore.run(lst.toArray(new Class<?>[0]));
         if (!result.wasSuccessful()) {
             throw new RuntimeException("Tests did not succeed, cannot build ooxml-lite jar");
         }