[Jboss-cvs] JBoss Messaging SVN: r1185 - in trunk/tests: etc src/org/jboss/test/messaging/jms
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 3 15:35:12 EDT 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-08-03 15:35:10 -0400 (Thu, 03 Aug 2006)
New Revision: 1185
Added:
trunk/tests/etc/log4j.info.xml
trunk/tests/etc/log4j.trace.xml
Modified:
trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-484
Added: trunk/tests/etc/log4j.info.xml
===================================================================
--- trunk/tests/etc/log4j.info.xml 2006-08-03 18:52:12 UTC (rev 1184)
+++ trunk/tests/etc/log4j.info.xml 2006-08-03 19:35:10 UTC (rev 1185)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 1019 2006-07-17 17:15:04Z timfox $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${module.output}/logs/messaging-tests${remote.test.suffix}.trace.log"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <param name="Threshold" value="INFO"/>
+
+ <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+ for each test. We need to append if we want to preserve a full testsuite run log.
+ Make sure the build script clears this log at the beginning of each run.
+ -->
+ <param name="Append" value="true"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+
+ </layout>
+ </appender>
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%t %d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Added: trunk/tests/etc/log4j.trace.xml
===================================================================
--- trunk/tests/etc/log4j.trace.xml 2006-08-03 18:52:12 UTC (rev 1184)
+++ trunk/tests/etc/log4j.trace.xml 2006-08-03 19:35:10 UTC (rev 1185)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 1184 2006-08-03 18:52:12Z ovidiu.feodorov at jboss.com $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${module.output}/logs/messaging-tests${remote.test.suffix}.trace.log"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <param name="Threshold" value="TRACE#org.jboss.logging.XLevel"/>
+
+ <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+ for each test. We need to append if we want to preserve a full testsuite run log.
+ Make sure the build script clears this log at the beginning of each run.
+ -->
+ <param name="Append" value="true"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+
+ </layout>
+ </appender>
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%t %d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jboss.messaging">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+
+ <category name="org.jboss.jms">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+
+ <category name="org.jboss.test">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Modified: trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2006-08-03 18:52:12 UTC (rev 1184)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2006-08-03 19:35:10 UTC (rev 1185)
@@ -2064,13 +2064,16 @@
MessageConsumer consumer1 = sess1.createConsumer(topic, null, true);
conn2 = cf.createConnection();
+
Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
assertEquals(Session.AUTO_ACKNOWLEDGE, sess2.getAcknowledgeMode());
-
MessageConsumer consumer2 = sess2.createConsumer(topic, null, true);
- MessageConsumer consumer3 = sess2.createConsumer(topic, null, false);
+ // we need different session because we cannot access the same session from two different
+ // threads
+ Session sess3 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ assertEquals(Session.AUTO_ACKNOWLEDGE, sess3.getAcknowledgeMode());
+ MessageConsumer consumer3 = sess3.createConsumer(topic, null, true);
//Consumer 1 should not get the message but consumers 2 and 3 should
More information about the jboss-cvs-commits
mailing list