You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/06 06:58:59 UTC
[26/29] Remove mom package from hierarchy.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7ddb07bd/log4j-jms/src/test/java/org/apache/logging/log4j/jms/appender/JmsAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/jms/appender/JmsAppenderTest.java b/log4j-jms/src/test/java/org/apache/logging/log4j/jms/appender/JmsAppenderTest.java
new file mode 100644
index 0000000..55268cc
--- /dev/null
+++ b/log4j-jms/src/test/java/org/apache/logging/log4j/jms/appender/JmsAppenderTest.java
@@ -0,0 +1,122 @@
+package org.apache.logging.log4j.jms.appender;
+
+import javax.jms.Message;
+import javax.jms.ObjectMessage;
+import javax.jms.TextMessage;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.core.util.JndiCloser;
+import org.apache.logging.log4j.junit.InitialLoggerContext;
+import org.apache.logging.log4j.message.SimpleMessage;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockejb.jms.MockQueue;
+import org.mockejb.jms.MockTopic;
+import org.mockejb.jms.QueueConnectionFactoryImpl;
+import org.mockejb.jms.TopicConnectionFactoryImpl;
+import org.mockejb.jndi.MockContextFactory;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.*;
+
+public class JmsAppenderTest {
+
+ private static final String CONNECTION_FACTORY_NAME = "jms/queues";
+ private static final String TOPIC_FACTORY_NAME = "jms/topics";
+ private static final String DESTINATION_NAME = "jms/destination";
+ private static final String QUEUE_NAME = "jms/queue";
+ private static final String TOPIC_NAME = "jms/topic";
+ private static final String LOG_MESSAGE = "Hello, world!";
+
+ private static Context context;
+
+ private static MockQueue destination;
+ private static MockQueue queue;
+ private static MockTopic topic;
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+ MockContextFactory.setAsInitial();
+ context = new InitialContext();
+ context.rebind(CONNECTION_FACTORY_NAME, new QueueConnectionFactoryImpl());
+ context.rebind(TOPIC_FACTORY_NAME, new TopicConnectionFactoryImpl());
+ destination = new MockQueue(DESTINATION_NAME);
+ context.rebind(DESTINATION_NAME, destination);
+ queue = new MockQueue(QUEUE_NAME);
+ context.rebind(QUEUE_NAME, queue);
+ topic = new MockTopic(TOPIC_NAME);
+ context.rebind(TOPIC_NAME, topic);
+ }
+
+ @AfterClass
+ public static void tearDownClass() throws Exception {
+ JndiCloser.close(context);
+ }
+
+ @Rule
+ public InitialLoggerContext ctx = new InitialLoggerContext("JmsAppenderTest.xml");
+
+ @Test
+ public void testAppendToQueue() throws Exception {
+ assertEquals(0, destination.size());
+ final JmsAppender appender = (JmsAppender) ctx.getRequiredAppender("JmsAppender");
+ final LogEvent event = createLogEvent();
+ appender.append(event);
+ assertEquals(1, destination.size());
+ final Message message = destination.getMessageAt(0);
+ assertNotNull(message);
+ assertThat(message, instanceOf(TextMessage.class));
+ final TextMessage textMessage = (TextMessage) message;
+ assertEquals(LOG_MESSAGE, textMessage.getText());
+ }
+
+ @Test
+ public void testJmsQueueAppenderCompatibility() throws Exception {
+ assertEquals(0, queue.size());
+ final JmsAppender appender = (JmsAppender) ctx.getRequiredAppender("JmsQueueAppender");
+ final LogEvent expected = createLogEvent();
+ appender.append(expected);
+ assertEquals(1, queue.size());
+ final Message message = queue.getMessageAt(0);
+ assertNotNull(message);
+ assertThat(message, instanceOf(ObjectMessage.class));
+ final ObjectMessage objectMessage = (ObjectMessage) message;
+ final Object o = objectMessage.getObject();
+ assertThat(o, instanceOf(LogEvent.class));
+ final LogEvent actual = (LogEvent) o;
+ assertEquals(expected.getMessage().getFormattedMessage(), actual.getMessage().getFormattedMessage());
+ }
+
+ @Test
+ public void testJmsTopicAppenderCompatibility() throws Exception {
+ assertEquals(0, topic.size());
+ final JmsAppender appender = (JmsAppender) ctx.getRequiredAppender("JmsTopicAppender");
+ final LogEvent expected = createLogEvent();
+ appender.append(expected);
+ assertEquals(1, topic.size());
+ final Message message = topic.getMessageAt(0);
+ assertNotNull(message);
+ assertThat(message, instanceOf(ObjectMessage.class));
+ final ObjectMessage objectMessage = (ObjectMessage) message;
+ final Object o = objectMessage.getObject();
+ assertThat(o, instanceOf(LogEvent.class));
+ final LogEvent actual = (LogEvent) o;
+ assertEquals(expected.getMessage().getFormattedMessage(), actual.getMessage().getFormattedMessage());
+ }
+
+ private static Log4jLogEvent createLogEvent() {
+ return Log4jLogEvent.newBuilder()
+ .setLoggerName(JmsAppenderTest.class.getName())
+ .setLoggerFqcn(JmsAppenderTest.class.getName())
+ .setLevel(Level.INFO)
+ .setMessage(new SimpleMessage(LOG_MESSAGE))
+ .build();
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7ddb07bd/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsAppenderIT.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsAppenderIT.java b/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsAppenderIT.java
deleted file mode 100644
index 9ed98fa..0000000
--- a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsAppenderIT.java
+++ /dev/null
@@ -1,126 +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.logging.log4j.mom.jms.appender;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-
-import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.impl.Log4jLogEvent;
-import org.apache.logging.log4j.core.layout.SerializedLayout;
-import org.apache.logging.log4j.message.SimpleMessage;
-import org.apache.logging.log4j.mom.jms.manager.JmsManager;
-import org.apache.logging.log4j.mom.jms.manager.JndiManager;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Integration test for JmsAppender using an embedded ActiveMQ broker.
- */
-public class JmsAppenderIT {
-
- private static JmsManager jmsManager;
-
- private JmsAppender appender;
-
- @BeforeClass
- public static void setUpClass() {
- final Properties additional = new Properties();
- additional.setProperty("queue.TestQueue", "TestQueue");
- JndiManager jndiManager = JndiManager.getJndiManager(ActiveMQInitialContextFactory.class.getName(),
- "vm://localhost?broker.persistent=false", null, null, null, additional);
- jmsManager = JmsManager.getJmsManager("JmsManager", jndiManager, "ConnectionFactory", "TestQueue", null, null);
- }
-
- @AfterClass
- public static void tearDownClass() {
- jmsManager.release();
- }
-
- @Before
- public void setUp() throws Exception {
- appender = new JmsAppender("JmsAppender", null, SerializedLayout.createLayout(), true, jmsManager);
- appender.start();
- }
-
- @Test
- public void testLogToQueue() throws Exception {
- final int messageCount = 100;
- final MessageConsumer messageConsumer = jmsManager.createMessageConsumer();
- final JmsQueueConsumer consumer = new JmsQueueConsumer(messageCount);
- messageConsumer.setMessageListener(consumer);
- final String messageText = "Hello, World!";
- final String loggerName = this.getClass().getName();
- for (int i = 0; i < messageCount; i++) {
- final LogEvent event = Log4jLogEvent.createEvent(loggerName, null, loggerName, Level.ERROR,
- new SimpleMessage(messageText), null, null, null, null, Thread.currentThread().getName(), null,
- System.currentTimeMillis());
- appender.append(event);
- }
- consumer.awaitAndAssertAllMessagesConsumed();
- }
-
- private static class JmsQueueConsumer implements MessageListener {
-
- private final int messageCount;
- private final CountDownLatch countDownLatch;
- private final Collection<LogEvent> events;
-
- private JmsQueueConsumer(final int messageCount) {
- this.messageCount = messageCount;
- this.countDownLatch = new CountDownLatch(messageCount);
- this.events = new ArrayList<LogEvent>(messageCount);
- }
-
- @Override
- public void onMessage(Message message) {
- try {
- consume((ObjectMessage) message);
- } catch (JMSException e) {
- e.printStackTrace();
- }
- }
-
- private void consume(ObjectMessage message) throws JMSException {
- try {
- final LogEvent event = (LogEvent) message.getObject();
- events.add(event);
- } finally {
- countDownLatch.countDown();
- }
- }
-
- public void awaitAndAssertAllMessagesConsumed() throws InterruptedException {
- countDownLatch.await(5, TimeUnit.SECONDS);
- assertEquals(messageCount, events.size());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7ddb07bd/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsAppenderTest.java b/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsAppenderTest.java
deleted file mode 100644
index 743a4eb..0000000
--- a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsAppenderTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.apache.logging.log4j.mom.jms.appender;
-
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.impl.Log4jLogEvent;
-import org.apache.logging.log4j.core.util.JndiCloser;
-import org.apache.logging.log4j.junit.InitialLoggerContext;
-import org.apache.logging.log4j.message.SimpleMessage;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.mockejb.jms.MockQueue;
-import org.mockejb.jms.MockTopic;
-import org.mockejb.jms.QueueConnectionFactoryImpl;
-import org.mockejb.jms.TopicConnectionFactoryImpl;
-import org.mockejb.jndi.MockContextFactory;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
-
-public class JmsAppenderTest {
-
- private static final String CONNECTION_FACTORY_NAME = "jms/queues";
- private static final String TOPIC_FACTORY_NAME = "jms/topics";
- private static final String DESTINATION_NAME = "jms/destination";
- private static final String QUEUE_NAME = "jms/queue";
- private static final String TOPIC_NAME = "jms/topic";
- private static final String LOG_MESSAGE = "Hello, world!";
-
- private static Context context;
-
- private static MockQueue destination;
- private static MockQueue queue;
- private static MockTopic topic;
-
- @BeforeClass
- public static void setUpClass() throws Exception {
- MockContextFactory.setAsInitial();
- context = new InitialContext();
- context.rebind(CONNECTION_FACTORY_NAME, new QueueConnectionFactoryImpl());
- context.rebind(TOPIC_FACTORY_NAME, new TopicConnectionFactoryImpl());
- destination = new MockQueue(DESTINATION_NAME);
- context.rebind(DESTINATION_NAME, destination);
- queue = new MockQueue(QUEUE_NAME);
- context.rebind(QUEUE_NAME, queue);
- topic = new MockTopic(TOPIC_NAME);
- context.rebind(TOPIC_NAME, topic);
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- JndiCloser.close(context);
- }
-
- @Rule
- public InitialLoggerContext ctx = new InitialLoggerContext("JmsAppenderTest.xml");
-
- @Test
- public void testAppendToQueue() throws Exception {
- assertEquals(0, destination.size());
- final JmsAppender appender = (JmsAppender) ctx.getRequiredAppender("JmsAppender");
- final LogEvent event = createLogEvent();
- appender.append(event);
- assertEquals(1, destination.size());
- final Message message = destination.getMessageAt(0);
- assertNotNull(message);
- assertThat(message, instanceOf(TextMessage.class));
- final TextMessage textMessage = (TextMessage) message;
- assertEquals(LOG_MESSAGE, textMessage.getText());
- }
-
- @Test
- public void testJmsQueueAppenderCompatibility() throws Exception {
- assertEquals(0, queue.size());
- final JmsAppender appender = (JmsAppender) ctx.getRequiredAppender("JmsQueueAppender");
- final LogEvent expected = createLogEvent();
- appender.append(expected);
- assertEquals(1, queue.size());
- final Message message = queue.getMessageAt(0);
- assertNotNull(message);
- assertThat(message, instanceOf(ObjectMessage.class));
- final ObjectMessage objectMessage = (ObjectMessage) message;
- final Object o = objectMessage.getObject();
- assertThat(o, instanceOf(LogEvent.class));
- final LogEvent actual = (LogEvent) o;
- assertEquals(expected.getMessage().getFormattedMessage(), actual.getMessage().getFormattedMessage());
- }
-
- @Test
- public void testJmsTopicAppenderCompatibility() throws Exception {
- assertEquals(0, topic.size());
- final JmsAppender appender = (JmsAppender) ctx.getRequiredAppender("JmsTopicAppender");
- final LogEvent expected = createLogEvent();
- appender.append(expected);
- assertEquals(1, topic.size());
- final Message message = topic.getMessageAt(0);
- assertNotNull(message);
- assertThat(message, instanceOf(ObjectMessage.class));
- final ObjectMessage objectMessage = (ObjectMessage) message;
- final Object o = objectMessage.getObject();
- assertThat(o, instanceOf(LogEvent.class));
- final LogEvent actual = (LogEvent) o;
- assertEquals(expected.getMessage().getFormattedMessage(), actual.getMessage().getFormattedMessage());
- }
-
- private static Log4jLogEvent createLogEvent() {
- return Log4jLogEvent.newBuilder()
- .setLoggerName(JmsAppenderTest.class.getName())
- .setLoggerFqcn(JmsAppenderTest.class.getName())
- .setLevel(Level.INFO)
- .setMessage(new SimpleMessage(LOG_MESSAGE))
- .build();
- }
-
-}
\ No newline at end of file