You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/08/20 16:28:28 UTC
svn commit: r567715 - in /portals/jetspeed-2/trunk/components:
jetspeed-capability/
jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/
jetspeed-capability/src/test/resources/
jetspeed-capability/src/test/resources/boot/ jetspeed-cm/src...
Author: ate
Date: Mon Aug 20 07:28:28 2007
New Revision: 567715
URL: http://svn.apache.org/viewvc?rev=567715&view=rev
Log:
JS2-770: Provide a new maven-2 (only) build environment and restructure the source tree according to the maven-2 conventions
See: http://issues.apache.org/jira/browse/JS2-770
Plugging new JetspeedCapabilitiesSerializer in TestCapability and enabling test cases on capabilities component again (passed)
Please note: you need to execute
$mvn -P test-setup org.apache.portals.jetspeed-2:jetspeed-maven-plugins:init-db
first to initialize your own portal database
(would be nice if we could create/configure some plugin which detects this to be done automatically...)
Added:
portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/
portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/serializer.xml (with props)
Modified:
portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java
portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
Modified: portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml?rev=567715&r1=567714&r2=567715&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml Mon Aug 20 07:28:28 2007
@@ -61,9 +61,53 @@
<artifactId>jetspeed-cm</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <build>
+ <properties>
+ <!-- Enable unit test again
+ Weirdly enough, defining -Dmaven.test.skip=true on the commandline doesn't work
+ with maven.test.skip=true defined in the root pom ???
+ -->
+ <maven.test.skip>false</maven.test.skip>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-maven-plugins</artifactId>
+ <version>${pom.version}</version>
+ <dependencies>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack-resources</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
+ <targetBaseDirectory>${project.build.outputDirectory}</targetBaseDirectory>
+ <resources>
+ <unpack>
+ <entryset dir="webapp/WEB-INF/assembly" includes="capabilities.xml,transaction.xml"/>
+ <entryset dir="db-ojb"/>
+ <entryset dir="seed/min" includes="j2-seed.xml"/>
+ </unpack>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<testResources>
<testResource>
<directory>src/test/resources</directory>
Modified: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java?rev=567715&r1=567714&r2=567715&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java Mon Aug 20 07:28:28 2007
@@ -25,7 +25,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
+import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.serializer.JetspeedSerializer;
/**
@@ -34,7 +35,7 @@
* @author <a href="roger.ruttimann@earthlink.net">Roger Ruttimann</a>
* @version $Id$
*/
-public class TestCapability extends DatasourceEnabledSpringTestCase
+public class TestCapability extends AbstractSpringTestCase
{
private Capabilities capabilities = null;
@@ -63,6 +64,19 @@
}
/**
+ * First test defined is used to setup the data(base)
+ * <b>DO NOT ADD TESTS ABOVE THIS ONE</b>
+ *
+ */
+ public void testSetup() throws Exception
+ {
+ System.out.println("testSetup");
+ JetspeedSerializer serializer = (JetspeedSerializer)ctx.getBean("serializer");
+ serializer.deleteData();
+ serializer.importData(getBasedir()+"target/classes/j2-seed.xml");
+ }
+
+ /**
* Tests categories
*
* @throws Exception
@@ -517,8 +531,23 @@
protected String[] getConfigurations()
{
- return new String[]
- { "capabilities.xml", "transaction.xml" };
+ return new String[]
+ { "capabilities.xml", "transaction.xml", "serializer.xml" };
}
+ protected String[] getBootConfigurations()
+ {
+ return new String[]
+ { "boot/datasource.xml"};
+ }
+ /**
+ * Last test defined is used to cleanup the data(base)
+ * <b>DO NOT ADD TESTS BELOW THIS ONE</b>
+ */
+ public void testTeardown() throws Exception
+ {
+ System.out.println("testTeardown");
+ JetspeedSerializer serializer = (JetspeedSerializer)ctx.getBean("serializer");
+ serializer.deleteData();
+ }
}
Added: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml?rev=567715&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml Mon Aug 20 07:28:28 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
+
+ <bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
+ <constructor-arg index='0'>
+ <ref bean="JetspeedDS"/>
+ </constructor-arg>
+ <!-- JNDI Name -->
+ <constructor-arg index='1'>
+ <value>JetspeedDS</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName"><value>${org.apache.jetspeed.test.database.driver}</value></property>
+ <property name="url"><value>${org.apache.jetspeed.test.database.url}</value></property>
+ <property name="username"><value>${org.apache.jetspeed.test.database.user}</value></property>
+ <property name="password"><value>${org.apache.jetspeed.test.database.password}</value></property>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/serializer.xml?rev=567715&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/serializer.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/serializer.xml Mon Aug 20 07:28:28 2007
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+ <bean id="serializer" class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
+ <constructor-arg index="0">
+ <list>
+ <bean class="org.apache.jetspeed.serializer.JetspeedCapabilitiesSerializer">
+ <constructor-arg ref="org.apache.jetspeed.capabilities.Capabilities"/>
+ </bean>
+ </list>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <map>
+ <entry key="process_capabilities"><value type="java.lang.Boolean">true</value></entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/serializer.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/serializer.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/resources/serializer.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java?rev=567715&r1=567714&r2=567715&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java Mon Aug 20 07:28:28 2007
@@ -16,6 +16,8 @@
*/
package org.apache.jetspeed.components.test;
+import java.io.File;
+
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -84,5 +86,19 @@
protected String[] getBootConfigurations()
{
return null;
+ }
+
+ /**
+ * return current project base directory delimited by path separator or empty String if
+ * basedir environment isn't defined (by maven-surefire plugin)
+ */
+ protected String getBasedir()
+ {
+ String basedir = System.getProperty("basedir");
+ if (basedir != null)
+ {
+ return basedir + File.separator;
+ }
+ return "";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org