Author: tfischer
Date: Mon Oct 27 11:51:43 2014
New Revision: 1634509
URL: http://svn.apache.org/r1634509
Log:
do not fail test if datasource disappears from JNDI context - this happens
sometimes for unknown reasons if the test is executed more than once in one
maven build
Modified:
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
Modified:
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java?rev=1634509&r1=1634508&r2=1634509&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
(original)
+++
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
Mon Oct 27 11:51:43 2014
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.naming.Context;
import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import javax.sql.DataSource;
@@ -38,6 +39,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.log4j.Logger;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.dsfactory.AbstractDataSourceFactory;
import org.apache.torque.dsfactory.DataSourceFactory;
@@ -58,6 +60,7 @@ import org.apache.torque.test.peer.BookP
*/
public class JndiConfigurationTest extends TestCase
{
+ private static Logger logger =
Logger.getLogger(JndiConfigurationTest.class);
/**
* The subcontext where the data source is bound.
*/
@@ -69,6 +72,7 @@ public class JndiConfigurationTest exten
protected static final String JNDI_PATH
= JNDI_SUBCONTEXT + "/" + "jndiTestDataSource";
+ @Override
public void setUp()
{
// super.setUp() initializes torque, but here we want to
@@ -326,13 +330,21 @@ public class JndiConfigurationTest exten
/**
* unbinds and closes the BasicDataSource in jndi.
- * @throws Exception if creation or binfding fails.
+ * @throws Exception if creation or binding fails.
*/
protected void unbindDataSource() throws Exception
{
Context context = getInitialContext();
- BasicDataSource dataSource
- = (BasicDataSource) context.lookup(JNDI_PATH);
+ BasicDataSource dataSource;
+ try
+ {
+ dataSource = (BasicDataSource) context.lookup(JNDI_PATH);
+ }
+ catch (NameNotFoundException e)
+ {
+ logger.warn("Name " + JNDI_PATH + " not found, could not unbind
DataSource");
+ return;
+ }
try
{
@@ -395,7 +407,7 @@ public class JndiConfigurationTest exten
* checks whether we can retrieve a connection from a DataSource.
* @throws Exception if no connection can be established.
*/
- protected void dataSourceConnect(DataSource dataSource) throws Exception
+ protected void dataSourceConnect(final DataSource dataSource) throws
Exception
{
Connection connection = null;
try
@@ -473,7 +485,7 @@ public class JndiConfigurationTest exten
* @return the default Data Source.
*/
protected static String getDefaultDatabase(
- Configuration torqueConfiguration)
+ final Configuration torqueConfiguration)
{
String defaultDatabase = torqueConfiguration.getString(
Torque.TORQUE_KEY + "."
@@ -486,7 +498,7 @@ public class JndiConfigurationTest exten
* Prints the contents of the configuration to System.out
* @param configuration the configuration to be debugged.
*/
- public static void debugConfiguration(Configuration configuration)
+ public static void debugConfiguration(final Configuration configuration)
{
for (Iterator dsKeyIt = configuration.getKeys();
dsKeyIt.hasNext(); )
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
