moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Use Junit4 JUnitCore instead of legacy TestRunner

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1637996 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2014-11-10 23:46:50 +00:00
parent 40e5714372
commit d709edb343
1 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/ooxml/java/org/apache/poi/util/OOXMLLite.java
View File

@ -33,13 +33,11 @@ import java.util.Vector;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import junit.framework.JUnit4TestAdapter;
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestResult;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
/** /**
* Build a 'lite' version of the ooxml-schemas.jar * Build a 'lite' version of the ooxml-schemas.jar
@ -80,7 +78,7 @@ public final class OOXMLLite {
_ooxmlJar = new File(ooxmlJar); _ooxmlJar = new File(ooxmlJar);
} }
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException, ClassNotFoundException {
String dest = null, test = null, ooxml = null; String dest = null, test = null, ooxml = null;
@ -89,49 +87,22 @@ public final class OOXMLLite {
else if (args[i].equals("-test")) test = args[++i]; else if (args[i].equals("-test")) test = args[++i];
else if (args[i].equals("-ooxml")) ooxml = args[++i]; else if (args[i].equals("-ooxml")) ooxml = args[++i];
} }
OOXMLLite builder = new OOXMLLite(dest, test, ooxml); OOXMLLite builder = new OOXMLLite(dest, test, ooxml);
builder.build(); builder.build();
} }
void build() throws IOException{ void build() throws IOException, ClassNotFoundException {
List<String> lst = new ArrayList<String>(); List<Class<?>> lst = new ArrayList<Class<?>>();
//collect unit tests //collect unit tests
System.out.println("Collecting unit tests from " + _testDir); System.out.println("Collecting unit tests from " + _testDir);
collectTests(_testDir, _testDir, lst, ".+.class$", collectTests(_testDir, _testDir, lst, ".+.class$",
".+(TestUnfixedBugs|MemoryUsage|TestDataProvider|TestDataSamples|All.+Tests|ZipFileAssert|PkiTestUtils|TestCellFormatPart\\$\\d|TestSignatureInfo\\$\\d).class"); ".+(TestUnfixedBugs|MemoryUsage|TestDataProvider|TestDataSamples|All.+Tests|ZipFileAssert|PkiTestUtils|TestCellFormatPart\\$\\d|TestSignatureInfo\\$\\d).class");
System.out.println("Found " + lst.size() + " classes"); System.out.println("Found " + lst.size() + " classes");
TestSuite suite = new TestSuite();
for (String arg : lst) {
//ignore inner classes defined in tests
if (arg.indexOf('$') != -1) {
System.out.println("Inner class " + arg + " not included");
continue;
}
String cls = arg.replace(".class", "");
try {
Class<?> testclass = Class.forName(cls);
boolean isTest = TestCase.class.isAssignableFrom(testclass);
if (!isTest) {
isTest = checkForTestAnnotation(testclass);
}
if (isTest) {
suite.addTest(new JUnit4TestAdapter(testclass));
}
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
}
System.out.println("Resulting TestSuite has " + suite.testCount() + " TestCases");
//run tests //run tests
TestResult result = TestRunner.run(suite); Result result = JUnitCore.runClasses(lst.toArray(new Class<?>[lst.size()]));
if(!result.wasSuccessful()) { if (!result.wasSuccessful()) {
throw new RuntimeException("Tests did not succeed, cannot build ooxml-lite jar"); throw new RuntimeException("Tests did not succeed, cannot build ooxml-lite jar");
} }
@ -173,7 +144,7 @@ public final class OOXMLLite {
} }
} }
private boolean checkForTestAnnotation(Class<?> testclass) { private static boolean checkForTestAnnotation(Class<?> testclass) {
for (Method m : testclass.getDeclaredMethods()) { for (Method m : testclass.getDeclaredMethods()) {
if(m.isAnnotationPresent(Test.class)) { if(m.isAnnotationPresent(Test.class)) {
return true; return true;
@ -196,7 +167,8 @@ public final class OOXMLLite {
* @param out output * @param out output
* @param ptrn the pattern (regexp) to filter found files * @param ptrn the pattern (regexp) to filter found files
*/ */
private static void collectTests(File root, File arg, List<String> out, String ptrn, String exclude) { private static void collectTests(File root, File arg, List<Class<?>> out, String ptrn, String exclude)
throws ClassNotFoundException {
if (arg.isDirectory()) { if (arg.isDirectory()) {
for (File f : arg.listFiles()) { for (File f : arg.listFiles()) {
collectTests(root, f, out, ptrn, exclude); collectTests(root, f, out, ptrn, exclude);
@ -205,7 +177,21 @@ public final class OOXMLLite {
String path = arg.getAbsolutePath(); String path = arg.getAbsolutePath();
String prefix = root.getAbsolutePath(); String prefix = root.getAbsolutePath();
String cls = path.substring(prefix.length() + 1).replace(File.separator, "."); String cls = path.substring(prefix.length() + 1).replace(File.separator, ".");
if(cls.matches(ptrn) && !cls.matches(exclude)) out.add(cls); if(!cls.matches(ptrn)) return;
if (cls.matches(exclude)) return;
//ignore inner classes defined in tests
if (cls.indexOf('$') != -1) {
System.out.println("Inner class " + cls + " not included");
return;
}
cls = cls.replace(".class", "");
Class<?> testclass = Class.forName(cls);
if (TestCase.class.isAssignableFrom(testclass)
|| checkForTestAnnotation(testclass)) {
out.add(testclass);
};
} }
} }
@ -227,8 +213,8 @@ public final class OOXMLLite {
continue; continue;
} }
String jar = cls.getProtectionDomain().getCodeSource().getLocation().toString(); String jar = cls.getProtectionDomain().getCodeSource().getLocation().toString();
if(jar.indexOf(ptrn) != -1) map.put(cls.getName(), cls); if(jar.indexOf(ptrn) != -1) map.put(cls.getName(), cls);
} }
return map; return map;
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
@ -245,6 +231,6 @@ public final class OOXMLLite {
} finally { } finally {
destStream.close(); destStream.close();
} }
//System.out.println("Copied file to " + destFile);
} }
} }