Repository: tomee Updated Branches: refs/heads/tomee-1.7.x bfa00331e -> 958f2d465
Fixing tests missed in last commit Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/958f2d46 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/958f2d46 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/958f2d46 Branch: refs/heads/tomee-1.7.x Commit: 958f2d465a99285a9fa49749bdadfac8b908db26 Parents: bfa0033 Author: Jonathan Gallimore <[email protected]> Authored: Tue Jul 14 09:58:20 2015 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Tue Jul 14 09:58:20 2015 +0100 ---------------------------------------------------------------------- .../openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java | 4 +++- .../org/apache/openejb/bonecp/BoneCPPooledDataSourceTest.java | 4 +++- .../java/org/apache/tomee/jdbc/TomcatDataSourceFromPoolTest.java | 4 +++- .../src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/958f2d46/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java b/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java index e9eba6c..79e0266 100644 --- a/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java +++ b/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java @@ -22,6 +22,7 @@ import org.apache.openejb.junit.ApplicationComposer; import org.apache.openejb.junit.Configuration; import org.apache.openejb.junit.Module; import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection; +import org.apache.openejb.resource.jdbc.managed.local.ManagedConnectionsByTransactionByDatasource; import org.hsqldb.jdbc.JDBCDataSource; import org.junit.After; import org.junit.BeforeClass; @@ -38,6 +39,7 @@ import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; import javax.sql.DataSource; import javax.transaction.Transaction; + import java.lang.reflect.Field; import java.sql.Connection; import java.sql.DriverManager; @@ -197,7 +199,7 @@ public class BoneCPPooledDataSourceFromPoolTest { @After public void checkTxMapIsEmpty() throws Exception { // avoid memory leak - final Field map = ManagedConnection.class.getDeclaredField("CONNECTION_BY_TX_BY_DS"); + final Field map = ManagedConnectionsByTransactionByDatasource.class.getDeclaredField("CONNECTION_BY_TX_BY_DS"); map.setAccessible(true); final Map<DataSource, Map<Transaction, Connection>> instance = (Map<DataSource, Map<Transaction, Connection>>) map.get(null); assertEquals(1, instance.size()); http://git-wip-us.apache.org/repos/asf/tomee/blob/958f2d46/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceTest.java b/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceTest.java index a2e705c..ce2af43 100644 --- a/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceTest.java +++ b/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceTest.java @@ -22,6 +22,7 @@ import org.apache.openejb.junit.ApplicationComposer; import org.apache.openejb.junit.Configuration; import org.apache.openejb.junit.Module; import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection; +import org.apache.openejb.resource.jdbc.managed.local.ManagedConnectionsByTransactionByDatasource; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -36,6 +37,7 @@ import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; import javax.sql.DataSource; import javax.transaction.Transaction; + import java.lang.reflect.Field; import java.sql.Connection; import java.sql.DriverManager; @@ -198,7 +200,7 @@ public class BoneCPPooledDataSourceTest { @After public void checkTxMapIsEmpty() throws Exception { // avoid memory leak - final Field map = ManagedConnection.class.getDeclaredField("CONNECTION_BY_TX_BY_DS"); + final Field map = ManagedConnectionsByTransactionByDatasource.class.getDeclaredField("CONNECTION_BY_TX_BY_DS"); map.setAccessible(true); final Map<DataSource, Map<Transaction, Connection>> instance = (Map<DataSource, Map<Transaction, Connection>>) map.get(null); assertEquals(1, instance.size()); http://git-wip-us.apache.org/repos/asf/tomee/blob/958f2d46/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatDataSourceFromPoolTest.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatDataSourceFromPoolTest.java b/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatDataSourceFromPoolTest.java index 856c8e3..3bbf3c1 100644 --- a/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatDataSourceFromPoolTest.java +++ b/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatDataSourceFromPoolTest.java @@ -22,6 +22,7 @@ import org.apache.openejb.junit.ApplicationComposer; import org.apache.openejb.junit.Configuration; import org.apache.openejb.junit.Module; import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection; +import org.apache.openejb.resource.jdbc.managed.local.ManagedConnectionsByTransactionByDatasource; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -37,6 +38,7 @@ import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; import javax.sql.DataSource; import javax.transaction.Transaction; + import java.lang.reflect.Field; import java.sql.Connection; import java.sql.DriverManager; @@ -196,7 +198,7 @@ public class TomcatDataSourceFromPoolTest { @After public void checkTxMapIsEmpty() throws Exception { // avoid memory leak - final Field map = ManagedConnection.class.getDeclaredField("CONNECTION_BY_TX_BY_DS"); + final Field map = ManagedConnectionsByTransactionByDatasource.class.getDeclaredField("CONNECTION_BY_TX_BY_DS"); map.setAccessible(true); final Map<DataSource, Map<Transaction, Connection>> instance = (Map<DataSource, Map<Transaction, Connection>> ) map.get(null); assertEquals(1, instance.size()); http://git-wip-us.apache.org/repos/asf/tomee/blob/958f2d46/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java b/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java index 7c8e959..ba19735 100644 --- a/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java +++ b/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java @@ -22,6 +22,7 @@ import org.apache.openejb.junit.ApplicationComposer; import org.apache.openejb.junit.Configuration; import org.apache.openejb.junit.Module; import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection; +import org.apache.openejb.resource.jdbc.managed.local.ManagedConnectionsByTransactionByDatasource; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -36,6 +37,7 @@ import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; import javax.sql.DataSource; import javax.transaction.Transaction; + import java.lang.reflect.Field; import java.sql.Connection; import java.sql.DriverManager; @@ -198,7 +200,7 @@ public class TomcatPoolTest { @After public void checkTxMapIsEmpty() throws Exception { // avoid memory leak - final Field map = ManagedConnection.class.getDeclaredField("CONNECTION_BY_TX_BY_DS"); + final Field map = ManagedConnectionsByTransactionByDatasource.class.getDeclaredField("CONNECTION_BY_TX_BY_DS"); map.setAccessible(true); final Map<DataSource, Map<Transaction, Connection>> instance = (Map<DataSource, Map<Transaction, Connection>> ) map.get(null); assertEquals(1, instance.size());
