Author: ate
Date: Wed Nov 16 08:40:47 2005
New Revision: 345058
URL: http://svn.apache.org/viewcvs?rev=345058&view=rev
Log:
Fix rdbms/datsource testcases with Derby:
- replacing all usage of the test-repository-datasource-spring.xml with the
real JNDI based assembly/boot/datasource.xml
- changed inheritance of the related testcases from AbstractSpringTestCase to
DatasourceEnabledSpringTestCase
- added String[] getBootConfiguration() method to
DatasourceEnabledSpringTestCase returning a reference to this
boot/datasource.xml
- removed getBootConfiguration() from all the related testcase (they now use
the one from their parent)
Note: I think we can now drop the test-repository-datasource-spring.xml from
etc/db-ojb as it is no longer used.
Derby testcases now all run (but portal tests still fail on invalid
LayoutTestCase)
Modified:
portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java
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/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
Modified:
portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java
(original)
+++
portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java
Wed Nov 16 08:40:47 2005
@@ -18,7 +18,7 @@
import java.util.Iterator;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -29,7 +29,7 @@
* @author <a href="[EMAIL PROTECTED]">Roger Ruttimann</a>
* @version $Id$
*/
-public class TestCapability extends AbstractSpringTestCase
+public class TestCapability extends DatasourceEnabledSpringTestCase
{
private Capabilities capabilities = null;
@@ -179,12 +179,6 @@
{
return new String[]
{ "capabilities.xml", "transaction.xml" };
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]
- { "test-repository-datasource-spring.xml" };
}
}
Modified:
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
(original)
+++
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
Wed Nov 16 08:40:47 2005
@@ -19,7 +19,7 @@
import java.util.List;
import java.util.Locale;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.SecurityConstraint;
import org.apache.jetspeed.om.common.SecurityConstraints;
@@ -45,7 +45,7 @@
* @version $Id: $
*
*/
-public class TestDatabasePageManager extends AbstractSpringTestCase implements
PageManagerEventListener
+public class TestDatabasePageManager extends DatasourceEnabledSpringTestCase
implements PageManagerEventListener
{
private String deepFolderPath =
"/__subsite-rootx/_user/userx/_role/rolex/_group/groupx/_mediatype/xhtml/_language/en/_country/us/_custom/customx";
private String deepPagePath = deepFolderPath + "/default-page.psml";
@@ -102,12 +102,6 @@
{
return new String[]
{ "database-page-manager.xml", "transaction.xml" };
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]
- { "test-repository-datasource-spring.xml" };
}
/* (non-Javadoc)
Modified:
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java
(original)
+++
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java
Wed Nov 16 08:40:47 2005
@@ -25,7 +25,7 @@
import javax.security.auth.Subject;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.om.common.SecurityConstraint;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.folder.Folder;
@@ -49,7 +49,7 @@
* @version $Id: $
*
*/
-public class TestSecureDatabasePageManager extends AbstractSpringTestCase
+public class TestSecureDatabasePageManager extends
DatasourceEnabledSpringTestCase
{
private PageManager pageManager;
@@ -77,12 +77,6 @@
{
return new String[]
{ "secure-database-page-manager.xml", "transaction.xml" };
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]
- { "test-repository-datasource-spring.xml" };
}
public void testSecurePageManager() throws Exception
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=345058&r1=345057&r2=345058&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
Wed Nov 16 08:40:47 2005
@@ -15,7 +15,7 @@
*/
package org.apache.jetspeed.prefs.util.test;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.prefs.PreferencesProvider;
import org.apache.jetspeed.prefs.PropertyManager;
@@ -27,7 +27,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver</a>
* @version $Id$
*/
-public class AbstractPrefsSupportedTestCase extends AbstractSpringTestCase
+public class AbstractPrefsSupportedTestCase extends
DatasourceEnabledSpringTestCase
{
protected PropertyManager propertyManager;
@@ -42,7 +42,7 @@
protected String[] getBootConfigurations()
{
return new String[]
- { "test-repository-datasource-spring.xml" };
+ { "boot/datasource.xml" };
}
protected void setUp() throws Exception
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=345058&r1=345057&r2=345058&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
Wed Nov 16 08:40:47 2005
@@ -22,7 +22,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider;
/**
@@ -32,7 +32,7 @@
*
* @author <a href="[EMAIL PROTECTED]">David Le Strat </a>
*/
-public class TestPreferences extends AbstractSpringTestCase
+public class TestPreferences extends DatasourceEnabledSpringTestCase
{
/** The property manager. */
@@ -361,11 +361,5 @@
{
return new String[]
{ "prefs.xml", "transaction.xml" };
- }
-
- 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=345058&r1=345057&r2=345058&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
Wed Nov 16 08:40:47 2005
@@ -103,10 +103,4 @@
return new String[]
{ "prefs.xml", "transaction.xml" };
}
-
- protected String[] getBootConfigurations()
- {
- return new String[]
- { "test-repository-datasource-spring.xml" };
- }
}
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=345058&r1=345057&r2=345058&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
Wed Nov 16 08:40:47 2005
@@ -22,7 +22,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider;
import org.apache.jetspeed.prefs.om.Property;
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">David Le Strat</a>
*/
-public class TestPropertyManager extends AbstractSpringTestCase
+public class TestPropertyManager extends DatasourceEnabledSpringTestCase
{
/** The property manager. */
@@ -211,12 +211,6 @@
{
return new String[]
{ "prefs.xml", "transaction.xml" };
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]
- { "test-repository-datasource-spring.xml" };
}
/**
Modified:
portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java
(original)
+++
portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java
Wed Nov 16 08:40:47 2005
@@ -28,7 +28,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.mockobjects.request.MockRequestContext;
import org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl;
import org.apache.jetspeed.profiler.rules.ProfileResolvers;
@@ -48,7 +48,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class TestProfiler extends AbstractSpringTestCase
+public class TestProfiler extends DatasourceEnabledSpringTestCase
{
private Profiler profiler = null;
private ProfileResolvers resolvers = null;
@@ -470,11 +470,6 @@
protected String[] getConfigurations()
{
return new String[]{"profiler.xml", "transaction.xml"};
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]{"test-repository-datasource-spring.xml"};
}
}
Modified:
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
(original)
+++
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
Wed Nov 16 08:40:47 2005
@@ -67,4 +67,10 @@
super.tearDown();
}
+ protected String[] getBootConfigurations()
+ {
+ return new String[]
+ { "boot/datasource.xml"};
+ }
+
}
Modified:
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
(original)
+++
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
Wed Nov 16 08:40:47 2005
@@ -25,7 +25,7 @@
import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
@@ -52,7 +52,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver</a>
* @version $Id: TestPortletEntityDAO.java,v 1.3 2005/05/24 14:43:19 ate Exp $
*/
-public class TestPortletEntityDAO extends AbstractSpringTestCase
+public class TestPortletEntityDAO extends DatasourceEnabledSpringTestCase
{
/**
@@ -644,11 +644,5 @@
{
return new String[]
{ "transaction.xml", "registry.xml" };
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]
- { "test-repository-datasource-spring.xml" };
}
}
Modified:
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
(original)
+++
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
Wed Nov 16 08:40:47 2005
@@ -19,7 +19,7 @@
import java.util.Iterator;
import java.util.Locale;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.om.common.DublinCore;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
@@ -32,7 +32,7 @@
/**
* @author scott
*/
-public abstract class AbstractRegistryTest extends AbstractSpringTestCase
+public abstract class AbstractRegistryTest extends
DatasourceEnabledSpringTestCase
{
protected static final String PORTLET_0_CLASS = "com.portlet.MyClass0";
@@ -203,11 +203,6 @@
{
return new String[]
{ "transaction.xml", "prefs.xml", "registry.xml" };
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]{"test-repository-datasource-spring.xml"};
}
}
Modified:
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
(original)
+++
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
Wed Nov 16 08:40:47 2005
@@ -23,7 +23,7 @@
import javax.portlet.PortletMode;
import org.apache.jetspeed.components.persistence.store.LockFailedException;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.om.common.DublinCore;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.JetspeedServiceReference;
@@ -53,7 +53,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver</a>
* @version $Id$
*/
-public class TestPortletRegistryDAO extends AbstractSpringTestCase
+public class TestPortletRegistryDAO extends DatasourceEnabledSpringTestCase
{
public static final String APP_1_NAME = "RegistryTestPortlet";
@@ -321,11 +321,5 @@
{
return new String[]
{ "transaction.xml", "registry.xml" };
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]
- { "test-repository-datasource-spring.xml" };
}
}
Modified:
portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java?rev=345058&r1=345057&r2=345058&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
(original)
+++
portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
Wed Nov 16 08:40:47 2005
@@ -26,7 +26,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.mockobjects.request.MockRequestContext;
import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
@@ -46,7 +46,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Chris Schaefer </a>
* @version $Id: $
*/
-public class TestStatistics extends AbstractSpringTestCase
+public class TestStatistics extends DatasourceEnabledSpringTestCase
{
private PortalStatistics statistics = null;
@@ -321,12 +321,6 @@
{
return new String[]
{ "statistics.xml"};
- }
-
- protected String[] getBootConfigurations()
- {
- return new String[]
- { "test-repository-datasource-spring.xml"};
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
