Merge pull request #115 from WordPress/83-error-reportings

Use xpath to parse test failures rather than iteration through the DOM.

Fixes: #83

Author: getsource

functions.php

@@ -104,9 +104,9 @@ function process_junit_xml( $xml_string )
 	);
 
 	$results['testsuites'] = array();
-	foreach ( $project->testsuite as $testsuite ) {
-		// Handle nested testsuites like tests with data providers.
-		$testsuite = isset( $testsuite->testsuite ) ? $testsuite->testsuite : $testsuite;
+
+	$testsuites = $xml->xpath( '//testsuites//testsuite[ ( count( testcase ) > 0 ) and ( @errors > 0 or @failures > 0 ) ]' );
+	foreach ( $testsuites as $testsuite ) {
 		$result = array(
 			'name'     => (string) $testsuite['name'],
 			'tests'    => (string) $testsuite['tests'],
@@ -116,19 +116,22 @@ function process_junit_xml( $xml_string )
 		if ( empty( $result['failures'] ) && empty( $result['errors'] ) ) {
 			continue;
 		}
-		$results['testsuites'][ (string) $testsuite['name'] ] = $result;
-		$results['testsuites'][ (string) $testsuite['name'] ]['testcases'] = array();
+		$failures = array();
 		foreach ( $testsuite->testcase as $testcase ) {
 			// Capture both failure and error children.
 			foreach ( array( 'failure', 'error') as $key ) {
 				if ( isset( $testcase->{$key} ) ) {
-					$results['testsuites'][ (string) $testsuite['name'] ]['testcases'][ (string) $testcase['name'] ] = array(
+					$failures[ (string) $testcase['name'] ] = array(
 						'name' => (string) $testcase['name'],
 						$key   => (string) $testcase->{$key},
 					);
 				}
 			}
 		}
+		if ( $failures ) {
+			$results['testsuites'][ (string) $testsuite['name'] ] = $result;
+			$results['testsuites'][ (string) $testsuite['name'] ]['testcases'] = $failures;
+		}
 	}
 
 	return json_encode( $results );