From 774fa7c0909a12caa4e64ea4efd782e9a55bc0a0 Mon Sep 17 00:00:00 2001 From: redsolo Date: Thu, 27 Mar 2008 15:27:13 +0000 Subject: [PATCH] Fixed NPE when parsing SoapUI junit xml file. (issue #1463) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@8028 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/tasks/junit/SuiteResult.java | 18 ++++- .../hudson/tasks/junit/SuiteResultTest.java | 53 +++++++++++++++ .../hudson/tasks/junit/junit-report-1233.xml | 12 ++++ .../hudson/tasks/junit/junit-report-1463.xml | 66 +++++++++++++++++++ 4 files changed, 148 insertions(+), 1 deletion(-) create mode 100755 core/src/test/java/hudson/tasks/junit/SuiteResultTest.java create mode 100755 core/src/test/resources/hudson/tasks/junit/junit-report-1233.xml create mode 100755 core/src/test/resources/hudson/tasks/junit/junit-report-1463.xml diff --git a/core/src/main/java/hudson/tasks/junit/SuiteResult.java b/core/src/main/java/hudson/tasks/junit/SuiteResult.java index e12a2a0584..95e23b6928 100644 --- a/core/src/main/java/hudson/tasks/junit/SuiteResult.java +++ b/core/src/main/java/hudson/tasks/junit/SuiteResult.java @@ -72,10 +72,26 @@ public final class SuiteResult implements Serializable { // see http://www.nabble.com/More-JUnit-test-report-problems...-tf4267020.html#a12143611 for (Element suite : (List)root.elements("testsuite")) { for (Element e : (List)suite.elements("testcase")) { + // https://hudson.dev.java.net/issues/show_bug.cgi?id=1233 indicates that // when is present, we are better off using @classname on the // individual testcase class. - addCase(new CaseResult(this,e.attributeValue("classname"),e)); + + // https://hudson.dev.java.net/issues/show_bug.cgi?id=1463 indicates that + // @classname may not exist in individual testcase elements. We now + // also test if the testsuite element has a package name that can be used + // as the class name instead of the file name which is default. + + String classname = e.attributeValue("classname"); + if (classname == null) { + classname = suite.attributeValue("name"); + } + + if (classname == null) { + addCase(new CaseResult(this,e)); + } else { + addCase(new CaseResult(this,classname,e)); + } } } } diff --git a/core/src/test/java/hudson/tasks/junit/SuiteResultTest.java b/core/src/test/java/hudson/tasks/junit/SuiteResultTest.java new file mode 100755 index 0000000000..6b4144fa94 --- /dev/null +++ b/core/src/test/java/hudson/tasks/junit/SuiteResultTest.java @@ -0,0 +1,53 @@ +package hudson.tasks.junit; + +import java.io.File; +import java.util.List; + +import junit.framework.TestCase; + +/** + * Test cases for parsing JUnit report XML files. + * As there are no XML schema for JUnit xml files, Hudson needs to handle + * varied xml files. + * + * @author Erik Ramfelt + */ +public class SuiteResultTest extends TestCase { + + /** + * Verifying fix for issue #1233. + * https://hudson.dev.java.net/issues/show_bug.cgi?id=1233 + */ + public void testIssue1233() throws Exception { + File file = new File(SuiteResultTest.class.getResource("junit-report-1233.xml").toURI()); + SuiteResult result = new SuiteResult(file); + + List cases = result.getCases(); + assertEquals("Class name is incorrect", "test.foo.bar.DefaultIntegrationTest", cases.get(0).getClassName()); + assertEquals("Class name is incorrect", "test.foo.bar.BundleResolverIntegrationTest", cases.get(1).getClassName()); + assertEquals("Class name is incorrect", "test.foo.bar.BundleResolverIntegrationTest", cases.get(2).getClassName()); + assertEquals("Class name is incorrect", "test.foo.bar.ProjectSettingsTest", cases.get(3).getClassName()); + assertEquals("Class name is incorrect", "test.foo.bar.ProjectSettingsTest", cases.get(4).getClassName()); + } + + /** + * Verifying fix for issue #1463. + * JUnit report file is generated by SoapUI Pro 1.7.6 + * https://hudson.dev.java.net/issues/show_bug.cgi?id=1463 + */ + public void testIssue1463() throws Exception { + File file = new File(SuiteResultTest.class.getResource("junit-report-1463.xml").toURI()); + SuiteResult result = new SuiteResult(file); + + List cases = result.getCases(); + for (CaseResult caseResult : cases) { + assertEquals("Test class name is incorrect in " + caseResult.getDisplayName(), "WLI-FI-Tests-Fake", caseResult.getClassName()); + } + assertEquals("Test name is incorrect", "IF_importTradeConfirmationToDwh", cases.get(0).getName()); + assertEquals("Test name is incorrect", "IF_getAmartaDisbursements", cases.get(1).getName()); + assertEquals("Test name is incorrect", "IF_importGLReconDataToDwh", cases.get(2).getName()); + assertEquals("Test name is incorrect", "IF_importTradeInstructionsToDwh", cases.get(3).getName()); + assertEquals("Test name is incorrect", "IF_getDeviationTradeInstructions", cases.get(4).getName()); + assertEquals("Test name is incorrect", "IF_getDwhGLData", cases.get(5).getName()); + } +} diff --git a/core/src/test/resources/hudson/tasks/junit/junit-report-1233.xml b/core/src/test/resources/hudson/tasks/junit/junit-report-1233.xml new file mode 100755 index 0000000000..4657a760bc --- /dev/null +++ b/core/src/test/resources/hudson/tasks/junit/junit-report-1233.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/core/src/test/resources/hudson/tasks/junit/junit-report-1463.xml b/core/src/test/resources/hudson/tasks/junit/junit-report-1463.xml new file mode 100755 index 0000000000..a7639c98af --- /dev/null +++ b/core/src/test/resources/hudson/tasks/junit/junit-report-1463.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file