You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/07/21 20:36:19 UTC
[02/16] tomee git commit: Revert "Fixing tests missed in last commit"
Revert "Fixing tests missed in last commit"
This reverts commit 958f2d465a99285a9fa49749bdadfac8b908db26.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/81c5fbad
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/81c5fbad
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/81c5fbad
Branch: refs/heads/tomee-1.7.x
Commit: 81c5fbad133fae854569fc6f2a12efbe93d8e7cc
Parents: 52da122
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Tue Jul 21 13:37:08 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Tue Jul 21 13:37:08 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, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/81c5fbad/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 79e0266..e9eba6c 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,7 +22,6 @@ 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;
@@ -39,7 +38,6 @@ 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;
@@ -199,7 +197,7 @@ public class BoneCPPooledDataSourceFromPoolTest {
@After
public void checkTxMapIsEmpty() throws Exception { // avoid memory leak
- final Field map = ManagedConnectionsByTransactionByDatasource.class.getDeclaredField("CONNECTION_BY_TX_BY_DS");
+ final Field map = ManagedConnection.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/81c5fbad/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 ce2af43..a2e705c 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,7 +22,6 @@ 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,7 +36,6 @@ 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;
@@ -200,7 +198,7 @@ public class BoneCPPooledDataSourceTest {
@After
public void checkTxMapIsEmpty() throws Exception { // avoid memory leak
- final Field map = ManagedConnectionsByTransactionByDatasource.class.getDeclaredField("CONNECTION_BY_TX_BY_DS");
+ final Field map = ManagedConnection.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/81c5fbad/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 3bbf3c1..856c8e3 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,7 +22,6 @@ 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;
@@ -38,7 +37,6 @@ 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 +196,7 @@ public class TomcatDataSourceFromPoolTest {
@After
public void checkTxMapIsEmpty() throws Exception { // avoid memory leak
- final Field map = ManagedConnectionsByTransactionByDatasource.class.getDeclaredField("CONNECTION_BY_TX_BY_DS");
+ final Field map = ManagedConnection.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/81c5fbad/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 ba19735..7c8e959 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,7 +22,6 @@ 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,7 +36,6 @@ 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;
@@ -200,7 +198,7 @@ public class TomcatPoolTest {
@After
public void checkTxMapIsEmpty() throws Exception { // avoid memory leak
- final Field map = ManagedConnectionsByTransactionByDatasource.class.getDeclaredField("CONNECTION_BY_TX_BY_DS");
+ final Field map = ManagedConnection.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());