[portal-commits] JBoss Portal SVN: r8586 - in modules/test/trunk/unit/src/main/org/jboss: test/unit/runner and 2 other directories.

Author: julien(a)jboss.com Date: 2007-10-10 09:45:09 -0400 (Wed, 10 Oct 2007) New Revision: 8586 Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/blah/TestedClass1.java modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/TestDriverRunnerTests.java modules/test/trunk/unit/src/main/org/jboss/unit/report/impl/console/PrintListener.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java Log: handle test duration in test runner event Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/blah/TestedClass1.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/test/unit/blah/TestedClass1.java 2007-10-10 13:37:03 UTC (rev 8585) +++ modules/test/trunk/unit/src/main/org/jboss/test/unit/blah/TestedClass1.java 2007-10-10 13:45:09 UTC (rev 8586) @@ -32,8 +32,9 @@ { @Test - public void testFoo() + public void testFoo() throws InterruptedException { + Thread.sleep(20); } @Test Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/TestDriverRunnerTests.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/TestDriverRunnerTests.java 2007-10-10 13:37:03 UTC (rev 8585) +++ modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/TestDriverRunnerTests.java 2007-10-10 13:45:09 UTC (rev 8586) @@ -78,7 +78,8 @@ testInvokeTestCaseWithParameters1(); testInvokeTestCaseWithParameters2(); - // testInvokeTestSuiteWithParameters() + // + // testInvokeTestSuiteWithParameters(); } private static void testInvokeTestCaseWithParameters1() Modified: modules/test/trunk/unit/src/main/org/jboss/unit/report/impl/console/PrintListener.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/report/impl/console/PrintListener.java 2007-10-10 13:37:03 UTC (rev 8585) +++ modules/test/trunk/unit/src/main/org/jboss/unit/report/impl/console/PrintListener.java 2007-10-10 13:45:09 UTC (rev 8586) @@ -71,13 +71,13 @@ TestResult testResult = endTestEvent.getTestResult(); if (testResult instanceof TestSuccess) { - System.out.println("Test id=" + testId + " is successful"); + System.out.println("Test id=" + testId + " is successful (" + testResult.getDurationMillis() + "ms)"); } else if (testResult instanceof TestFailure) { TestFailure testFailure = (TestFailure)testResult; Failure failure = testFailure.getFailure(); - System.out.println("Test id=" + testId + " " + failure.getType() + " failed " + failure.getMessage()); + System.out.println("Test id=" + testId + " " + failure.getType() + " failed " + failure.getMessage() + " (" + testResult.getDurationMillis() + "ms)"); if (failure.getCause() != null) { failure.getCause().printStackTrace(); 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-10 13:37:03 UTC (rev 8585) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java 2007-10-10 13:45:09 UTC (rev 8586) @@ -124,21 +124,31 @@ TestResult result = null; // + long duration = -System.currentTimeMillis(); + + // DriverResponse response = null; try { - response = driver.invoke(testId, command); + try + { + response = driver.invoke(testId, command); + } + finally + { + duration += System.currentTimeMillis(); + } } catch (Exception e) { Failure failure = new Failure("The test driver threw an unexpected exception ", e, FailureType.ERROR); - result = new TestFailure(failure, parametrization, 0); + result = new TestFailure(failure, parametrization, duration); } // if (result == null) { - result = unwrap(response, parametrization); + result = unwrap(response, parametrization, duration); } // @@ -148,22 +158,22 @@ } } - private TestResult unwrap(DriverResponse response, Map<String,String> parametrization) + private TestResult unwrap(DriverResponse response, Map<String,String> parametrization, long duration) { if (response instanceof EndTestResponse) { - return new TestSuccess(parametrization, 0); + return new TestSuccess(parametrization, duration); } else if (response instanceof FailureResponse) { FailureResponse failureResponse = (FailureResponse)response; Failure failure = failureResponse.getFailure(); - return new TestFailure(failure, parametrization, 0); + return new TestFailure(failure, parametrization, duration); } else { Failure failure = new Failure("The test driver returned an unexpected response " + response, FailureType.ERROR); - return new TestFailure(failure, parametrization, 0); + return new TestFailure(failure, parametrization, duration); } } }