svn commit: r591358 - in /jackrabbit/trunk/jackrabbit-core: pom.xml src/test/java/org/apache/jackrabbit/core/integration/JCRAPITest.java src/test/java/org/apache/jackrabbit/test/

[ju...@apache.org]

Author: jukka
Date: Fri Nov  2 08:21:36 2007
New Revision: 591358

URL: http://svn.apache.org/viewvc?rev=591358&view=rev
Log:
JCR-1203: Reorganize core test suite
    - TCK tests are run in the integration test phase
    - Other tests are run in the unit test phase

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/JCRAPITest.java
      - copied, changed from r591240, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/test/TestAll.java
Removed:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/test/
Modified:
    jackrabbit/trunk/jackrabbit-core/pom.xml

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=591358&r1=591357&r2=591358&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Fri Nov  2 08:21:36 2007
@@ -169,9 +169,9 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <excludes>
-            <exclude>**</exclude>
-          </excludes>
+          <includes>
+            <include>**/*TestAll.java</include>
+          </includes>
           <argLine>-Xmx128m</argLine>
           <systemProperties>
             <property>
@@ -193,11 +193,8 @@
             <phase>pre-integration-test</phase>
             <configuration>
               <includes>
-                <include>**/PrepareTestRepository.java</include>
+                <include>**/integration/PrepareTestRepository.java</include>
               </includes>
-              <excludes>
-                <exclude>**/*TestAll.java</exclude>
-              </excludes>
             </configuration>
             <goals>
               <goal>test</goal>
@@ -207,11 +204,8 @@
             <id>do_test</id>
             <phase>integration-test</phase>
             <configuration>
-              <excludes>
-                <exclude>**/init/*</exclude>
-              </excludes>
               <includes>
-                <include>**/*TestAll.java</include>
+                <include>**/integration/*Test.java</include>
               </includes>
             </configuration>
             <goals>

Copied: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/JCRAPITest.java (from r591240, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/test/TestAll.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/JCRAPITest.java?p2=jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/JCRAPITest.java&p1=jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/test/TestAll.java&r1=591240&r2=591358&rev=591358&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/test/TestAll.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/JCRAPITest.java Fri Nov  2 08:21:36 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.test;
+package org.apache.jackrabbit.core.integration;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -23,7 +23,7 @@
 /**
  * Test suite that includes all test suites from jackrabbit-jcr-tests.
  */
-public class TestAll extends TestCase {
+public class JCRAPITest extends TestCase {
 
     public static Test suite() {
         return new JCRTestSuite();