Author: rwatler
Date: Mon Jul 25 00:52:21 2005
New Revision: 224701
URL: http://svn.apache.org/viewcvs?rev=224701&view=rev
Log:
repairing various tests and test support classes
Modified:
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java
portals/jetspeed-2/trunk/components/file-cache/project.xml
portals/jetspeed-2/trunk/components/portal/project.xml
portals/jetspeed-2/trunk/components/prefs/src/java/org/apache/jetspeed/prefs/util/test/AbstractPrefsSupportedTestCase.java
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesNoPropManager.java
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java
portals/jetspeed-2/trunk/components/registry/project.xml
portals/jetspeed-2/trunk/components/rewriter/project.xml
portals/jetspeed-2/trunk/components/security/project.xml
Modified:
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
(original)
+++
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
Mon Jul 25 00:52:21 2005
@@ -3,8 +3,6 @@
import java.io.File;
import java.util.Map;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -13,24 +11,9 @@
public static final String BEAN_FACTORY = "bean.factory";
private final Map context;
- private static final PropertiesConfiguration USER_PROPERTIES;
- static
- {
- try
- {
- USER_PROPERTIES= new PropertiesConfiguration(new
File(System.getProperty("user.home"), "build.properties"));
- }
- catch (ConfigurationException e)
- {
-
- throw new IllegalStateException("Unable to load
${USER_HOME}/build.properties");
- }
- }
-
public AbstractTestHelper(Map context)
{
this.context = context;
-
}
public Map getContext()
@@ -40,7 +23,10 @@
protected final String getUserProperty(String key)
{
- return USER_PROPERTIES.getProperty(key).toString();
+ // use system properties passed to test via the
+ // maven.junit.sysproperties configuration from
+ // maven build.properties and/or project.properties
+ return System.getProperty(key).toString();
}
protected final void addBeanFactory(ConfigurableBeanFactory bf)
Modified:
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java
(original)
+++
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java
Mon Jul 25 00:52:21 2005
@@ -5,8 +5,9 @@
import org.apache.commons.dbcp.BasicDataSource;
/**
- * This helper adds a "datasource" based on the user's build.properties
- * test database settings.
+ * This helper adds a "datasource" based on the maven
+ * build.properties/project.properties database settings
+ * passed to the test case, (see AbstractTestHelper).
*
*
* @author <href a="mailto:[EMAIL PROTECTED]">Scott T. Weaver</a>
@@ -16,10 +17,10 @@
{
public static final String DATASOURCE_KEY = "datasource";
- private static final String ORG_APACHE_JETSPEED_TEST_DATABASE_PASSWORD =
"org.apache.jetspeed.test.database.password";
- private static final String ORG_APACHE_JETSPEED_TEST_DATABASE_USER =
"org.apache.jetspeed.test.database.user";
- private static final String ORG_APACHE_JETSPEED_TEST_DATABASE_URL =
"org.apache.jetspeed.test.database.url";
- private static final String ORG_APACHE_JETSPEED_TEST_DATABASE_DRIVER =
"org.apache.jetspeed.test.database.driver";
+ private static final String ORG_APACHE_JETSPEED_DATABASE_PASSWORD =
"org.apache.jetspeed.database.password";
+ private static final String ORG_APACHE_JETSPEED_DATABASE_USER =
"org.apache.jetspeed.database.user";
+ private static final String ORG_APACHE_JETSPEED_DATABASE_URL =
"org.apache.jetspeed.database.url";
+ private static final String ORG_APACHE_JETSPEED_DATABASE_DRIVER =
"org.apache.jetspeed.database.driver";
protected BasicDataSource datasource;
public DatasourceHelper(Map context)
@@ -31,10 +32,10 @@
public void setUp() throws Exception
{
datasource = new BasicDataSource();
-
datasource.setDriverClassName(getUserProperty(ORG_APACHE_JETSPEED_TEST_DATABASE_DRIVER));
-
datasource.setUrl(getUserProperty(ORG_APACHE_JETSPEED_TEST_DATABASE_URL));
-
datasource.setUsername(getUserProperty(ORG_APACHE_JETSPEED_TEST_DATABASE_USER));
-
datasource.setPassword(getUserProperty(ORG_APACHE_JETSPEED_TEST_DATABASE_PASSWORD));
+
datasource.setDriverClassName(getUserProperty(ORG_APACHE_JETSPEED_DATABASE_DRIVER));
+ datasource.setUrl(getUserProperty(ORG_APACHE_JETSPEED_DATABASE_URL));
+
datasource.setUsername(getUserProperty(ORG_APACHE_JETSPEED_DATABASE_USER));
+
datasource.setPassword(getUserProperty(ORG_APACHE_JETSPEED_DATABASE_PASSWORD));
getContext().put(DATASOURCE_KEY, datasource);
}
Modified: portals/jetspeed-2/trunk/components/file-cache/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/file-cache/project.xml?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/project.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/project.xml Mon Jul 25
00:52:21 2005
@@ -46,4 +46,36 @@
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <excludes>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/log4j</directory>
+ </resource>
+ </resources>
+ </unitTest>
+
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/portal/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/project.xml?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/project.xml Mon Jul 25 00:52:21
2005
@@ -36,5 +36,40 @@
</url>
</repository>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>
+ ${basedir}/src/test
+ </unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+
<directory>${basedir}/../../etc/log4j</directory>
+ </resource>
+ <resource>
+
<directory>${basedir}/../../etc/db-ojb</directory>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ </build>
</project>
Modified:
portals/jetspeed-2/trunk/components/prefs/src/java/org/apache/jetspeed/prefs/util/test/AbstractPrefsSupportedTestCase.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/src/java/org/apache/jetspeed/prefs/util/test/AbstractPrefsSupportedTestCase.java?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/prefs/src/java/org/apache/jetspeed/prefs/util/test/AbstractPrefsSupportedTestCase.java
(original)
+++
portals/jetspeed-2/trunk/components/prefs/src/java/org/apache/jetspeed/prefs/util/test/AbstractPrefsSupportedTestCase.java
Mon Jul 25 00:52:21 2005
@@ -15,7 +15,7 @@
*/
package org.apache.jetspeed.prefs.util.test;
-import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
+import org.apache.jetspeed.components.test.AbstractSpringTestCase;
import org.apache.jetspeed.prefs.PreferencesProvider;
import org.apache.jetspeed.prefs.PropertyManager;
@@ -30,7 +30,7 @@
* @version $Id$
*
*/
-public class AbstractPrefsSupportedTestCase extends
DatasourceEnabledSpringTestCase
+public class AbstractPrefsSupportedTestCase extends AbstractSpringTestCase
{
protected PropertyManager propertyManager;
protected PreferencesProvider prefsProvider;
@@ -40,6 +40,11 @@
return new String[]{"META-INF/prefs-noprop-dao.xml",
"META-INF/transaction.xml"};
}
+ protected String[] getBootConfigurations()
+ {
+ return new String[]{"test-repository-datasource-spring.xml"};
+ }
+
protected void setUp() throws Exception
{
super.setUp();
Modified:
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java
(original)
+++
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java
Mon Jul 25 00:52:21 2005
@@ -22,7 +22,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
+import org.apache.jetspeed.components.test.AbstractSpringTestCase;
/**
* <p>
@@ -31,7 +31,7 @@
*
* @author <a href="[EMAIL PROTECTED]">David Le Strat </a>
*/
-public class TestPreferences extends DatasourceEnabledSpringTestCase
+public class TestPreferences extends AbstractSpringTestCase
{
/** The property manager. */
@@ -357,4 +357,9 @@
{
return new String[]{"META-INF/prefs-dao.xml",
"META-INF/transaction.xml"};
}
-}
\ No newline at end of file
+
+ protected String[] getBootConfigurations()
+ {
+ return new String[]{"test-repository-datasource-spring.xml"};
+ }
+}
Modified:
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesNoPropManager.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesNoPropManager.java?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesNoPropManager.java
(original)
+++
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesNoPropManager.java
Mon Jul 25 00:52:21 2005
@@ -10,7 +10,7 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
+import org.apache.jetspeed.components.test.AbstractSpringTestCase;
/**
* <p>
@@ -23,11 +23,9 @@
* @version $Id$
*
*/
-public class TestPreferencesNoPropManager extends
DatasourceEnabledSpringTestCase
+public class TestPreferencesNoPropManager extends AbstractSpringTestCase
{
-
-
/**
* The property manager.
*/
@@ -62,6 +60,11 @@
protected String[] getConfigurations()
{
return new String[]{"META-INF/prefs-noprop-dao.xml",
"META-INF/transaction.xml"};
+ }
+
+ protected String[] getBootConfigurations()
+ {
+ return new String[]{"test-repository-datasource-spring.xml"};
}
protected void clearChildren(Preferences node) throws Exception
Modified:
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java
(original)
+++
portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java
Mon Jul 25 00:52:21 2005
@@ -22,7 +22,7 @@
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.prefs.om.Property;
/**
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">David Le Strat</a>
*/
-public class TestPropertyManager extends DatasourceEnabledSpringTestCase
+public class TestPropertyManager extends AbstractSpringTestCase
{
/** The property manager. */
@@ -191,6 +191,11 @@
protected String[] getConfigurations()
{
return new String[]{"META-INF/prefs-dao.xml",
"META-INF/transaction.xml"};
+ }
+
+ protected String[] getBootConfigurations()
+ {
+ return new String[]{"test-repository-datasource-spring.xml"};
}
/**
Modified: portals/jetspeed-2/trunk/components/registry/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/project.xml?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/project.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/project.xml Mon Jul 25
00:52:21 2005
@@ -82,4 +82,39 @@
</properties>
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+
+
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <unitTest>
+ <excludes>
+ <exclude>**/Abstract*</exclude>
+
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>repository_database.xml</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/log4j</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/db-ojb</directory>
+ </resource>
+ </resources>
+ </unitTest>
+
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/rewriter/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rewriter/project.xml?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/project.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/project.xml Mon Jul 25
00:52:21 2005
@@ -34,4 +34,14 @@
<url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rewriter/</url>
</repository>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </unitTest>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/security/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/project.xml?rev=224701&r1=224700&r2=224701&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/project.xml (original)
+++ portals/jetspeed-2/trunk/components/security/project.xml Mon Jul 25
00:52:21 2005
@@ -80,31 +80,38 @@
</dependency>
</dependencies>
- <build>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
- <unitTest>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>**/META-INF/**</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/../../etc/log4j</directory>
- </resource>
- <resource>
- <directory>${basedir}/../../etc/db-ojb</directory>
- </resource>
- </resources>
- </unitTest>
- </build>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/ldap/*</exclude>
+ </excludes>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/log4j</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/db-ojb</directory>
+ </resource>
+ </resources>
+ </unitTest>
+ </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
