svn commit: r915180 - in /openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit: JUnit4Runner.java model/MultiStatementExecutor.java

[db...@apache.org]

Author: dblevins
Date: Tue Feb 23 04:57:48 2010
New Revision: 915180

URL: http://svn.apache.org/viewvc?rev=915180&view=rev
Log:
Moved MultiStatementExecutor to an inner class

Removed:
    openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/model/MultiStatementExecutor.java
Modified:
    openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java

Modified: openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java?rev=915180&r1=915179&r2=915180&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java (original)
+++ openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java Tue Feb 23 04:57:48 2010
@@ -20,7 +20,6 @@
 import org.apache.openejb.junit.TestSecurity;
 import org.apache.openejb.junit.context.ContextWrapperStatement;
 import org.apache.openejb.junit.context.TestContext;
-import org.apache.openejb.junit.model.MultiStatementExecutor;
 import org.junit.internal.runners.model.ReflectiveCallable;
 import org.junit.internal.runners.statements.ExpectException;
 import org.junit.internal.runners.statements.Fail;
@@ -30,6 +29,8 @@
 import org.junit.runners.model.Statement;
 
 import javax.ejb.EJBAccessException;
+import java.util.List;
+import java.util.ArrayList;
 
 /**
  * @author quintin
@@ -162,4 +163,19 @@
             return new Fail(e);
         }
     }
+
+    public static class MultiStatementExecutor extends Statement {
+        private List<Statement> statements = new ArrayList<Statement>();
+
+        @Override
+        public void evaluate() throws Throwable {
+            for (Statement statement : statements) {
+                statement.evaluate();
+            }
+        }
+
+        public void addStatement(Statement statement) {
+            statements.add(statement);
+        }
+    }
 }