[jboss-cvs] JBossAS SVN: r89470 - in branches/Branch_5_x: testsuite/src/main/org/jboss/test/jca/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-05-27 11:27:22 -0400 (Wed, 27 May 2009)
New Revision: 89470

Added:
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/jca/test/TestConnectionUnitTestCase.java
Modified:
   branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
   branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPoolMBean.java
Log:
[JBAS-6942] Expose a testConnection operation via JMX

Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java	2009-05-27 15:23:15 UTC (rev 89469)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java	2009-05-27 15:27:22 UTC (rev 89470)
@@ -337,6 +337,43 @@
       }
    }
 
+   /**
+    * Test if a connection can be obtained using default values
+    * @return True if a connection was obtained; otherwise false
+    */
+   @ManagementOperation(description="Test if a connection can be obtained",
+         impact=Impact.WriteOnly)
+   public boolean testConnection()
+   {
+      boolean result = false;
+      ConnectionListener cl = null;
+      try
+      {
+         if (getAvailableConnectionCount() > 0)
+         {
+            cl = poolingStrategy.getConnection(null, null, null);
+            result = true;
+         }
+      }
+      catch (ResourceException re)
+      {
+      }
+      finally
+      {
+         if (cl != null)
+         {
+            try
+            {
+               poolingStrategy.returnConnection(cl, false);
+            }
+            catch (ResourceException ire)
+            {
+            }
+         }
+      }
+      return result;
+   }
+
    @ManagementProperty(use={ViewUse.STATISTIC})
    public int getConnectionCount()
    {

Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPoolMBean.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPoolMBean.java	2009-05-27 15:23:15 UTC (rev 89469)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPoolMBean.java	2009-05-27 15:27:22 UTC (rev 89470)
@@ -161,6 +161,12 @@
     */
   void flush() ;
 
+  /**
+   * Test if a connection can be obtained using default values
+   * @return True if a connection was obtained; otherwise false
+   */
+  boolean testConnection();
+
    /**
     * Retrieve the connection count.
     * @return the connection count

Added: branches/Branch_5_x/testsuite/src/main/org/jboss/test/jca/test/TestConnectionUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/jca/test/TestConnectionUnitTestCase.java	                        (rev 0)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/jca/test/TestConnectionUnitTestCase.java	2009-05-27 15:27:22 UTC (rev 89470)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jca.test;
+
+import java.util.ArrayList;
+
+import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Unit test for the TestConnection method
+ *
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public class TestConnectionUnitTestCase extends JBossTestCase
+{
+   private Logger log = Logger.getLogger(getClass());
+
+   /**
+    * Creates a new <code>TestConnectionUnitTestCase</code> instance.
+    * @param name test name
+    */
+   public TestConnectionUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testSuccessfulCall() throws Exception
+   {
+      try
+      {
+         ObjectName on = new ObjectName("jboss.jca:name=DefaultDS,service=ManagedConnectionPool");
+
+         Object result = getServer().invoke(on, "testConnection", null, null);
+
+         assertNotNull(result);
+         assertTrue(result instanceof Boolean);
+
+         Boolean b = (Boolean)result;
+
+         assertTrue(b.booleanValue());
+      }
+      finally
+      {
+      }
+   }
+}