[Commits] (bcm) get core tests working again. move the old tests
into the org.osaf.cosmo
commits at osafoundation.org
commits at osafoundation.org
Tue Apr 12 18:52:48 PDT 2005
Commit by: bcm
Modified files:
server/core/build.xml 1.18 1.19
server/core/etc/applicationContext-base.xml 1.4 1.5
server/core/test/etc/applicationContext-test-base.xml None 1.1
server/core/test/etc/applicationContext-test-datasource.xml None 1.1
server/core/test/etc/applicationContext-test-jcr-client.xml None 1.1
server/core/test/etc/repository.xml None 1.1
server/core/test/etc/log4j.xml 1.1.1.1 1.2
server/core/test/etc/applicationContext-datasource.xml 1.1 None
server/core/test/etc/applicationContext-jcr-client.xml 1.1 None
server/core/test/org/osaf/chandler/server/BaseHibernateTestCase.java 1.1 None
server/core/test/org/osaf/chandler/server/BaseJCRManagerTestCase.java 1.1 None
server/core/test/org/osaf/chandler/server/BaseJCRTestCase.java 1.1 None
server/core/test/org/osaf/chandler/server/BaseSlideManagerTestCase.java 1.1 None
server/core/test/org/osaf/chandler/server/BaseSlideTestCase.java 1.1 None
server/core/test/org/osaf/chandler/server/TestHelper.java 1.1.1.1 None
server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java 1.4 None
server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java 1.4 None
server/core/test/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCRTest.java 1.2 None
server/core/test/org/osaf/chandler/server/dao/jcr/TestJCRCredentialsProvider.java 1.1 None
server/core/test/org/osaf/chandler/server/dao/slide/ShareDAOSlideTest.java 1.2 None
server/core/test/org/osaf/chandler/server/manager/jcr/JCRProvisioningManagerTest.java 1.1 None
server/core/test/org/osaf/chandler/server/manager/slide/SlideProvisioningManagerTest.java 1.1 None
server/core/test/org/osaf/cosmo/BaseCoreTestCase.java None 1.1
server/core/test/org/osaf/cosmo/TestAuthenticationProvider.java None 1.1
server/core/test/org/osaf/cosmo/TestHelper.java None 1.1
server/core/test/org/osaf/cosmo/dao/ContentStoreDAOTest.java None 1.1
server/core/test/org/osaf/cosmo/dao/RoleDAOTest.java None 1.1
server/core/test/org/osaf/cosmo/dao/UserDAOTest.java None 1.1
server/core/test/org/osaf/cosmo/manager/ProvisioningManagerTest.java None 1.1
server/docs/TODO.txt 1.52 1.53
Log message:
get core tests working again. move the old tests into the org.osaf.cosmo
package and remove the slide tests. use sexy spring stuff to mock up the j2ee
env entries that we require.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/core/build.xml.diff?r1=text&tr1=1.18&r2=text&tr2=1.19
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-base.xml.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-test-base.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-test-datasource.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-test-jcr-client.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/repository.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/log4j.xml.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-datasource.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-jcr-client.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseHibernateTestCase.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseJCRManagerTestCase.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseJCRTestCase.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseSlideManagerTestCase.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseSlideTestCase.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/TestHelper.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCRTest.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/jcr/TestJCRCredentialsProvider.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/slide/ShareDAOSlideTest.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/manager/jcr/JCRProvisioningManagerTest.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/manager/slide/SlideProvisioningManagerTest.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/cosmo/BaseCoreTestCase.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/cosmo/TestAuthenticationProvider.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/cosmo/TestHelper.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/cosmo/dao/ContentStoreDAOTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/cosmo/dao/RoleDAOTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/cosmo/dao/UserDAOTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/cosmo/manager/ProvisioningManagerTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.52&r2=text&tr2=1.53
Index: server/core/etc/applicationContext-base.xml
diff -u server/core/etc/applicationContext-base.xml:1.4 server/core/etc/applicationContext-base.xml:1.5
--- server/core/etc/applicationContext-base.xml:1.4 Mon Apr 11 15:19:57 2005
+++ server/core/etc/applicationContext-base.xml Tue Apr 12 18:52:42 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
- "http://www.springframework.or g/dtd/spring-beans.dtd">
+ "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
Index: server/core/build.xml
diff -u server/core/build.xml:1.18 server/core/build.xml:1.19
--- server/core/build.xml:1.18 Tue Apr 12 16:59:18 2005
+++ server/core/build.xml Tue Apr 12 18:52:41 2005
@@ -82,29 +82,25 @@
<target name="test" depends="all,test-compile"
description="run JUnit tests">
<copy todir="${core.build}/testclasses">
- <fileset dir="${core.etc}">
+ <fileset dir="${cosmo.etc}">
<include name="hibernate.properties"/>
</fileset>
<fileset dir="${core.test}/etc">
- <include name="applicationContext-jcr-client.xml"/>
- <include name="applicationContext-datasource.xml"/>
+ <include name="applicationContext-test-base.xml"/>
+ <include name="applicationContext-test-jcr-client.xml"/>
+ <include name="applicationContext-test-datasource.xml"/>
<include name="log4j.xml"/>
</fileset>
<filterset>
- <filter token="CONFIGFILEPATH"
- value="${cosmo.etc}/repository.xml"/>
- <filter token="REPOSITORYHOMEDIRPATH"
- value="${core.test}/repository"/>
- <filter token="DIALECT"
- value="${cosmo.test.userdb.dialect}/"/>
- <filter token="DRIVER"
- value="${cosmo.test.userdb.driver}/"/>
- <filter token="DB_URL"
- value="${cosmo.test.userdb.url}/"/>
- <filter token="DB_USERNAME"
- value="${cosmo.test.userdb.username}/"/>
- <filter token="DB_PASSWORD"
- value="${cosmo.test.userdb.password}/"/>
+ <filter token="VERSION" value="${cosmo.version}"/>
+ <filter token="SERVER_ADMIN" value="${cosmo.serverAdmin}"/>
+ <filter token="CONFIGFILEPATH" value="${core.test}/etc/repository.xml"/>
+ <filter token="REPOSITORYHOMEDIRPATH" value="${core.test}/repository"/>
+ <filter token="DIALECT" value="${cosmo.test.userdb.dialect}"/>
+ <filter token="DRIVER" value="${cosmo.test.userdb.driver}"/>
+ <filter token="DB_URL" value="${cosmo.test.userdb.url}"/>
+ <filter token="DB_USERNAME" value="${cosmo.test.userdb.username}"/>
+ <filter token="DB_PASSWORD" value="${cosmo.test.userdb.password}"/>
</filterset>
</copy>
<junit printsummary="no" fork="true"
Index: server/core/test/etc/log4j.xml
diff -u server/core/test/etc/log4j.xml:1.1.1.1 server/core/test/etc/log4j.xml:1.2
--- server/core/test/etc/log4j.xml:1.1.1.1 Wed Feb 16 11:30:53 2005
+++ server/core/test/etc/log4j.xml Tue Apr 12 18:52:42 2005
@@ -25,6 +25,10 @@
<level value="DEBUG"/>
</logger>
+ <logger name="org.osaf.jcr">
+ <level value="WARN"/>
+ </logger>
+
<root>
<level value="WARN"/>
<appender-ref ref="CONSOLE"/>
Index: server/docs/TODO.txt
diff -u server/docs/TODO.txt:1.52 server/docs/TODO.txt:1.53
--- server/docs/TODO.txt:1.52 Tue Apr 12 16:59:41 2005
+++ server/docs/TODO.txt Tue Apr 12 18:52:47 2005
@@ -6,7 +6,6 @@
* make pk of user and role tables a long id rather than name (but
keep that col indexed)
- * get tests running again
web:
More information about the Commits
mailing list