Return-Path: Delivered-To: apmail-jakarta-jetspeed-dev-archive@www.apache.org Received: (qmail 74356 invoked from network); 27 May 2004 19:32:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 27 May 2004 19:32:33 -0000 Received: (qmail 10999 invoked by uid 500); 27 May 2004 19:33:00 -0000 Delivered-To: apmail-jakarta-jetspeed-dev-archive@jakarta.apache.org Received: (qmail 10956 invoked by uid 500); 27 May 2004 19:32:59 -0000 Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jetspeed Developers List" Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@jakarta.apache.org Received: (qmail 10914 invoked by uid 500); 27 May 2004 19:32:59 -0000 Received: (qmail 10891 invoked by uid 500); 27 May 2004 19:32:57 -0000 Received: (qmail 10872 invoked by uid 98); 27 May 2004 19:32:57 -0000 Received: from weaver@apache.org by hermes.apache.org by uid 82 with qmail-scanner-1.20 (clamuko: 0.70. Clear:RC:0(209.237.227.194):. Processed in 0.062635 secs); 27 May 2004 19:32:57 -0000 X-Qmail-Scanner-Mail-From: weaver@apache.org via hermes.apache.org X-Qmail-Scanner: 1.20 (Clear:RC:0(209.237.227.194):. Processed in 0.062635 secs) Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by hermes.apache.org with SMTP; 27 May 2004 19:32:57 -0000 Received: (qmail 74290 invoked by uid 1642); 27 May 2004 19:32:26 -0000 Date: 27 May 2004 19:32:26 -0000 Message-ID: <20040527193226.74289.qmail@minotaur.apache.org> From: weaver@apache.org To: jakarta-jetspeed-2-cvs@apache.org Subject: cvs commit: jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs TestPropertyManager.java TestPreferences.java X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N weaver 2004/05/27 12:32:26 Modified: components/prefs/src/test/org/apache/jetspeed/prefs TestPropertyManager.java TestPreferences.java Log: see JS2-40: & JS2-59 Revision Changes Path 1.15 +15 -32 jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java Index: TestPropertyManager.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- TestPropertyManager.java 16 May 2004 20:03:29 -0000 1.14 +++ TestPropertyManager.java 27 May 2004 19:32:26 -0000 1.15 @@ -20,29 +20,22 @@ import java.util.prefs.Preferences; import junit.framework.Test; +import junit.framework.TestSuite; -import org.apache.jetspeed.components.AbstractComponentAwareTestCase; -import org.apache.jetspeed.components.ComponentAwareTestSuite; -import org.apache.jetspeed.components.persistence.store.PersistenceStore; +import org.apache.jetspeed.components.persistence.store.util.PersistenceSupportedTestCase; +import org.apache.jetspeed.prefs.impl.PreferencesProviderImpl; import org.apache.jetspeed.prefs.impl.PropertyException; +import org.apache.jetspeed.prefs.impl.PropertyManagerImpl; import org.apache.jetspeed.prefs.om.Property; -import org.picocontainer.MutablePicoContainer; - /** *

Unit testing for {@link PropertyManager}.

* * @author David Le Strat */ -public class TestPropertyManager extends AbstractComponentAwareTestCase +public class TestPropertyManager extends PersistenceSupportedTestCase { - /** The mutable pico container. */ - private MutablePicoContainer container; - - /** The persistence store. */ - private static PersistenceStore store; - /** The property manager. */ private static PropertyManager pms; @@ -52,13 +45,15 @@ private final static int USER_PROPERTY_SET_TYPE = 0; private final static int SYSTEM_PROPERTY_SET_TYPE = 1; + private PreferencesProvider provider; + /** *

Defines the test case name for junit.

* @param testName The test case name. */ public TestPropertyManager(String testName) { - super(testName, "./src/test/Log4j.properties"); + super(testName); } /** @@ -67,8 +62,9 @@ public void setUp() throws Exception { super.setUp(); - container = (MutablePicoContainer) getContainer(); - pms = (PropertyManager) container.getComponentInstance(PropertyManager.class); + pms =new PropertyManagerImpl(persistenceStore); + provider = new PreferencesProviderImpl(persistenceStore, "org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl"); + // Class.forName("org.apache.jetspeed.prefs.impl.PreferencesImpl"); } /** @@ -76,30 +72,17 @@ */ public void tearDown() throws Exception { - super.tearDown(); clean(); + // super.tearDown(); } - /** - *

Creates the test suite.

- * @return A test suite (TestSuite) that includes all methods - * starting with "test" - */ public static Test suite() { - ComponentAwareTestSuite suite = new ComponentAwareTestSuite(TestPropertyManager.class); - suite.setScript("org/apache/jetspeed/prefs/containers/test.prefs.groovy"); - return suite; - } - - /** - *

Test the container.

- */ - public void testContainer() - { - assertNotNull(container); + // All methods starting with "test" will be executed in the test suite. + return new TestSuite(TestPropertyManager.class); } + /** *

Test add property keys to a {@link Preferences} node.

*/ 1.14 +15 -34 jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java Index: TestPreferences.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- TestPreferences.java 16 May 2004 20:04:09 -0000 1.13 +++ TestPreferences.java 27 May 2004 19:32:26 -0000 1.14 @@ -20,28 +20,21 @@ import java.util.prefs.Preferences; import junit.framework.Test; +import junit.framework.TestSuite; -import org.apache.jetspeed.components.AbstractComponentAwareTestCase; -import org.apache.jetspeed.components.ComponentAwareTestSuite; -import org.apache.jetspeed.components.persistence.store.PersistenceStore; +import org.apache.jetspeed.components.persistence.store.util.PersistenceSupportedTestCase; +import org.apache.jetspeed.prefs.impl.PreferencesProviderImpl; import org.apache.jetspeed.prefs.impl.PropertyException; - -import org.picocontainer.MutablePicoContainer; +import org.apache.jetspeed.prefs.impl.PropertyManagerImpl; /** *

Unit testing for {@link Preferences}.

* * @author David Le Strat */ -public class TestPreferences extends AbstractComponentAwareTestCase +public class TestPreferences extends PersistenceSupportedTestCase { - /** The mutable pico container. */ - private MutablePicoContainer container; - - /** The persistence store. */ - private static PersistenceStore store; - /** The property manager. */ private static PropertyManager pms; @@ -51,13 +44,15 @@ private final static int USER_PROPERTY_SET_TYPE = 0; private final static int SYSTEM_PROPERTY_SET_TYPE = 1; + private PreferencesProvider provider; + /** *

Defines the test case name for junit.

* @param testName The test case name. */ public TestPreferences(String testName) { - super(testName, "./src/test/Log4j.properties"); + super(testName); } /** @@ -66,39 +61,25 @@ public void setUp() throws Exception { super.setUp(); - container = (MutablePicoContainer) getContainer(); - pms = (PropertyManager) container.getComponentInstance(PropertyManager.class); + pms = new PropertyManagerImpl(persistenceStore); + provider = new PreferencesProviderImpl(persistenceStore, "org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl"); } /** * @see junit.framework.TestCase#tearDown() */ public void tearDown() throws Exception - { - super.tearDown(); + { clean(); + // super.tearDown(); } - /** - *

Creates the test suite.

- * @return A test suite (TestSuite) that includes all methods - * starting with "test" - */ public static Test suite() { - ComponentAwareTestSuite suite = new ComponentAwareTestSuite(TestPreferences.class); - suite.setScript("org/apache/jetspeed/prefs/containers/test.prefs.groovy"); - return suite; + // All methods starting with "test" will be executed in the test suite. + return new TestSuite(TestPreferences.class); } - - /** - *

Test the container.

- */ - public void testContainer() - { - assertNotNull(container); - } - + /** *

Test user root.

*/ --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org