X-Git-Url: http://hudson.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java index 341c218..bc1dd6a 100644 --- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java +++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java @@ -134,22 +134,22 @@ public class PHPUnitView extends ViewPart { //for now: - reportArea.append("test passed \n"); + reportArea.append("test : " + testID + " passed \n"); } public void markTestStarted(String testID) { - reportArea.append("test started \n"); + reportArea.append("test started: " + testID + " \n"); } public void createNewTest(String testName, String testID) { - reportArea.append("new test: " + testName + " - testID \n"); + reportArea.append("new test: " + testName + " - testID " + testID + " \n"); } public void markTestFail(String testID) { - reportArea.append("test failed \n"); + reportArea.append("test " + testID + " failed \n"); } public void markTestingFinished() { @@ -175,12 +175,15 @@ public class PHPUnitView extends ViewPart { } + /** + * + */ private void listenForReports() { ConnectionListener conListener = new ConnectionListener(); - conListener.start(); + conListener.start(this); } //end of method @@ -188,22 +191,61 @@ public class PHPUnitView extends ViewPart { * handle this report: test passed, faile, end of all. * @param report */ - private void handleReport(String report) { - - reportArea.append("msg: " + report + "\n"); - - String event = report.substring(0, report.indexOf(" ")); - - System.out.println(event); + public void handleReport(String report) { + //delegate to the XML report handler. + //reportArea.append("msg: " + report + "\n"); handler.handle(report, this); } + /** + * @param command + * @param testCount + * @param testID + */ public void handleCommand(String command, String testCount, String testID) { + + if (command.equals("testStarted")) { + + createNewTest("testName", testID); + markTestStarted(testID); + + } else if (command.equals("testFinished")) { + + + // do nothing wait for verdict + } else if (command.equals("endAll")) { + + markTestingFinished(); + } + + + } + + /** + * @param currentTestID + * @param verdict + */ + public void setTestVerdict(String currentTestID, String verdict) { + + if( verdict.equals("passed")) + markTestPassed(currentTestID); + else + markTestFail(currentTestID); + + + } + + /** + * @param currentTestID + * @param exception + */ + public void addTestException(String currentTestID, String exception) { + reportArea.append(" test " + currentTestID + " exception: " + exception + "\n"); }