You are viewing a plain text version of this content. The canonical link for it is here.
Posted to graffito-commits@incubator.apache.org by cl...@apache.org on 2006/05/22 20:08:11 UTC

svn commit: r408738 - in /incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr: AllTests.java TestBase.java mapper/AllTests.java

Author: clombart
Date: Mon May 22 13:08:11 2006
New Revision: 408738

URL: http://svn.apache.org/viewvc?rev=408738&view=rev
Log:
Reorganise the unit tests into subpackages
Add more unit tests

Added:
    incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/AllTests.java
Modified:
    incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/AllTests.java
    incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/TestBase.java

Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/AllTests.java?rev=408738&r1=408737&r2=408738&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/AllTests.java (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/AllTests.java Mon May 22 13:08:11 2006
@@ -20,7 +20,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.portals.graffito.jcr.mapper.DigesterMapperImplTest;
-import org.apache.portals.graffito.jcr.query.impl.QueryManagerTest;
+import org.apache.portals.graffito.jcr.querymanager.QueryManagerTest;
 import org.apache.portals.graffito.jcr.repository.RepositoryUtilTest;
 
 
@@ -37,18 +37,20 @@
 
     public static Test buildSuite() throws Exception {
         TestSuite suite= new TestSuite("Graffito OCM Tests");
-        // individual tests
-        suite.addTestSuite(DigesterMapperImplTest.class);
-        suite.addTestSuite(RepositoryUtilTest.class);
-        suite.addTestSuite(QueryManagerTest.class);
-        
-        
-        // package level tests
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.objectconverter.impl.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.atomicconverter.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.impl.AllTests.buildSuite());
-
+        suite.addTest(org.apache.portals.graffito.jcr.mapper.AllTests.buildSuite());     
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.atomic.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.auto.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.basic.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.beanconverter.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.collectionconverter.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.inheritance.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.interfaces.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.proxy.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.query.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.persistence.version.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.querymanager.AllTests.buildSuite());
+        suite.addTest(org.apache.portals.graffito.jcr.repository.AllTests.buildSuite());
         return suite;
     }
 }
+

Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/TestBase.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/TestBase.java?rev=408738&r1=408737&r2=408738&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/TestBase.java (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/TestBase.java Mon May 22 13:08:11 2006
@@ -66,7 +66,7 @@
 import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.TimestampTypeConverterImpl;
 import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.UtilDateTypeConverterImpl;
 import org.apache.portals.graffito.jcr.persistence.impl.PersistenceManagerImpl;
-import org.apache.portals.graffito.jcr.persistence.impl.PersistenceManagerInheritanceHierarchyTest;
+import org.apache.portals.graffito.jcr.persistence.inheritance.PersistenceManagerInheritanceHierarchyTest;
 import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
 import org.apache.portals.graffito.jcr.persistence.objectconverter.impl.ObjectConverterImpl;
 import org.apache.portals.graffito.jcr.query.QueryManager;
@@ -91,15 +91,15 @@
 	
 	protected Session session;
 
-	private PersistenceManager persistenceManager;
+	protected PersistenceManager persistenceManager;
 
-	private QueryManager queryManager;
+	protected QueryManager queryManager;
 
 	protected Mapper mapper;
 
     protected AtomicTypeConverterProvider converterProvider;
     
-	private boolean isInit = false;
+    protected boolean isInit = false;
 
 	/**
 	 * <p>

Added: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/AllTests.java?rev=408738&view=auto
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/AllTests.java (added)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/AllTests.java Mon May 22 13:08:11 2006
@@ -0,0 +1,45 @@
+/* ========================================================================
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.apache.portals.graffito.jcr.mapper;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
+
+
+/**
+ * Package level tests.
+ * 
+ * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
+ */
+public class AllTests {
+
+    public static Test suite() {
+        return new RepositoryLifecycleTestSetup(buildSuite());
+    }
+
+    public static Test buildSuite() {
+        TestSuite suite= new TestSuite("Test for org.apache.portals.graffito.jcr.mapper");
+        //$JUnit-BEGIN$
+        suite.addTestSuite(DigesterMapperImplTest.class);
+        
+        //$JUnit-END$
+
+        return suite;
+    }
+}