Author: dblevins
Date: Fri Dec 21 15:57:58 2007
New Revision: 606348
URL: http://svn.apache.org/viewvc?rev=606348&view=rev
Log:
Ability to filter tests with -Ditest=StatefulRmiIiopTests
Added:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpLocalTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2TestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessTestSuite.java
Added:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java?rev=606348&view=auto
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java
(added)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.openejb.test;
+
+import junit.framework.Test;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class FilteredTestSuite extends TestSuite {
+
+ @Override
+ protected List<Test> getTests() {
+ return filter(super.getTests());
+ }
+
+ public static List<Test> filter(List<Test> tests) {
+ String itest = System.getProperty("itest");
+
+ if (itest == null) {
+ return tests;
+ }
+
+ ArrayList<Test> filtered = new ArrayList<Test>();
+ for (Test test : tests) {
+ String simpleName = test.getClass().getSimpleName();
+ if (simpleName.matches(itest)){
+ filtered.add(test);
+ }
+ }
+ return filtered;
+ }
+}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestSuite.java
Fri Dec 21 15:57:58 2007
@@ -16,46 +16,55 @@
*/
package org.apache.openejb.test;
-import java.util.Enumeration;
-
import junit.framework.Test;
import junit.framework.TestResult;
+import java.util.Collections;
+import java.util.List;
+
/**
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Richard Monson-Haefel</a>
- *
* @version $Rev$ $Date$
*/
public class TestSuite extends junit.framework.TestSuite {
-
+
public TestSuite() {
super();
}
-
+
/**
* Runs the tests and collects their result in a TestResult.
*/
public void run(TestResult result) {
- try{
+ try {
+ List<Test> tests = getTests();
+ if (tests.size() == 0) return;
+
setUp();
- for (Enumeration e= tests(); e.hasMoreElements(); ) {
- if ( result.shouldStop() ) break;
- Test test= (Test)e.nextElement();
- test.run(result);
+ try {
+ for (Test test : tests) {
+ if (result.shouldStop()) break;
+ test.run(result);
+ }
+ } finally {
+ tearDown();
}
- tearDown();
} catch (Exception e) {
result.addError(this, e);
}
}
- protected void setUp() throws Exception{
+ protected List<Test> getTests() {
+ return Collections.list(tests());
+ }
+
+ protected void setUp() throws Exception {
}
- protected void tearDown() throws Exception{
+ protected void tearDown() throws Exception {
}
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpLocalTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpLocalTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpLocalTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpLocalTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -25,7 +25,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Richard Monson-Haefel</a>
*/
-public class BmpLocalTestSuite extends org.apache.openejb.test.TestSuite {
+public class BmpLocalTestSuite extends
org.apache.openejb.test.FilteredTestSuite {
public BmpLocalTestSuite() {
super();
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -25,7 +25,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Richard Monson-Haefel</a>
*/
-public class BmpTestSuite extends org.apache.openejb.test.TestSuite {
+public class BmpTestSuite extends org.apache.openejb.test.FilteredTestSuite {
public BmpTestSuite() {
super();
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -26,7 +26,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Richard Monson-Haefel</a>
*/
-public class CmpLocalTestSuite extends org.apache.openejb.test.TestSuite {
+public class CmpLocalTestSuite extends
org.apache.openejb.test.FilteredTestSuite {
public CmpLocalTestSuite() {
super();
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -25,7 +25,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Richard Monson-Haefel</a>
*/
-public class CmpTestSuite extends org.apache.openejb.test.TestSuite {
+public class CmpTestSuite extends org.apache.openejb.test.FilteredTestSuite {
public CmpTestSuite() {
super();
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2TestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2TestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2TestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2TestSuite.java
Fri Dec 21 15:57:58 2007
@@ -25,7 +25,7 @@
/**
* @version $Revision: 472584 $ $Date: 2006-11-08 10:47:55 -0800 (Wed, 08 Nov
2006) $
*/
-public class Cmp2TestSuite extends org.apache.openejb.test.TestSuite {
+public class Cmp2TestSuite extends org.apache.openejb.test.FilteredTestSuite {
public Cmp2TestSuite() {
super();
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.test.entity.cmr;
-public class CmrTestSuite extends org.apache.openejb.test.TestSuite {
+public class CmrTestSuite extends org.apache.openejb.test.FilteredTestSuite {
public CmrTestSuite() {
super();
this.addTest(new OneToOneTests());
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -18,20 +18,20 @@
package org.apache.openejb.test.mdb;
import junit.framework.TestSuite;
+import org.apache.openejb.test.FilteredTestSuite;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Richard Monson-Haefel</a>
- *
* @version $Rev: 499359 $ $Date: 2007-01-24 03:19:37 -0800 (Wed, 24 Jan 2007)
$
*/
public class MdbTestSuite extends junit.framework.TestCase {
- public MdbTestSuite(String name){
+ public MdbTestSuite(String name) {
super(name);
}
public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
+ TestSuite suite = new FilteredTestSuite();
// Verify the famework is working
suite.addTest(new MdbConnectionFactoryTests());
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -19,6 +19,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import
org.apache.openejb.test.stateless.AnnotatedSetterInjectionStatelessPojoLocalHomeIntfcTests;
+import org.apache.openejb.test.FilteredTestSuite;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
@@ -32,7 +33,7 @@
}
public static Test suite() {
- TestSuite suite = new TestSuite();
+ TestSuite suite = new FilteredTestSuite();
suite.addTest(new StatefulJndiTests());
suite.addTest(new StatefulPojoLocalJndiTests());
suite.addTest(new StatefulHomeIntfcTests());
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -18,6 +18,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.openejb.test.FilteredTestSuite;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
@@ -30,7 +31,7 @@
}
public static Test suite() {
- TestSuite suite = new TestSuite();
+ TestSuite suite = new FilteredTestSuite();
suite.addTest(new StatefulJndiTests());
suite.addTest(new StatefulPojoRemoteJndiTests());
suite.addTest(new StatefulHomeIntfcTests());
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -17,6 +17,7 @@
package org.apache.openejb.test.stateless;
import junit.framework.TestSuite;
+import org.apache.openejb.test.FilteredTestSuite;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
@@ -31,7 +32,7 @@
}
public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
+ TestSuite suite = new FilteredTestSuite();
suite.addTest(new StatelessJndiTests());
suite.addTest(new StatelessPojoLocalJndiTests());
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessTestSuite.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessTestSuite.java?rev=606348&r1=606347&r2=606348&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessTestSuite.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessTestSuite.java
Fri Dec 21 15:57:58 2007
@@ -17,6 +17,7 @@
package org.apache.openejb.test.stateless;
import junit.framework.TestSuite;
+import org.apache.openejb.test.FilteredTestSuite;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
@@ -31,7 +32,7 @@
public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
+ TestSuite suite = new FilteredTestSuite();
suite.addTest(new StatelessJndiTests());
suite.addTest(new StatelessPojoRemoteJndiTests());
