You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/03/19 06:08:35 UTC
[29/67] [abbrv] activemq-artemis git commit: open wire changes
equivalent to ab16f7098fb52d2b4c40627ed110e1776525f208
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/14d4d0c8/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeStreamletTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeStreamletTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeStreamletTest.java
deleted file mode 100644
index 37899e8..0000000
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeStreamletTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * 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;
-
-/**
- * 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.
- */
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.jms.Destination;
-import javax.jms.Session;
-
-import junit.framework.TestCase;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author rnewson
- */
-public final class LargeStreamletTest extends TestCase {
-
- private static final Logger LOG = LoggerFactory.getLogger(LargeStreamletTest.class);
- private static final String BROKER_URL = "vm://localhost?broker.persistent=false";
- private static final int BUFFER_SIZE = 1 * 1024;
- private static final int MESSAGE_COUNT = 10 * 1024;
-
- protected Exception writerException;
- protected Exception readerException;
-
- private final AtomicInteger totalRead = new AtomicInteger();
- private final AtomicInteger totalWritten = new AtomicInteger();
- private final AtomicBoolean stopThreads = new AtomicBoolean(false);
-
- public void testStreamlets() throws Exception {
- final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(BROKER_URL);
-
- final ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection();
- connection.start();
- try {
- final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- try {
- final Destination destination = session.createQueue("wibble");
- final Thread readerThread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- totalRead.set(0);
- try {
- final InputStream inputStream = connection.createInputStream(destination);
- try {
- int read;
- final byte[] buf = new byte[BUFFER_SIZE];
- while (!stopThreads.get() && (read = inputStream.read(buf)) != -1) {
- totalRead.addAndGet(read);
- }
- }
- finally {
- inputStream.close();
- }
- }
- catch (Exception e) {
- readerException = e;
- e.printStackTrace();
- }
- finally {
- LOG.info(totalRead + " total bytes read.");
- }
- }
- });
-
- final Thread writerThread = new Thread(new Runnable() {
- private final Random random = new Random();
-
- @Override
- public void run() {
- totalWritten.set(0);
- int count = MESSAGE_COUNT;
- try {
- final OutputStream outputStream = connection.createOutputStream(destination);
- try {
- final byte[] buf = new byte[BUFFER_SIZE];
- random.nextBytes(buf);
- while (count > 0 && !stopThreads.get()) {
- outputStream.write(buf);
- totalWritten.addAndGet(buf.length);
- count--;
- }
- }
- finally {
- outputStream.close();
- }
- }
- catch (Exception e) {
- writerException = e;
- e.printStackTrace();
- }
- finally {
- LOG.info(totalWritten + " total bytes written.");
- }
- }
- });
-
- readerThread.start();
- writerThread.start();
-
- // Wait till reader is has finished receiving all the messages
- // or he has stopped
- // receiving messages.
- Thread.sleep(1000);
- int lastRead = totalRead.get();
- while (readerThread.isAlive()) {
- readerThread.join(1000);
- // No progress?? then stop waiting..
- if (lastRead == totalRead.get()) {
- break;
- }
- lastRead = totalRead.get();
- }
-
- stopThreads.set(true);
-
- assertTrue("Should not have received a reader exception", readerException == null);
- assertTrue("Should not have received a writer exception", writerException == null);
-
- assertEquals("Not all messages accounted for", totalWritten.get(), totalRead.get());
-
- }
- finally {
- session.close();
- }
- }
- finally {
- connection.close();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/14d4d0c8/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
deleted file mode 100644
index 1e2448a..0000000
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * 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.broker;
-
-import junit.framework.Test;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
-import org.apache.derby.jdbc.EmbeddedDataSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jms.Connection;
-import javax.jms.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * Implements the test case attached to:
- * https://issues.apache.org/jira/browse/AMQ-4351
- *
- * This version avoids the spring deps.
- */
-public class AMQ4351Test extends BrokerTestSupport {
-
- private static final Logger LOG = LoggerFactory.getLogger(AMQ4351Test.class);
-
- public static Test suite() {
- return suite(AMQ4351Test.class);
- }
-
- public static void main(String[] args) {
- junit.textui.TestRunner.run(suite());
- }
-
- @Override
- protected BrokerService createBroker() throws Exception {
- BrokerService broker = new BrokerService();
-
- // Lets clean up often.
- broker.setOfflineDurableSubscriberTaskSchedule(500);
- broker.setOfflineDurableSubscriberTimeout(2000); // lets delete durable subs much faster.
-
- JDBCPersistenceAdapter jdbc = new JDBCPersistenceAdapter();
- EmbeddedDataSource dataSource = new EmbeddedDataSource();
- dataSource.setDatabaseName("derbyDb");
- dataSource.setCreateDatabase("create");
- jdbc.setDataSource(dataSource);
-
- jdbc.deleteAllMessages();
- broker.setPersistenceAdapter(jdbc);
- return broker;
- }
-
- ActiveMQConnectionFactory connectionFactory;
- ActiveMQTopic destination = new ActiveMQTopic("TEST");
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- connectionFactory = new ActiveMQConnectionFactory(broker.getVmConnectorURI());
- }
-
- class ProducingClient implements Runnable {
-
- final AtomicLong size = new AtomicLong();
- final AtomicBoolean done = new AtomicBoolean();
- CountDownLatch doneLatch = new CountDownLatch(1);
-
- Connection connection;
- Session session;
- MessageProducer producer;
-
- ProducingClient() throws JMSException {
- connection = connectionFactory.createConnection();
- connection.start();
- session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- producer = session.createProducer(destination);
- }
-
- private void sendMessage() {
- try {
- producer.send(session.createTextMessage("Test"));
- long i = size.incrementAndGet();
- if ((i % 1000) == 0) {
- LOG.info("produced " + i + ".");
- }
- }
- catch (JMSException e) {
- e.printStackTrace();
- }
- }
-
- public void start() {
- new Thread(this, "ProducingClient").start();
- }
-
- public void stop() throws InterruptedException {
- done.set(true);
- if (!doneLatch.await(20, TimeUnit.MILLISECONDS)) {
- try {
- connection.close();
- doneLatch.await();
- }
- catch (JMSException e) {
- }
- }
- }
-
- @Override
- public void run() {
- try {
- try {
- while (!done.get()) {
- sendMessage();
- Thread.sleep(10);
- }
- }
- finally {
- connection.close();
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- done.set(true);
- }
- finally {
- doneLatch.countDown();
- }
- }
- }
-
- class ConsumingClient implements Runnable {
-
- final String name;
- final AtomicLong size = new AtomicLong();
- final AtomicBoolean done = new AtomicBoolean();
- CountDownLatch doneLatch = new CountDownLatch(1);
- CountDownLatch started;
- CountDownLatch finished;
-
- public ConsumingClient(String name, CountDownLatch started, CountDownLatch finished) {
- this.name = name;
- this.started = started;
- this.finished = finished;
- }
-
- public void start() {
- LOG.info("Starting JMS listener " + name);
- new Thread(this, "ConsumingClient: " + name).start();
- }
-
- public void stopAsync() {
- finished.countDown();
- done.set(true);
- }
-
- public void stop() throws InterruptedException {
- stopAsync();
- doneLatch.await();
- }
-
- @Override
- public void run() {
- try {
- Connection connection = connectionFactory.createConnection();
- connection.setClientID(name);
- connection.start();
- try {
- Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
- MessageConsumer consumer = session.createDurableSubscriber(destination, name, null, false);
- started.countDown();
- while (!done.get()) {
- Message msg = consumer.receive(100);
- if (msg != null) {
- size.incrementAndGet();
- session.commit();
- }
- }
- }
- finally {
- connection.close();
- LOG.info("Stopped JMS listener " + name);
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- done.set(true);
- }
- finally {
- doneLatch.countDown();
- }
- }
-
- }
-
- public void testAMQ4351() throws InterruptedException, JMSException {
- LOG.info("Start test.");
- int subs = 100;
- CountDownLatch startedLatch = new CountDownLatch(subs - 1);
- CountDownLatch shutdownLatch = new CountDownLatch(subs - 4);
-
- ProducingClient producer = new ProducingClient();
- ConsumingClient listener1 = new ConsumingClient("subscriber-1", startedLatch, shutdownLatch);
- ConsumingClient listener2 = new ConsumingClient("subscriber-2", startedLatch, shutdownLatch);
- ConsumingClient listener3 = new ConsumingClient("subscriber-3", startedLatch, shutdownLatch);
- try {
-
- listener1.start();
- listener2.start();
- listener3.start();
-
- List<ConsumingClient> subscribers = new ArrayList<>(subs);
- for (int i = 4; i < subs; i++) {
- ConsumingClient client = new ConsumingClient("subscriber-" + i, startedLatch, shutdownLatch);
- subscribers.add(client);
- client.start();
- }
- startedLatch.await(10, TimeUnit.SECONDS);
-
- LOG.info("All subscribers started.");
- producer.sendMessage();
-
- LOG.info("Stopping 97 subscribers....");
- for (ConsumingClient client : subscribers) {
- client.stopAsync();
- }
- shutdownLatch.await(10, TimeUnit.SECONDS);
-
- // Start producing messages for 10 minutes, at high rate
- LOG.info("Starting mass message producer...");
- producer.start();
-
- long lastSize = listener1.size.get();
- for (int i = 0; i < 10; i++) {
- Thread.sleep(1000);
- long size = listener1.size.get();
- LOG.info("Listener 1: consumed: " + (size - lastSize));
- assertTrue(size > lastSize);
- lastSize = size;
- }
- }
- finally {
- LOG.info("Stopping clients");
- listener1.stop();
- listener2.stop();
- listener3.stop();
- producer.stop();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/14d4d0c8/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
deleted file mode 100644
index 6d0a70e..0000000
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
- * 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.broker.jmx;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.util.NoSuchElementException;
-import java.util.concurrent.CountDownLatch;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.kahadb.KahaDBStore;
-import org.apache.activemq.util.Wait;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Used to verify that the BrokerView accessed while the BrokerSerivce is waiting
- * for a Slow Store startup to complete doesn't throw unexpected NullPointerExceptions.
- */
-public class BrokerViewSlowStoreStartupTest {
-
- private static final Logger LOG = LoggerFactory.getLogger(BrokerViewSlowStoreStartupTest.class);
-
- private final CountDownLatch holdStoreStart = new CountDownLatch(1);
- private final String brokerName = "brokerViewTest";
-
- private BrokerService broker;
- private Thread startThread;
-
- private BrokerService createBroker() throws Exception {
- BrokerService broker = new BrokerService();
- broker.setBrokerName(brokerName);
-
- KahaDBStore kaha = new KahaDBStore() {
-
- @Override
- public void start() throws Exception {
- LOG.info("Test KahaDB class is waiting for signal to complete its start()");
- holdStoreStart.await();
- super.start();
- LOG.info("Test KahaDB class is completed its start()");
- }
- };
-
- kaha.setDirectory(new File("target/activemq-data/kahadb"));
- kaha.deleteAllMessages();
-
- broker.setPersistenceAdapter(kaha);
- broker.setUseJmx(true);
-
- return broker;
- }
-
- @Before
- public void setUp() throws Exception {
- broker = createBroker();
-
- startThread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- try {
- broker.start();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
- startThread.start();
- }
-
- @After
- public void tearDown() throws Exception {
-
- // ensure we don't keep the broker held if an exception occurs somewhere.
- holdStoreStart.countDown();
-
- startThread.join();
-
- if (broker != null) {
- broker.stop();
- broker.waitUntilStopped();
- }
- }
-
- @Test(timeout = 120000)
- public void testBrokerViewOnSlowStoreStart() throws Exception {
-
- // Ensure we have an Admin View.
- assertTrue(Wait.waitFor(new Wait.Condition() {
- @Override
- public boolean isSatisified() throws Exception {
- return (broker.getAdminView()) != null;
- }
- }));
-
- final BrokerView view = broker.getAdminView();
-
- try {
- view.getBrokerName();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getBrokerId();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTotalEnqueueCount();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTotalDequeueCount();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTotalConsumerCount();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTotalProducerCount();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTotalMessageCount();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTotalMessagesCached();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.resetStatistics();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.enableStatistics();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.disableStatistics();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.isStatisticsEnabled();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTopics();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getQueues();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTemporaryTopics();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTemporaryQueues();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTopicSubscribers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getDurableTopicSubscribers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getQueueSubscribers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTemporaryTopicSubscribers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTemporaryQueueSubscribers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getInactiveDurableTopicSubscribers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTopicProducers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getQueueProducers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTemporaryTopicProducers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getTemporaryQueueProducers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.getDynamicDestinationProducers();
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.removeConnector("tcp");
- fail("Should have thrown a NoSuchElementException");
- }
- catch (NoSuchElementException e) {
- }
-
- try {
- view.removeNetworkConnector("tcp");
- fail("Should have thrown a NoSuchElementException");
- }
- catch (NoSuchElementException e) {
- }
-
- try {
- view.addTopic("TEST");
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.addQueue("TEST");
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.removeTopic("TEST");
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.removeQueue("TEST");
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.createDurableSubscriber("1", "2", "3", "4");
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- try {
- view.destroyDurableSubscriber("1", "2");
- fail("Should have thrown an IllegalStateException");
- }
- catch (IllegalStateException e) {
- }
-
- holdStoreStart.countDown();
- startThread.join();
-
- Wait.waitFor(new Wait.Condition() {
- @Override
- public boolean isSatisified() throws Exception {
- return view.getBroker() != null;
- }
- });
- assertNotNull(view.getBroker());
-
- try {
- view.getBrokerName();
- }
- catch (Exception e) {
- fail("caught an exception getting the Broker property: " + e.getClass().getName());
- }
-
- try {
- view.getBrokerId();
- }
- catch (IllegalStateException e) {
- fail("caught an exception getting the Broker property: " + e.getClass().getName());
- }
-
- try {
- view.getTotalEnqueueCount();
- }
- catch (IllegalStateException e) {
- fail("caught an exception getting the Broker property: " + e.getClass().getName());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/14d4d0c8/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/HealthViewMBeanTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/HealthViewMBeanTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/HealthViewMBeanTest.java
deleted file mode 100644
index 6406b85..0000000
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/HealthViewMBeanTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * 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.broker.jmx;
-
-import java.util.List;
-
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.activemq.broker.BrokerService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class HealthViewMBeanTest extends EmbeddedBrokerTestSupport {
-
- private static final Logger LOG = LoggerFactory.getLogger(MBeanTest.class);
- protected MBeanServer mbeanServer;
- protected String domain = "org.apache.activemq";
-
- @Override
- protected void setUp() throws Exception {
- bindAddress = "tcp://localhost:0";
- useTopic = false;
- super.setUp();
- mbeanServer = broker.getManagementContext().getMBeanServer();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- @Override
- protected ConnectionFactory createConnectionFactory() throws Exception {
- return new ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString());
- }
-
- @Override
- protected BrokerService createBroker() throws Exception {
- BrokerService answer = new BrokerService();
- answer.setPersistent(true);
- answer.setDeleteAllMessagesOnStartup(true);
- answer.getSystemUsage().getMemoryUsage().setLimit(1024 * 1024 * 64);
- answer.getSystemUsage().getTempUsage().setLimit(1024 * 1024 * 64);
- answer.getSystemUsage().getStoreUsage().setLimit(1024 * 1024 * 64);
- answer.setUseJmx(true);
- answer.setSchedulerSupport(true);
-
- // allow options to be visible via jmx
-
- answer.addConnector(bindAddress);
- return answer;
- }
-
- public void testHealthView() throws Exception {
- Connection connection = connectionFactory.createConnection();
-
- connection.start();
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- destination = createDestination();
- MessageProducer producer = session.createProducer(destination);
- producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
- for (int i = 0; i < 60; i++) {
- BytesMessage message = session.createBytesMessage();
- message.writeBytes(new byte[1024 * 1024]);
- producer.send(message);
- }
-
- Thread.sleep(1000);
-
- String objectNameStr = broker.getBrokerObjectName().toString();
- objectNameStr += ",service=Health";
- ObjectName brokerName = assertRegisteredObjectName(objectNameStr);
- HealthViewMBean health = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, brokerName, HealthViewMBean.class, true);
- List<HealthStatus> list = health.healthList();
-
- for (HealthStatus status : list) {
- LOG.info("Health status: {}", status);
- }
-
- assertEquals(2, list.size());
- }
-
- protected ObjectName assertRegisteredObjectName(String name) throws MalformedObjectNameException, NullPointerException {
- ObjectName objectName = new ObjectName(name);
- if (mbeanServer.isRegistered(objectName)) {
- LOG.info("Bean Registered: " + objectName);
- }
- else {
- fail("Could not find MBean!: " + objectName);
- }
- return objectName;
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/14d4d0c8/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/Log4JConfigTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/Log4JConfigTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/Log4JConfigTest.java
deleted file mode 100644
index 82f1c4e..0000000
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/Log4JConfigTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * 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.broker.jmx;
-
-import java.util.List;
-
-import javax.jms.ConnectionFactory;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Test;
-import org.slf4j.LoggerFactory;
-
-public class Log4JConfigTest extends EmbeddedBrokerTestSupport {
-
- private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(Log4JConfigTest.class);
-
- private static final String BROKER_LOGGER = "org.apache.activemq.broker.BrokerService";
-
- protected MBeanServer mbeanServer;
- protected String domain = "org.apache.activemq";
-
- @Override
- protected void setUp() throws Exception {
- bindAddress = "tcp://localhost:0";
- useTopic = false;
- super.setUp();
- mbeanServer = broker.getManagementContext().getMBeanServer();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- @Override
- protected ConnectionFactory createConnectionFactory() throws Exception {
- return new ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString());
- }
-
- @Override
- protected BrokerService createBroker() throws Exception {
- BrokerService answer = new BrokerService();
- answer.setPersistent(true);
- answer.setDeleteAllMessagesOnStartup(true);
- answer.setUseJmx(true);
- answer.setSchedulerSupport(true);
- answer.addConnector(bindAddress);
- return answer;
- }
-
- @Test
- public void testLog4JConfigViewExists() throws Exception {
- String brokerObjectName = broker.getBrokerObjectName().toString();
- String log4jConfigViewName = BrokerMBeanSupport.createLog4JConfigViewName(brokerObjectName).toString();
- assertRegisteredObjectName(log4jConfigViewName);
- }
-
- @Test
- public void testLog4JConfigViewGetLoggers() throws Throwable {
- String brokerObjectName = broker.getBrokerObjectName().toString();
- ObjectName log4jConfigViewName = BrokerMBeanSupport.createLog4JConfigViewName(brokerObjectName);
- Log4JConfigViewMBean log4jConfigView = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, log4jConfigViewName, Log4JConfigViewMBean.class, true);
-
- List<String> loggers = log4jConfigView.getLoggers();
- assertNotNull(loggers);
- assertFalse(loggers.isEmpty());
- }
-
- @Test
- public void testLog4JConfigViewGetLevel() throws Throwable {
- String brokerObjectName = broker.getBrokerObjectName().toString();
- ObjectName log4jConfigViewName = BrokerMBeanSupport.createLog4JConfigViewName(brokerObjectName);
- Log4JConfigViewMBean log4jConfigView = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, log4jConfigViewName, Log4JConfigViewMBean.class, true);
-
- String level = log4jConfigView.getLogLevel(BROKER_LOGGER);
- assertNotNull(level);
- assertFalse(level.isEmpty());
- }
-
- @Test
- public void testLog4JConfigViewGetLevelUnknownLoggerName() throws Throwable {
- String brokerObjectName = broker.getBrokerObjectName().toString();
- ObjectName log4jConfigViewName = BrokerMBeanSupport.createLog4JConfigViewName(brokerObjectName);
- Log4JConfigViewMBean log4jConfigView = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, log4jConfigViewName, Log4JConfigViewMBean.class, true);
-
- // Non-existent loggers will return a name equal to the root level.
- String level = log4jConfigView.getLogLevel("not.a.logger");
- assertNotNull(level);
- assertFalse(level.isEmpty());
- assertEquals(Logger.getRootLogger().getLevel().toString(), level);
- }
-
- @Test
- public void testLog4JConfigViewSetLevel() throws Throwable {
- String brokerObjectName = broker.getBrokerObjectName().toString();
- ObjectName log4jConfigViewName = BrokerMBeanSupport.createLog4JConfigViewName(brokerObjectName);
- Log4JConfigViewMBean log4jConfigView = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, log4jConfigViewName, Log4JConfigViewMBean.class, true);
-
- String level = log4jConfigView.getLogLevel(BROKER_LOGGER);
- assertNotNull(level);
- assertFalse(level.isEmpty());
-
- log4jConfigView.setLogLevel(BROKER_LOGGER, "WARN");
- level = log4jConfigView.getLogLevel(BROKER_LOGGER);
- assertNotNull(level);
- assertEquals("WARN", level);
-
- log4jConfigView.setLogLevel(BROKER_LOGGER, "INFO");
- level = log4jConfigView.getLogLevel(BROKER_LOGGER);
- assertNotNull(level);
- assertEquals("INFO", level);
- }
-
- @Test
- public void testLog4JConfigViewSetLevelNoChangeIfLevelIsBad() throws Throwable {
- String brokerObjectName = broker.getBrokerObjectName().toString();
- ObjectName log4jConfigViewName = BrokerMBeanSupport.createLog4JConfigViewName(brokerObjectName);
- Log4JConfigViewMBean log4jConfigView = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, log4jConfigViewName, Log4JConfigViewMBean.class, true);
-
- log4jConfigView.setLogLevel(BROKER_LOGGER, "INFO");
- String level = log4jConfigView.getLogLevel(BROKER_LOGGER);
- assertNotNull(level);
- assertEquals("INFO", level);
-
- log4jConfigView.setLogLevel(BROKER_LOGGER, "BAD");
- level = log4jConfigView.getLogLevel(BROKER_LOGGER);
- assertNotNull(level);
- assertEquals("INFO", level);
- }
-
- @Test
- public void testLog4JConfigViewGetRootLogLevel() throws Throwable {
- String brokerObjectName = broker.getBrokerObjectName().toString();
- ObjectName log4jConfigViewName = BrokerMBeanSupport.createLog4JConfigViewName(brokerObjectName);
- Log4JConfigViewMBean log4jConfigView = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, log4jConfigViewName, Log4JConfigViewMBean.class, true);
-
- String level = log4jConfigView.getRootLogLevel();
- assertNotNull(level);
- assertFalse(level.isEmpty());
-
- String currentRootLevel = Logger.getRootLogger().getLevel().toString();
- assertEquals(currentRootLevel, level);
- }
-
- @Test
- public void testLog4JConfigViewSetRootLevel() throws Throwable {
- String brokerObjectName = broker.getBrokerObjectName().toString();
- ObjectName log4jConfigViewName = BrokerMBeanSupport.createLog4JConfigViewName(brokerObjectName);
- Log4JConfigViewMBean log4jConfigView = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, log4jConfigViewName, Log4JConfigViewMBean.class, true);
-
- String currentRootLevel = Logger.getRootLogger().getLevel().toString();
- log4jConfigView.setRootLogLevel("WARN");
- currentRootLevel = Logger.getRootLogger().getLevel().toString();
- assertEquals("WARN", currentRootLevel);
- log4jConfigView.setRootLogLevel("INFO");
- currentRootLevel = Logger.getRootLogger().getLevel().toString();
- assertEquals("INFO", currentRootLevel);
-
- Level level;
- }
-
- protected ObjectName assertRegisteredObjectName(String name) throws MalformedObjectNameException, NullPointerException {
- ObjectName objectName = new ObjectName(name);
- if (mbeanServer.isRegistered(objectName)) {
- LOG.info("Bean Registered: " + objectName);
- }
- else {
- fail("Could not find MBean!: " + objectName);
- }
- return objectName;
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/14d4d0c8/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanOperationTimeoutTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanOperationTimeoutTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanOperationTimeoutTest.java
deleted file mode 100644
index 5747efe..0000000
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanOperationTimeoutTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * 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.broker.jmx;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class MBeanOperationTimeoutTest {
-
- private static final Logger LOG = LoggerFactory.getLogger(MBeanOperationTimeoutTest.class);
-
- private ActiveMQConnectionFactory connectionFactory;
- private BrokerService broker;
- private String connectionUri;
- private static final String destinationName = "MBeanOperationTimeoutTestQ";
- private static final String moveToDestinationName = "MBeanOperationTimeoutTestQ.Moved";
-
- protected MBeanServer mbeanServer;
- protected String domain = "org.apache.activemq";
-
- protected int messageCount = 50000;
-
- @Test(expected = TimeoutException.class)
- public void testLongOperationTimesOut() throws Exception {
-
- sendMessages(messageCount);
- LOG.info("Produced " + messageCount + " messages to the broker.");
-
- // Now get the QueueViewMBean and purge
- String objectNameStr = broker.getBrokerObjectName().toString();
- objectNameStr += ",destinationType=Queue,destinationName=" + destinationName;
-
- ObjectName queueViewMBeanName = assertRegisteredObjectName(objectNameStr);
- QueueViewMBean proxy = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, QueueViewMBean.class, true);
-
- long count = proxy.getQueueSize();
- assertEquals("Queue size", count, messageCount);
-
- LOG.info("Attempting to move one message, TimeoutException expected");
- proxy.moveMatchingMessagesTo(null, moveToDestinationName);
- }
-
- private void sendMessages(int count) throws Exception {
- Connection connection = connectionFactory.createConnection();
- try {
- Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
- Destination destination = session.createQueue(destinationName);
- MessageProducer producer = session.createProducer(destination);
- for (int i = 0; i < messageCount; i++) {
- Message message = session.createMessage();
- message.setIntProperty("id", i);
- producer.send(message);
- }
- session.commit();
- }
- finally {
- connection.close();
- }
- }
-
- protected ObjectName assertRegisteredObjectName(String name) throws MalformedObjectNameException, NullPointerException {
- ObjectName objectName = new ObjectName(name);
- if (mbeanServer.isRegistered(objectName)) {
- LOG.info("Bean Registered: " + objectName);
- }
- else {
- fail("Could not find MBean!: " + objectName);
- }
- return objectName;
- }
-
- @Before
- public void setUp() throws Exception {
- broker = createBroker();
- broker.start();
- broker.waitUntilStarted();
-
- connectionUri = broker.getTransportConnectors().get(0).getPublishableConnectString();
- connectionFactory = new ActiveMQConnectionFactory(connectionUri);
- mbeanServer = broker.getManagementContext().getMBeanServer();
- }
-
- @After
- public void tearDown() throws Exception {
- Thread.sleep(500);
- if (broker != null) {
- broker.stop();
- broker.waitUntilStopped();
- broker = null;
- }
- }
-
- protected BrokerService createBroker() throws Exception {
- BrokerService answer = new BrokerService();
- answer.setMbeanInvocationTimeout(TimeUnit.SECONDS.toMillis(1));
- answer.setUseJmx(true);
- answer.addConnector("vm://localhost");
- answer.setDeleteAllMessagesOnStartup(true);
- return answer;
- }
-}