You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2018/07/27 12:40:13 UTC
[2/2] activemq git commit: AMQ-6974 - test cleanup
AMQ-6974 - test cleanup
(cherry picked from commit 525fd29d166c401a9e2d0328015e22682954cf31)
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/da054951
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/da054951
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/da054951
Branch: refs/heads/activemq-5.15.x
Commit: da054951c05ca52247f586d27a1add6a708f99ff
Parents: 2fe8116
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Fri Jul 27 08:36:15 2018 -0400
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Fri Jul 27 08:40:00 2018 -0400
----------------------------------------------------------------------
.../activemq/jms/pool/ConnectionPoolTest.java | 30 ++++++++++++++------
.../DemandForwardingBridgeSupportTest.java | 4 ---
2 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/da054951/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/ConnectionPoolTest.java
----------------------------------------------------------------------
diff --git a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/ConnectionPoolTest.java b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/ConnectionPoolTest.java
index 70d5de2..b60e523 100644
--- a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/ConnectionPoolTest.java
+++ b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/ConnectionPoolTest.java
@@ -1,20 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.activemq.jms.pool;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertFalse;
import javax.jms.Connection;
import javax.jms.JMSException;
-import static org.junit.Assert.assertFalse;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.junit.Before;
+import org.junit.Test;
public class ConnectionPoolTest extends JmsPoolTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(ConnectionPoolTest.class);
-
private class PooledConnectionFactoryTest extends PooledConnectionFactory {
ConnectionPool pool = null;
http://git-wip-us.apache.org/repos/asf/activemq/blob/da054951/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java
index 761865f..dee08ba 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java
@@ -27,13 +27,9 @@ import java.util.Arrays;
public class DemandForwardingBridgeSupportTest extends NetworkTestSupport {
private DemandForwardingBridge bridge;
-
private StubConnection producerConnection;
-
private ProducerInfo producerInfo;
-
private StubConnection consumerConnection;
-
private SessionInfo consumerSessionInfo;