[jboss-svn-commits] JBoss Common SVN: r4349 - in arquillian/trunk: impl-base/src/main/java/org/jboss/arquillian/impl/handler and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 5 06:56:07 EDT 2010
Author: aslak
Date: 2010-05-05 06:56:06 -0400 (Wed, 05 May 2010)
New Revision: 4349
Removed:
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/TestResultImpl.java
Modified:
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/TestEventExecuter.java
arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerTestExecuterTestCase.java
arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitTestRunner.java
arquillian/trunk/protocols/local/src/main/java/org/jboss/arquillian/protocol/local/LocalMethodExecutor.java
arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletTestRunner.java
arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolTestCase.java
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestListener.java
Log:
ARQ-129 Changed TestResult to class. One impl.
Deleted: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/TestResultImpl.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/TestResultImpl.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/TestResultImpl.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.arquillian.impl;
-
-import org.jboss.arquillian.spi.TestResult;
-
-/**
- * TestResultImpl
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- */
-public class TestResultImpl implements TestResult
-{
- private static final long serialVersionUID = 1L;
-
- private Status status;
- private Throwable throwable;
-
- public TestResultImpl(Status status) {
- this(status, null);
- }
-
- public TestResultImpl(Status status, Throwable throwable)
- {
- this.status = status;
- this.throwable = throwable;
- }
-
- public Status getStatus()
- {
- return status;
- }
-
- public Throwable getThrowable()
- {
- return throwable;
- }
-}
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -22,6 +22,7 @@
import org.jboss.arquillian.spi.Context;
import org.jboss.arquillian.spi.TestMethodExecutor;
import org.jboss.arquillian.spi.TestResult;
+import org.jboss.arquillian.spi.TestResult.Status;
import org.jboss.arquillian.spi.event.suite.BeforeClass;
import org.jboss.arquillian.spi.event.suite.EventHandler;
@@ -62,30 +63,18 @@
*/
public TestResult invoke(TestMethodExecutor testMethodExecutor)
{
+ TestResult result = new TestResult();
try
{
testMethodExecutor.invoke();
-
- return new TestResult()
- {
- private static final long serialVersionUID = 1L;
-
- public Throwable getThrowable() { return null; }
-
- public Status getStatus() { return Status.PASSED; }
- };
+ result.setStatus(Status.PASSED);
}
catch (final Throwable e)
{
- return new TestResult()
- {
- private static final long serialVersionUID = 1L;
-
- public Status getStatus() {return Status.FAILED; }
-
- public Throwable getThrowable() {return e;}
- };
+ result.setStatus(Status.FAILED);
+ result.setThrowable(e);
}
+ return result;
}
}
}
\ No newline at end of file
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/TestEventExecuter.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/TestEventExecuter.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/TestEventExecuter.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -16,8 +16,8 @@
*/
package org.jboss.arquillian.impl.handler;
-import org.jboss.arquillian.impl.TestResultImpl;
import org.jboss.arquillian.spi.Context;
+import org.jboss.arquillian.spi.TestResult;
import org.jboss.arquillian.spi.TestResult.Status;
import org.jboss.arquillian.spi.event.suite.EventHandler;
import org.jboss.arquillian.spi.event.suite.Test;
@@ -41,11 +41,11 @@
try
{
event.getTestMethodExecutor().invoke();
- event.setTestResult(new TestResultImpl(Status.PASSED));
+ event.setTestResult(new TestResult(Status.PASSED));
}
catch (Throwable e)
{
- event.setTestResult(new TestResultImpl(Status.FAILED, e));
+ event.setTestResult(new TestResult(Status.FAILED, e));
}
}
}
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerTestExecuterTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerTestExecuterTestCase.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerTestExecuterTestCase.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -20,11 +20,9 @@
import junit.framework.Assert;
-import org.jboss.arquillian.impl.TestResultImpl;
import org.jboss.arquillian.impl.context.ClassContext;
import org.jboss.arquillian.impl.context.SuiteContext;
import org.jboss.arquillian.impl.context.TestContext;
-import org.jboss.arquillian.impl.handler.ContainerTestExecuter;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.ServiceLoader;
import org.jboss.arquillian.spi.TestMethodExecutor;
@@ -71,7 +69,7 @@
@Test
public void shouldInvokeContainerMethodExecutor() throws Exception
{
- TestResult result = new TestResultImpl(Status.PASSED);
+ TestResult result = new TestResult(Status.PASSED);
Mockito.when(executor.invoke(testExecutor)).thenReturn(result);
Mockito.when(testExecutor.getInstance()).thenReturn(this);
Mockito.when(testExecutor.getMethod()).thenReturn(
@@ -88,7 +86,7 @@
@Test
public void shouldSetTestResult() throws Exception
{
- TestResult result = new TestResultImpl(Status.PASSED);
+ TestResult result = new TestResult(Status.PASSED);
Mockito.when(executor.invoke(testExecutor)).thenReturn(result);
Mockito.when(testExecutor.getInstance()).thenReturn(this);
Mockito.when(testExecutor.getMethod()).thenReturn(
Modified: arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitTestRunner.java
===================================================================
--- arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitTestRunner.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitTestRunner.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -17,7 +17,6 @@
package org.jboss.arquillian.junit;
import org.jboss.arquillian.impl.DeployableTestBuilder;
-import org.jboss.arquillian.impl.TestResultImpl;
import org.jboss.arquillian.spi.ContainerProfile;
import org.jboss.arquillian.spi.TestResult;
import org.jboss.arquillian.spi.TestRunner;
@@ -68,6 +67,6 @@
{
status = Status.SKIPPED;
}
- return new TestResultImpl(status, throwable);
+ return new TestResult(status, throwable);
}
}
Modified: arquillian/trunk/protocols/local/src/main/java/org/jboss/arquillian/protocol/local/LocalMethodExecutor.java
===================================================================
--- arquillian/trunk/protocols/local/src/main/java/org/jboss/arquillian/protocol/local/LocalMethodExecutor.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/protocols/local/src/main/java/org/jboss/arquillian/protocol/local/LocalMethodExecutor.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -19,6 +19,7 @@
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.TestMethodExecutor;
import org.jboss.arquillian.spi.TestResult;
+import org.jboss.arquillian.spi.TestResult.Status;
/**
* LocalMethodExecutor
@@ -31,29 +32,17 @@
public TestResult invoke(TestMethodExecutor testMethodExecutor)
{
+ TestResult result = new TestResult();
try
{
testMethodExecutor.invoke();
-
- return new TestResult()
- {
- private static final long serialVersionUID = 1L;
-
- public Throwable getThrowable() { return null; }
-
- public Status getStatus() { return Status.PASSED; }
- };
+ result.setStatus(Status.PASSED);
}
catch (final Throwable e)
{
- return new TestResult()
- {
- private static final long serialVersionUID = 1L;
-
- public Status getStatus() {return Status.FAILED; }
-
- public Throwable getThrowable() {return e;}
- };
+ result.setStatus(Status.FAILED);
+ result.setThrowable(e);
}
+ return result;
}
}
\ No newline at end of file
Modified: arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletTestRunner.java
===================================================================
--- arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletTestRunner.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletTestRunner.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -27,6 +27,7 @@
import org.jboss.arquillian.spi.TestResult;
import org.jboss.arquillian.spi.TestRunner;
+import org.jboss.arquillian.spi.TestResult.Status;
import org.jboss.arquillian.spi.util.TestRunners;
/**
@@ -151,28 +152,6 @@
private TestResult createFailedResult(Throwable throwable)
{
- return new FailedResult(throwable);
+ return new TestResult(Status.FAILED, throwable);
}
-
- public static class FailedResult implements TestResult {
-
- private static final long serialVersionUID = 1L;
-
- private Throwable throwable;
-
- public FailedResult(Throwable throwable)
- {
- this.throwable = throwable;
- }
-
- public Status getStatus()
- {
- return Status.FAILED;
- }
-
- public Throwable getThrowable()
- {
- return throwable;
- }
- }
}
Modified: arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolTestCase.java
===================================================================
--- arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolTestCase.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolTestCase.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -62,7 +62,7 @@
@Test
public void shouldReturnTestResult() throws Exception
{
- MockTestRunner.add(new TestResultImpl(Status.PASSED, null));
+ MockTestRunner.add(new TestResult(Status.PASSED, null));
ServletMethodExecutor executor = new ServletMethodExecutor(createBaseURL());
TestResult result = executor.invoke(new MockTestExecutor());
@@ -80,7 +80,7 @@
@Test
public void shouldReturnThrownException() throws Exception
{
- MockTestRunner.add(new TestResultImpl(Status.FAILED, new Exception().fillInStackTrace()));
+ MockTestRunner.add(new TestResult(Status.FAILED, new Exception().fillInStackTrace()));
ServletMethodExecutor executor = new ServletMethodExecutor(createBaseURL());
TestResult result = executor.invoke(new MockTestExecutor());
@@ -185,30 +185,6 @@
}
}
- public static class TestResultImpl implements TestResult {
-
- private static final long serialVersionUID = 1L;
-
- private Status status;
- private Throwable throwable;
-
- public TestResultImpl(Status status, Throwable throwable)
- {
- this.status = status;
- this.throwable = throwable;
- }
-
- public Status getStatus()
- {
- return status;
- }
-
- public Throwable getThrowable()
- {
- return throwable;
- }
- }
-
public static class MockTestExecutor implements TestMethodExecutor, Serializable {
private static final long serialVersionUID = 1L;
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestListener.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestListener.java 2010-05-04 16:43:22 UTC (rev 4348)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestListener.java 2010-05-05 10:56:06 UTC (rev 4349)
@@ -16,7 +16,6 @@
*/
package org.jboss.arquillian.testng;
-import org.jboss.arquillian.impl.TestResultImpl;
import org.jboss.arquillian.spi.TestResult;
import org.jboss.arquillian.spi.TestResult.Status;
import org.testng.ITestContext;
@@ -67,14 +66,14 @@
{
if(context.getFailedTests().size() > 0)
{
- return new TestResultImpl(
+ return new TestResult(
Status.FAILED,
context.getFailedTests().getAllResults().iterator().next().getThrowable());
}
else if(context.getSkippedTests().size() > 0)
{
- return new TestResultImpl(Status.SKIPPED);
+ return new TestResult(Status.SKIPPED);
}
- return new TestResultImpl(Status.PASSED);
+ return new TestResult(Status.PASSED);
}
}
More information about the jboss-svn-commits
mailing list