[jboss-cvs] JBossAS SVN: r110697 - in projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager: notx and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 17 09:23:22 EST 2011
Author: maeste
Date: 2011-02-17 09:23:21 -0500 (Thu, 17 Feb 2011)
New Revision: 110697
Modified:
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListenerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListenerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java
Log:
fixup
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListenerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListenerTestCase.java 2011-02-17 14:22:36 UTC (rev 110696)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListenerTestCase.java 2011-02-17 14:23:21 UTC (rev 110697)
@@ -225,7 +225,7 @@
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
ConnectionManager connectionManager = cmf.createNonTransactional(TransactionSupportLevel.NoTransaction, pool,
- null, null);
+ null, null, null);
noTxCm = ((NoTxConnectionManagerImpl) connectionManager);
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListenerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListenerTestCase.java 2011-02-17 14:22:36 UTC (rev 110696)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListenerTestCase.java 2011-02-17 14:23:21 UTC (rev 110697)
@@ -676,7 +676,7 @@
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
ConnectionManager connectionManager = cmf.createTransactional(TransactionSupportLevel.LocalTransaction, pool,
- null, null, tm, null, null, null, null, null);
+ null, null, null, tm, null, null, null, null, null);
txConnectionManager = (TxConnectionManager) connectionManager;
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerTestCase.java 2011-02-17 14:22:36 UTC (rev 110696)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerTestCase.java 2011-02-17 14:23:21 UTC (rev 110697)
@@ -77,7 +77,7 @@
Pool pool = pf.create(PoolStrategy.ONE_POOL, mcf, pc, true);
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
- connectionManager = cmf.createNonTransactional(TransactionSupportLevel.NoTransaction, pool, null, null);
+ connectionManager = cmf.createNonTransactional(TransactionSupportLevel.NoTransaction, pool, null, null, null);
assertNotNull(connectionManager);
assertTrue(connectionManager instanceof NoTxConnectionManager);
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java 2011-02-17 14:22:36 UTC (rev 110696)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java 2011-02-17 14:23:21 UTC (rev 110697)
@@ -45,7 +45,7 @@
/**
* Serializable test of the transaction connection manager
- * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
public class SerializableTestCase
{
@@ -57,39 +57,38 @@
public void testSerializable() throws Throwable
{
ManagedConnectionFactory mcf = new MockManagedConnectionFactory();
- PoolConfiguration pc = new PoolConfiguration();
- PoolFactory pf = new PoolFactory();
-
+ PoolConfiguration pc = new PoolConfiguration();
+ PoolFactory pf = new PoolFactory();
+
Pool pool = pf.create(PoolStrategy.ONE_POOL, mcf, pc, true);
-
+
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
ConnectionManager connectionManager = cmf.createNonTransactional(TransactionSupportLevel.NoTransaction,
- pool,
- null, null);
+ pool, null, null, null);
assertNotNull(connectionManager);
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(connectionManager);
}
-
+
/**
* Lifecycle start, before the suite is executed
- * @throws Throwable throwable exception
+ * @throws Throwable throwable exception
*/
@BeforeClass
public static void beforeClass() throws Throwable
{
}
-
+
/**
* Lifecycle stop, after the suite is executed
- * @throws Throwable throwable exception
+ * @throws Throwable throwable exception
*/
@AfterClass
public static void afterClass() throws Throwable
{
- }
+ }
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java 2011-02-17 14:22:36 UTC (rev 110696)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java 2011-02-17 14:23:21 UTC (rev 110697)
@@ -44,18 +44,17 @@
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.*;
-
/**
* Serializable test of the transaction connection manager
- * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
public class SerializableTestCase
{
/**Embedded JCA*/
private static Embedded embedded = null;
-
+
/**
* testSerializable.
* @throws Throwable for exception
@@ -65,30 +64,29 @@
{
TransactionManager tm = embedded.lookup("RealTransactionManager", TransactionManager.class);
assertNotNull(tm);
-
+
ManagedConnectionFactory mcf = new MockManagedConnectionFactory();
- PoolConfiguration pc = new PoolConfiguration();
- PoolFactory pf = new PoolFactory();
-
+ PoolConfiguration pc = new PoolConfiguration();
+ PoolFactory pf = new PoolFactory();
+
Pool pool = pf.create(PoolStrategy.ONE_POOL, mcf, pc, true);
-
+
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
ConnectionManager connectionManager = cmf.createTransactional(TransactionSupportLevel.XATransaction,
pool,
- null, null,
- tm,
- Boolean.FALSE, null, null, null, null);
+ null, null, null, tm, Boolean.FALSE, null, null,
+ null, null);
assertNotNull(connectionManager);
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(connectionManager);
}
-
+
/**
* Lifecycle start, before the suite is executed
- * @throws Throwable throwable exception
+ * @throws Throwable throwable exception
*/
@BeforeClass
public static void beforeClass() throws Throwable
@@ -106,10 +104,10 @@
embedded.deploy(naming);
embedded.deploy(transaction);
}
-
+
/**
* Lifecycle stop, after the suite is executed
- * @throws Throwable throwable exception
+ * @throws Throwable throwable exception
*/
@AfterClass
public static void afterClass() throws Throwable
@@ -126,6 +124,6 @@
// Set embedded to null
embedded = null;
- }
-
+ }
+
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2011-02-17 14:22:36 UTC (rev 110696)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2011-02-17 14:23:21 UTC (rev 110697)
@@ -319,7 +319,7 @@
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
ConnectionManager connectionManager = cmf.createTransactional(TransactionSupportLevel.LocalTransaction, pool,
- null, null, tm, null, null, null, null, null);
+ null, null, null, tm, null, null, null, null, null);
txConnectionManager = (TxConnectionManager) connectionManager;
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2011-02-17 14:22:36 UTC (rev 110696)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2011-02-17 14:23:21 UTC (rev 110697)
@@ -287,7 +287,7 @@
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
ConnectionManager connectionManager = cmf.createTransactional(TransactionSupportLevel.XATransaction, pool,
- null, null, tm, Boolean.FALSE, null, null, null, null);
+ null, null, null, tm, Boolean.FALSE, null, null, null, null);
assertNotNull(connectionManager);
assertTrue(connectionManager instanceof TxConnectionManager);
More information about the jboss-cvs-commits
mailing list