View Options

	diff --git a/src/unit/engine/PhpunitResultParser.php b/src/unit/engine/PhpunitResultParser.php
	index b9d4dc3e..693d8bcc 100644
	--- a/src/unit/engine/PhpunitResultParser.php
	+++ b/src/unit/engine/PhpunitResultParser.php
	@@ -1,183 +1,183 @@
	<?php

	/**
	* PHPUnit Result Parsing utility
	*
	* For an example on how to integrate with your test engine, see
	* @{class:PhpunitTestEngine}.
	*/
	final class PhpunitResultParser extends ArcanistTestResultParser {

	/**
	* Parse test results from phpunit json report
	*
	* @param string $path Path to test
	* @param string $test_results String containing phpunit json report
	*
	* @return array
	*/
	public function parseTestResults($path, $test_results) {
	if (!$test_results) {
	$result = id(new ArcanistUnitTestResult())
	->setName($path)
	->setUserData($this->stderr)
	->setResult(ArcanistUnitTestResult::RESULT_BROKEN);
	return array($result);
	}

	$report = $this->getJsonReport($test_results);

	// coverage is for all testcases in the executed $path
	$coverage = array();
	if ($this->enableCoverage !== false) {
	$coverage = $this->readCoverage();
	}

	$results = array();
	foreach ($report as $event) {
	switch ($event->event) {
	case 'test':
	break;
	case 'testStart':
	- $lastTestFinished = false;
	+ $last_test_finished = false;
	// fall through
	default:
	continue 2; // switch + loop
	}

	$status = ArcanistUnitTestResult::RESULT_PASS;
	$user_data = '';

	if ('fail' == $event->status) {
	$status = ArcanistUnitTestResult::RESULT_FAIL;
	$user_data .= $event->message."\n";
	foreach ($event->trace as $trace) {
	$user_data .= sprintf("\n%s:%s", $trace->file, $trace->line);
	}
	} else if ('error' == $event->status) {
	if (strpos($event->message, 'Skipped Test') !== false) {
	$status = ArcanistUnitTestResult::RESULT_SKIP;
	$user_data .= $event->message;
	} else if (strpos($event->message, 'Incomplete Test') !== false) {
	$status = ArcanistUnitTestResult::RESULT_SKIP;
	$user_data .= $event->message;
	} else {
	$status = ArcanistUnitTestResult::RESULT_BROKEN;
	$user_data .= $event->message;
	foreach ($event->trace as $trace) {
	$user_data .= sprintf("\n%s:%s", $trace->file, $trace->line);
	}
	}
	}

	$name = preg_replace('/ $.*$/s', '', $event->test);

	$result = new ArcanistUnitTestResult();
	$result->setName($name);
	$result->setResult($status);
	$result->setDuration($event->time);
	$result->setCoverage($coverage);
	$result->setUserData($user_data);

	$results[] = $result;
	- $lastTestFinished = true;
	+ $last_test_finished = true;
	}

	- if (!$lastTestFinished) {
	+ if (!$last_test_finished) {
	$results[] = id(new ArcanistUnitTestResult())
	->setName($event->test) // use last event
	->setUserData($this->stderr)
	->setResult(ArcanistUnitTestResult::RESULT_BROKEN);
	}
	return $results;
	}

	/**
	* Read the coverage from phpunit generated clover report
	*
	* @return array
	*/
	private function readCoverage() {
	$test_results = Filesystem::readFile($this->coverageFile);
	if (empty($test_results)) {
	return array();
	}

	$coverage_dom = new DOMDocument();
	$coverage_dom->loadXML($test_results);

	$reports = array();
	$files = $coverage_dom->getElementsByTagName('file');

	foreach ($files as $file) {
	$class_path = $file->getAttribute('name');
	if (empty($this->affectedTests[$class_path])) {
	continue;
	}
	$test_path = $this->affectedTests[$file->getAttribute('name')];
	// get total line count in file
	$line_count = count(file($class_path));

	$coverage = '';
	$start_line = 1;
	$lines = $file->getElementsByTagName('line');
	for ($ii = 0; $ii < $lines->length; $ii++) {
	$line = $lines->item($ii);
	for (; $start_line < $line->getAttribute('num'); $start_line++) {
	$coverage .= 'N';
	}

	if ($line->getAttribute('type') != 'stmt') {
	$coverage .= 'N';
	} else {
	if ((int) $line->getAttribute('count') == 0) {
	$coverage .= 'U';
	} else if ((int) $line->getAttribute('count') > 0) {
	$coverage .= 'C';
	}
	}

	$start_line++;
	}

	for (; $start_line <= $line_count; $start_line++) {
	$coverage .= 'N';
	}

	$len = strlen($this->projectRoot.DIRECTORY_SEPARATOR);
	$class_path = substr($class_path, $len);
	$reports[$class_path] = $coverage;
	}

	return $reports;
	}

	/**
	* We need this non-sense to make json generated by phpunit
	* valid.
	*
	* @param string $json String containing JSON report
	* @return array JSON decoded array
	*/
	private function getJsonReport($json) {

	if (empty($json)) {
	throw new Exception('JSON report file is empty, '.
	'it probably means that phpunit failed to run tests. '.
	'Try running arc unit with --trace option and then run '.
	'generated phpunit command yourself, you might get the '.
	'answer.'
	);
	}

	$json = preg_replace('/}{\s*"/', '},{"', $json);
	$json = '['.$json.']';
	$json = json_decode($json);
	if (!is_array($json)) {
	throw new Exception('JSON could not be decoded');
	}

	return $json;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 15:07 (3 w, 1 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125802
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions