[portal-commits] JBoss Portal SVN: r12201 - modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/workflow.
Author: thomas.heute(a)jboss.com
Date: 2008-10-28 11:09:34 -0400 (Tue, 28 Oct 2008)
New Revision: 12201
Modified:
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/workflow/AbstractWorkflowTestCase.java
Log:
Attempt to fix the multi db testsuite
Modified:
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/workflow/AbstractWorkflowTestCase.java
===================================================================
---
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/workflow/AbstractWorkflowTestCase.java 2008-10-28
14:29:21 UTC (rev 12200)
+++
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/workflow/AbstractWorkflowTestCase.java 2008-10-28
15:09:34 UTC (rev 12201)
@@ -21,37 +21,44 @@
*/
package org.jboss.portal.cms.test.workflow;
+import java.util.Locale;
+
import javax.naming.InitialContext;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
-
import org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor;
import org.jboss.portal.cms.impl.jcr.JCRCMS;
+import org.jboss.portal.cms.test.AbstractCMSTestCase;
+import org.jboss.portal.cms.test.commands.CMSInterceptorStackFactory;
import org.jboss.portal.cms.workflow.ApprovePublish;
import org.jboss.portal.cms.workflow.ApprovePublishImpl;
-import org.jboss.portal.cms.test.commands.AbstractCommandTestCase;
-import org.jboss.portal.cms.test.commands.CMSInterceptorStackFactory;
-
import org.jboss.portal.common.invocation.Interceptor;
+import org.jboss.portal.common.util.CLResourceLoader;
+import org.jboss.portal.common.util.LoaderResource;
+import org.jboss.portal.common.xml.XMLTools;
import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.IdentityServiceController;
+import org.jboss.portal.identity.User;
import org.jboss.portal.identity.UserModule;
-import org.jboss.portal.identity.User;
import org.jboss.portal.identity.db.HibernateRoleImpl;
import org.jboss.portal.identity.db.HibernateUserImpl;
import org.jboss.portal.server.impl.invocation.JBossInterceptorStack;
+import org.jboss.unit.api.pojo.annotations.Create;
+import org.jboss.unit.api.pojo.annotations.Destroy;
import org.jboss.unit.api.pojo.annotations.Parameter;
-import org.jboss.unit.mc.api.annotations.Bootstrap;
+import org.w3c.dom.Document;
/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */
-public abstract class AbstractWorkflowTestCase extends AbstractCommandTestCase
+public abstract class AbstractWorkflowTestCase extends AbstractCMSTestCase
{
private String standardIdentityConfig;
private String identityConfig;
+ protected JCRCMS service = null;
+
/**
*
*/
@@ -65,14 +72,29 @@
super();
}
- /**
- *
- */
+ @Create
public void setUp() throws Exception
{
//override the configration location to include workflow services
// this.configuration = "jboss-beans-workflow.xml";
+
+ LoaderResource res = new
CLResourceLoader().getResource("jcr/repository.xml");
+ Document config =
res.asDocument(XMLTools.getDocumentBuilderFactory().newDocumentBuilder());
+
+ service = new JCRCMS();
+ service.setDoChecking(true);
+ service.setDefaultLocale(Locale.ENGLISH.getLanguage());
+ service.setDefaultContentLocation("default-content/default");
+
+ service.setConfig(config.getDocumentElement());
+ service.setRepositoryName("repo");
+ service.setHomeDir("repotest-" + getDataSourceName());
+ service.setJNDIName("java:portal/CMS");
+ service.startService();
+
+ /*
super.setUp();
+ */
ApprovalWorkflowInterceptor workflowInterceptor =
this.getApprovalWorkflowInterceptor();
ApprovePublish approvePublish = this.getApprovePublish();
@@ -95,12 +117,10 @@
this.userModule =
(UserModule)identityService.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE);
}
- /**
- *
- */
+ @Destroy
public void tearDown() throws Exception
{
- super.tearDown();
+ service.stopService();
this.userModule = null;
}