Author: taylor
Date: Sun Jul 24 23:47:30 2005
New Revision: 224699
URL: http://svn.apache.org/viewcvs?rev=224699&view=rev
Log:
rolling back changes as Randy will replace with a new way
Modified:
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
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=224699&r1=224698&r2=224699&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
Sun Jul 24 23:47:30 2005
@@ -20,12 +20,9 @@
import java.util.prefs.Preferences;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider;
-import org.apache.jetspeed.prefs.impl.PropertyManagerImpl;
-import org.apache.jetspeed.testhelpers.OJBHelper;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
/**
* <p>
@@ -34,7 +31,7 @@
*
* @author <a href="[EMAIL PROTECTED]">David Le Strat </a>
*/
-public class TestPreferences extends TestCase
+public class TestPreferences extends DatasourceEnabledSpringTestCase
{
/** The property manager. */
@@ -49,7 +46,6 @@
private final static int SYSTEM_PROPERTY_SET_TYPE = 1;
private PreferencesProvider provider;
- private OJBHelper ojbHelper;
private PreferencesProvider providerNoProp;
@@ -58,21 +54,11 @@
*/
public void setUp() throws Exception
{
+ super.setUp();
+ provider = (PreferencesProvider) ctx.getBean("prefsProvider");
- Map context = new HashMap();
- ojbHelper = new OJBHelper(context);
- ojbHelper.setUp();
-
- PersistenceBrokerPreferencesProvider targetProvider = new
PersistenceBrokerPreferencesProvider("META-INF/prefs_repository.xml", true);
- targetProvider.init();
- this.provider = (PreferencesProvider)
- ojbHelper.getTxProxiedObject(targetProvider, new
String[]{PreferencesProvider.class.getName()});
+ pms = (PropertyManager) ctx.getBean("propertyManager");
- PropertyManagerImpl targetPropMan = new PropertyManagerImpl(provider);
-
- pms = (PropertyManager)
- ojbHelper.getTxProxiedObject(targetPropMan, new
String[]{PropertyManager.class.getName()});
-
// Make sure we are starting with a clean slate
clearChildren(Preferences.userRoot());
clearChildren(Preferences.systemRoot());
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=224699&r1=224698&r2=224699&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
Sun Jul 24 23:47:30 2005
@@ -6,16 +6,11 @@
*/
package org.apache.jetspeed.prefs;
-import java.util.HashMap;
import java.util.Map;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-import junit.framework.TestCase;
-
-import org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider;
-import org.apache.jetspeed.prefs.impl.PropertyManagerImpl;
-import org.apache.jetspeed.testhelpers.OJBHelper;
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
/**
* <p>
@@ -28,7 +23,7 @@
* @version $Id$
*
*/
-public class TestPreferencesNoPropManager extends TestCase
+public class TestPreferencesNoPropManager extends
DatasourceEnabledSpringTestCase
{
@@ -38,27 +33,16 @@
*/
private static PropertyManager pms;
private PreferencesProvider provider;
- private OJBHelper ojbHelper;
/**
* @see junit.framework.TestCase#setUp()
*/
public void setUp() throws Exception
{
+ super.setUp();
+ provider = (PreferencesProvider) ctx.getBean("prefsProvider");
- Map context = new HashMap();
- ojbHelper = new OJBHelper(context);
- ojbHelper.setUp();
-
- PersistenceBrokerPreferencesProvider targetProvider = new
PersistenceBrokerPreferencesProvider("META-INF/prefs_repository.xml", true);
- targetProvider.init();
- this.provider = (PreferencesProvider)
- ojbHelper.getTxProxiedObject(targetProvider, new
String[]{PreferencesProvider.class.getName()});
-
- PropertyManagerImpl targetPropMan = new PropertyManagerImpl(provider);
-
- pms = (PropertyManager)
- ojbHelper.getTxProxiedObject(targetPropMan, new
String[]{PropertyManager.class.getName()});
+ pms = (PropertyManager) ctx.getBean("propertyManager");
// Make sure we are starting with a clean slate
clearChildren(Preferences.userRoot());
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=224699&r1=224698&r2=224699&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
Sun Jul 24 23:47:30 2005
@@ -20,26 +20,21 @@
import java.util.prefs.Preferences;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
-import org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider;
-import org.apache.jetspeed.prefs.impl.PropertyManagerImpl;
import org.apache.jetspeed.prefs.om.Property;
-import org.apache.jetspeed.testhelpers.OJBHelper;
/**
* <p>Unit testing for [EMAIL PROTECTED] PropertyManager}.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">David Le Strat</a>
*/
-public class TestPropertyManager extends TestCase
+public class TestPropertyManager extends DatasourceEnabledSpringTestCase
{
/** The property manager. */
private static PropertyManager pms;
- private OJBHelper ojbHelper;
/**
* <p>Defines property set types.</p>
@@ -203,20 +198,10 @@
*/
public void setUp() throws Exception
{
- Map context = new HashMap();
- ojbHelper = new OJBHelper(context);
- ojbHelper.setUp();
-
- PersistenceBrokerPreferencesProvider targetProvider = new
PersistenceBrokerPreferencesProvider("META-INF/prefs_repository.xml", true);
- targetProvider.init();
- this.provider = (PreferencesProvider)
- ojbHelper.getTxProxiedObject(targetProvider, new
String[]{PreferencesProvider.class.getName()});
-
- PropertyManagerImpl targetPropMan = new PropertyManagerImpl(provider);
-
- pms = (PropertyManager)
- ojbHelper.getTxProxiedObject(targetPropMan, new
String[]{PropertyManager.class.getName()});
+ super.setUp();
+ provider = (PreferencesProvider) ctx.getBean("prefsProvider");
+ pms = (PropertyManager) ctx.getBean("propertyManager");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
