Author: julien(a)jboss.com Date: 2007-10-01 06:08:06 -0400 (Mon, 01 Oct 2007) New Revision: 8503 Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/PrintListener.java modules/test/trunk/unit/src/main/org/jboss/unit/Failure.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/event/RunnerFailureEvent.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java Log: make RunnerFailureEvent use the Failure object instead of having the FailureType + Throwable state Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/PrintListener.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/test/unit/PrintListener.java 2007-10-01 09:48:27 UTC (rev 8502) +++ modules/test/trunk/unit/src/main/org/jboss/test/unit/PrintListener.java 2007-10-01 10:08:06 UTC (rev 8503) @@ -54,7 +54,8 @@ } else if (event instanceof RunnerFailureEvent) { - RunnerFailureEvent failure = (RunnerFailureEvent)event; + RunnerFailureEvent failureEvent = (RunnerFailureEvent)event; + Failure failure = failureEvent.getFailure(); System.out.println("Runner failure: " + failure.getLevel() + " " + failure.getMessage()); } else if (event instanceof StartTestEvent) Modified: modules/test/trunk/unit/src/main/org/jboss/unit/Failure.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/Failure.java 2007-10-01 09:48:27 UTC (rev 8502) +++ modules/test/trunk/unit/src/main/org/jboss/unit/Failure.java 2007-10-01 10:08:06 UTC (rev 8503) @@ -54,6 +54,13 @@ this.type = type; } + public Failure(String message, Throwable cause, FailureType type) + { + this.message = message; + this.cause = cause; + this.type = type; + } + public String getMessage() { return message; @@ -74,6 +81,11 @@ return new Failure(messge, FailureType.ERROR); } + public static Failure createErrorFailure(String message, Throwable throwable) + { + return new Failure(message, throwable, FailureType.ERROR); + } + public static Failure createErrorFailure(Throwable throwable) { return new Failure(throwable, FailureType.ERROR); Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/event/RunnerFailureEvent.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/event/RunnerFailureEvent.java 2007-10-01 09:48:27 UTC (rev 8502) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/event/RunnerFailureEvent.java 2007-10-01 10:08:06 UTC (rev 8503) @@ -23,7 +23,7 @@ package org.jboss.unit.runner.event; import org.jboss.unit.runner.TestRunnerEvent; -import org.jboss.unit.FailureType; +import org.jboss.unit.Failure; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -33,44 +33,15 @@ { /** . */ - private String message; + private Failure failure; - /** . */ - private Throwable throwable; - - /** . */ - private FailureType type; - - public RunnerFailureEvent(String message, FailureType type) + public RunnerFailureEvent(Failure failure) { - this.message = message; - this.type = type; + this.failure = failure; } - public RunnerFailureEvent(String message, FailureType type, Throwable throwable) + public Failure getFailure() { - this.message = message; - this.type = type; - this.throwable = throwable; + return failure; } - - public RunnerFailureEvent(Throwable throwable) - { - this.throwable = throwable; - } - - public FailureType getLevel() - { - return type; - } - - public String getMessage() - { - return message != null ? message : throwable.getMessage(); - } - - public Throwable getThrowable() - { - return throwable; - } } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java 2007-10-01 09:48:27 UTC (rev 8502) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java 2007-10-01 10:08:06 UTC (rev 8503) @@ -32,7 +32,6 @@ import org.jboss.unit.info.TestInfo; import org.jboss.unit.TestId; import org.jboss.unit.Failure; -import org.jboss.unit.FailureType; import org.jboss.unit.runner.results.TestSuccess; import org.jboss.unit.runner.results.TestFailure; import org.jboss.unit.runner.event.StartTestEvent; @@ -114,7 +113,7 @@ } else { - fireEvent(new RunnerFailureEvent("Cannot execute test id " + testId, FailureType.ERROR)); + fireEvent(new RunnerFailureEvent(Failure.createErrorFailure("Cannot execute test id " + testId))); } } } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java 2007-10-01 09:48:27 UTC (rev 8502) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java 2007-10-01 10:08:06 UTC (rev 8503) @@ -35,6 +35,7 @@ import org.jboss.unit.runner.model.TestDef; import org.jboss.unit.FailureType; import org.jboss.unit.TestId; +import org.jboss.unit.Failure; import org.jboss.unit.info.TestSuiteInfo; import org.jboss.unit.info.TestCaseInfo; import org.jboss.unit.unit.pojo.POJOTestSuiteDriver; @@ -128,17 +129,17 @@ } catch (Exception e) { - fireEvent(new RunnerFailureEvent("Cannot execute test id " + testDefId, FailureType.ERROR,e)); + fireEvent(new RunnerFailureEvent(Failure.createErrorFailure("Cannot execute test id " + testDefId,e))); } } else { - fireEvent(new RunnerFailureEvent("No test definition found for id " + testDefId, FailureType.ERROR)); + fireEvent(new RunnerFailureEvent(Failure.createErrorFailure("No test definition found for id " + testDefId))); } } else { - fireEvent(new RunnerFailureEvent("No test definition found for id " + testDefId, FailureType.ERROR)); + fireEvent(new RunnerFailureEvent(Failure.createErrorFailure("No test definition found for id " + testDefId))); } } }