portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r385993 - in /portals/jetspeed-2/trunk/components: cm/src/java/org/apache/jetspeed/components/test/ prefs/src/test/org/apache/jetspeed/prefs/ rdbms/src/java/org/apache/jetspeed/components/util/
Date Wed, 15 Mar 2006 07:49:41 GMT
Author: rwatler
Date: Tue Mar 14 23:49:40 2006
New Revision: 385993

URL: http://svn.apache.org/viewcvs?rev=385993&view=rev
Log:
cleanup improperly terminated database connections in tests

Modified:
    portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.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/TestPreferencesProvider.java
    portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceTestCase.java

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java?rev=385993&r1=385992&r2=385993&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
(original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
Tue Mar 14 23:49:40 2006
@@ -61,6 +61,18 @@
     }
 
     /**
+     * close Spring context as part of test teardown
+     */
+    protected void tearDown() throws Exception
+    {        
+        super.tearDown();
+        if (ctx != null)
+        {
+            ctx.close();
+        }
+    }
+
+    /**
      * required specification of spring configurations
      */
     protected abstract String[] getConfigurations();

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=385993&r1=385992&r2=385993&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
Tue Mar 14 23:49:40 2006
@@ -49,6 +49,7 @@
      */
     public void tearDown() throws Exception
     {
+        super.tearDown();
     }
 
     /**

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=385993&r1=385992&r2=385993&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
Tue Mar 14 23:49:40 2006
@@ -39,6 +39,7 @@
      */
     public void tearDown() throws Exception
     {
+        super.tearDown();
     }
 
     protected void clearChildren(Preferences node) throws Exception

Modified: portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesProvider.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesProvider.java?rev=385993&r1=385992&r2=385993&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesProvider.java
(original)
+++ portals/jetspeed-2/trunk/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferencesProvider.java
Tue Mar 14 23:49:40 2006
@@ -53,6 +53,7 @@
      */
     public void tearDown() throws Exception
     {
+        super.tearDown();
     }
 
     /**

Modified: portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceTestCase.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceTestCase.java?rev=385993&r1=385992&r2=385993&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceTestCase.java
(original)
+++ portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceTestCase.java
Tue Mar 14 23:49:40 2006
@@ -73,8 +73,9 @@
      */
     protected void tearDown() throws Exception
     {
+        datasourceComponent.stop();
         jndi.unbindFromCurrentThread();
         super.tearDown();
     }
 
-}
\ No newline at end of file
+}



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


Mime
View raw message