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 ap...@apache.org on 2006/02/08 10:07:55 UTC

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

Author: apopescu
Date: Wed Feb  8 02:07:54 2006
New Revision: 375913

URL: http://svn.apache.org/viewcvs?rev=375913&view=rev
Log:
bean-descriptor test added to overall suite

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/viewcvs/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/AllTests.java?rev=375913&r1=375912&r2=375913&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 Wed Feb  8 02:07:54 2006
@@ -20,6 +20,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.portals.graffito.jcr.mapper.DigesterMapperImplTest;
+import org.apache.portals.graffito.jcr.persistence.objectconverter.impl.BeanDescriptorTest;
 import org.apache.portals.graffito.jcr.query.impl.QueryManagerTest;
 import org.apache.portals.graffito.jcr.repository.RepositoryUtilTest;
 
@@ -41,6 +42,7 @@
         suite.addTestSuite(DigesterMapperImplTest.class);
         suite.addTestSuite(RepositoryUtilTest.class);
         suite.addTestSuite(QueryManagerTest.class);
+        suite.addTestSuite(BeanDescriptorTest.class);
         
         // package level tests
         suite.addTest(org.apache.portals.graffito.jcr.persistence.atomicconverter.AllTests.buildSuite());

Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/TestBase.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/TestBase.java?rev=375913&r1=375912&r2=375913&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 Wed Feb  8 02:07:54 2006
@@ -84,8 +84,10 @@
 
 	private QueryManager queryManager;
 
-	Mapper mapper;
+	protected Mapper mapper;
 
+    protected AtomicTypeConverterProvider converterProvider;
+    
 	private boolean isInit = false;
 
 	/**
@@ -177,11 +179,13 @@
 	protected void initPersistenceManager() throws UnsupportedRepositoryOperationException, javax.jcr.RepositoryException
 	{
 		Repository repository = RepositoryUtil.getRepository("repositoryTest");
-		String[] files = { "./src/test-config/jcrmapping.xml", "./src/test-config/jcrmapping-atomic.xml" };
+		String[] files = { "./src/test-config/jcrmapping.xml", 
+                           "./src/test-config/jcrmapping-atomic.xml",
+                           "./src/test-config/jcrmapping-beandescriptor.xml"};
 		session = RepositoryUtil.login(repository, "superuser", "superuser");
 		
 		mapper = new DigesterMapperImpl(files).buildMapper();
-        AtomicTypeConverterProvider converterProvider = new DefaultAtomicTypeConverterProvider();
+        converterProvider = new DefaultAtomicTypeConverterProvider();
         Map atomicTypeConverters = converterProvider.getAtomicTypeConverters();
 		queryManager = new QueryManagerImpl(mapper, atomicTypeConverters);
         ObjectConverter objectConverter = new ObjectConverterImpl(mapper, converterProvider);