User: d_jencks
Date: 01/09/14 18:50:16
Modified: src/main/org/jboss/test/jbossmq/test
JBossMQUnitTestCase.java
SelectorParserUnitTestCase.java
Log:
Made to work, changed to JBossTestCase and logging
Revision Changes Path
1.2 +26 -29
jbosstest/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTestCase.java
Index: JBossMQUnitTestCase.java
===================================================================
RCS file:
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JBossMQUnitTestCase.java 2001/09/12 04:55:39 1.1
+++ JBossMQUnitTestCase.java 2001/09/15 01:50:16 1.2
@@ -15,12 +15,15 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package org.jboss.test.jbossmq.test;
+package org.jboss.test.jbossmq.test;
import javax.naming.*;
import javax.jms.*;
import java.util.*;
+import org.apache.log4j.Category;
+import org.jboss.test.JBossTestCase;
+
/**
* JBossMQUnitTestCase.java
*
@@ -30,7 +33,7 @@
* @version
*/
public class JBossMQUnitTestCase
- extends junit.framework.TestCase
+ extends JBossTestCase
{
// Provider specific
static String TOPIC_FACTORY = "ConnectionFactory";
@@ -40,7 +43,6 @@
static String TEST_TOPIC = "topic/testTopic";
//JMSProviderAdapter providerAdapter;
- static Context context;
static QueueConnection queueConnection;
static TopicConnection topicConnection;
@@ -53,7 +55,7 @@
private void drainQueue() throws Exception {
QueueSession session = queueConnection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = (Queue)context.lookup(TEST_QUEUE);
+ Queue queue = (Queue)getInitialContext().lookup(TEST_QUEUE);
QueueReceiver receiver = session.createReceiver(queue);
Message message = receiver.receive( 2000 );
@@ -64,7 +66,7 @@
}
if( c!=0 )
- System.out.println(" Drained "+c+" messages from the queue");
+ getLog().debug(" Drained "+c+" messages from the queue");
session.close();
@@ -80,18 +82,13 @@
protected void connect() throws Exception {
- if( context == null ) {
-
- context = new InitialContext();
-
- }
- QueueConnectionFactory queueFactory = (QueueConnectionFactory)
context.lookup(QUEUE_FACTORY);
+ QueueConnectionFactory queueFactory = (QueueConnectionFactory)
getInitialContext().lookup(QUEUE_FACTORY);
queueConnection = queueFactory.createQueueConnection();
- TopicConnectionFactory topicFactory =
(TopicConnectionFactory)context.lookup(TOPIC_FACTORY);
+ TopicConnectionFactory topicFactory =
(TopicConnectionFactory)getInitialContext().lookup(TOPIC_FACTORY);
topicConnection = topicFactory.createTopicConnection();
- System.out.println("Connection to spyderMQ established.");
+ getLog().debug("Connection to spyderMQ established.");
}
@@ -111,7 +108,7 @@
*/
public void testQueueMessageOrder() throws Exception {
- System.out.println("Starting QueueMessageOrder test");
+ getLog().debug("Starting QueueMessageOrder test");
connect();
@@ -120,7 +117,7 @@
drainQueue();
QueueSession session = queueConnection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = (Queue)context.lookup(TEST_QUEUE);
+ Queue queue = (Queue)getInitialContext().lookup(TEST_QUEUE);
QueueSender sender = session.createSender(queue);
TextMessage message = session.createTextMessage();
@@ -138,23 +135,23 @@
//message = (TextMessage)enum.nextElement();
//if( !message.getText().equals("High Priority Persistent message") )
// throw new Exception("Queue is not prioritizing messages correctly.
Unexpected Message:"+message);
- System.out.println(message.getText());
+ getLog().debug(message.getText());
message = (TextMessage)enum.nextElement();
//if( !message.getText().equals("Normal message") )
// throw new Exception("Queue is not ordering messages correctly.
Unexpected Message:"+message);
- System.out.println(message.getText());
+ getLog().debug(message.getText());
message = (TextMessage)enum.nextElement();
//if( !message.getText().equals("Persistent message") )
// throw new Exception("Queue is not ordering messages correctly.
Unexpected Message:"+message);
- System.out.println(message.getText());
+ getLog().debug(message.getText());
// if( enum.hasMoreElements() )
// throw new Exception("Queue does not expire messages correctly.
Unexpected Message:"+enum.nextElement());
disconnect();
- System.out.println("QueueMessageOrder passed");
+ getLog().debug("QueueMessageOrder passed");
}
/**
@@ -164,7 +161,7 @@
*/
public void testRequestReplyQueue() throws Exception {
- System.out.println("Starting RequestReplyQueue test");
+ getLog().debug("Starting RequestReplyQueue test");
connect();
{
@@ -174,11 +171,11 @@
Thread serverThread = new Thread() {
public void run() {
+ Category log = Category.getInstance(getClass().getName());
try {
-
- System.out.println("Server Thread Started");
+ log.debug("Server Thread Started");
QueueSession session = queueConnection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = (Queue)context.lookup(TEST_QUEUE);
+ Queue queue = (Queue)new InitialContext().lookup(TEST_QUEUE);
QueueReceiver queueReceiver = session.createReceiver(queue);
@@ -198,10 +195,10 @@
}
session.close();
- System.out.println("Server Thread Finished");
+ log.debug("Server Thread Finished");
} catch ( Exception e ) {
- e.printStackTrace();
+ log.error("Error", e);
}
}
};
@@ -209,7 +206,7 @@
serverThread.start();
QueueSession session = queueConnection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = (Queue)context.lookup(TEST_QUEUE);
+ Queue queue = (Queue)getInitialContext().lookup(TEST_QUEUE);
QueueRequestor queueRequestor = new QueueRequestor(session, queue);
TextMessage message = session.createTextMessage();
@@ -217,7 +214,7 @@
for( int i=0; i < 5; i ++ ) {
- System.out.println("Making client request #"+i);
+ getLog().debug("Making client request #"+i);
TextMessage reply = (TextMessage) queueRequestor.request(message);
String replyID = new String(reply.getJMSCorrelationID());
if (!replyID.equals(message.getJMSMessageID()))
@@ -225,13 +222,13 @@
}
- System.out.println("Making client request to shut server down.");
+ getLog().debug("Making client request to shut server down.");
message.setText("Quit");
queueRequestor.request(message);
serverThread.join();
disconnect();
- System.out.println("RequestReplyQueue passed");
+ getLog().debug("RequestReplyQueue passed");
}
}
1.2 +36 -21
jbosstest/src/main/org/jboss/test/jbossmq/test/SelectorParserUnitTestCase.java
Index: SelectorParserUnitTestCase.java
===================================================================
RCS file:
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/jbossmq/test/SelectorParserUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SelectorParserUnitTestCase.java 2001/09/12 04:55:39 1.1
+++ SelectorParserUnitTestCase.java 2001/09/15 01:50:16 1.2
@@ -1,5 +1,12 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
package org.jboss.test.jbossmq.test;
+import java.io.ByteArrayInputStream;
import java.util.HashMap;
import junit.framework.Test;
@@ -10,12 +17,19 @@
import org.jboss.mq.selectors.SelectorParser;
import org.jboss.mq.selectors.ISelectorParser;
+import org.jboss.test.JBossTestCase;
+
/** Tests of the JavaCC LL(1) parser.
@author [EMAIL PROTECTED]
- @version $Revision: 1.1 $
+ @author [EMAIL PROTECTED]
+
+ @version $Revision: 1.2 $
+
+ * (david jencks) Used constructor of SelectorParser taking a stream
+ * to avoid reInit npe in all tests. Changed to JBossTestCase and logging.
*/
-public class SelectorParserUnitTestCase extends TestCase
+public class SelectorParserUnitTestCase extends JBossTestCase
{
static HashMap identifierMap = new HashMap();
static ISelectorParser parser;
@@ -27,10 +41,11 @@
protected void setUp() throws Exception
{
+ super.setUp();
identifierMap.clear();
if( parser == null )
{
- parser = new SelectorParser();
+ parser = new SelectorParser(new ByteArrayInputStream(new byte[0]));
}
}
@@ -38,69 +53,69 @@
{
// String
Object result = parser.parse("'A String'", identifierMap);
- System.out.println("parse('A String') -> "+result);
+ getLog().debug("parse('A String') -> "+result);
assertTrue("String is 'A String'", result.equals("'A String'"));
// An identifier
result = parser.parse("a_variable$", identifierMap);
- System.out.println("parse(a_variable$) -> "+result);
+ getLog().debug("parse(a_variable$) -> "+result);
Identifier id = new Identifier("a_variable$");
assertTrue("String is a_variable$", result.equals(id));
// Long
result = parser.parse("12345", identifierMap);
- System.out.println("parse(12345) -> "+result);
+ getLog().debug("parse(12345) -> "+result);
assertTrue("Long is 12345", result.equals(new Long(12345)));
// Double
result = parser.parse("12345.67", identifierMap);
- System.out.println("parse(12345.67) -> "+result);
+ getLog().debug("parse(12345.67) -> "+result);
assertTrue("Double is 12345.67", result.equals(new Double(12345.67)));
}
public void testSimpleUnary() throws Exception
{
// Neg Long
- System.out.println("parse(-12345 = -1 * 12345)");
+ getLog().debug("parse(-12345 = -1 * 12345)");
Operator result = (Operator) parser.parse("-12345 = -1 * 12345",
identifierMap);
- System.out.println("result -> "+result);
+ getLog().debug("result -> "+result);
Boolean b = (Boolean) result.apply();
assertTrue("is true", b.booleanValue());
// Neg Double
- System.out.println("parse(-1 * 12345.67 = -12345.67)");
+ getLog().debug("parse(-1 * 12345.67 = -12345.67)");
result = (Operator) parser.parse("-1 * 12345.67 = -12345.67", identifierMap);
- System.out.println("result -> "+result);
+ getLog().debug("result -> "+result);
b = (Boolean) result.apply();
assertTrue("is true", b.booleanValue());
}
public void testPrecedenceNAssoc() throws Exception
{
- System.out.println("parse(4 + 2 * 3 / 2 = 7)");
+ getLog().debug("parse(4 + 2 * 3 / 2 = 7)");
Operator result = (Operator) parser.parse("4 + 2 * 3 / 2 = 7)",
identifierMap);
- System.out.println("result -> "+result);
+ getLog().debug("result -> "+result);
Boolean b = (Boolean) result.apply();
assertTrue("is true", b.booleanValue());
- System.out.println("parse(4 + ((2 * 3) / 2) = 7)");
+ getLog().debug("parse(4 + ((2 * 3) / 2) = 7)");
result = (Operator) parser.parse("4 + ((2 * 3) / 2) = 7)", identifierMap);
- System.out.println("result -> "+result);
+ getLog().debug("result -> "+result);
b = (Boolean) result.apply();
assertTrue("is true", b.booleanValue());
- System.out.println("parse(4 * -2 / -1 - 4 = 4)");
+ getLog().debug("parse(4 * -2 / -1 - 4 = 4)");
result = (Operator) parser.parse("4 * -2 / -1 - 4 = 4)", identifierMap);
- System.out.println("result -> "+result);
+ getLog().debug("result -> "+result);
b = (Boolean) result.apply();
assertTrue("is true", b.booleanValue());
- System.out.println("parse(4 * ((-2 / -1) - 4) = -8)");
+ getLog().debug("parse(4 * ((-2 / -1) - 4) = -8)");
result = (Operator) parser.parse("4 * ((-2 / -1) - 4) = -8)", identifierMap);
- System.out.println("result -> "+result);
+ getLog().debug("result -> "+result);
b = (Boolean) result.apply();
assertTrue("is true", b.booleanValue());
}
public void testIds() throws Exception
{
- System.out.println("parse(a + b * c / d = e)");
+ getLog().debug("parse(a + b * c / d = e)");
Operator result = (Operator) parser.parse("a + b * c / d = e)",
identifierMap);
// 4 + 2 * 3 / 2 = 7
Identifier a = (Identifier) identifierMap.get("a");
@@ -113,7 +128,7 @@
d.setValue(new Long(2));
Identifier e = (Identifier) identifierMap.get("e");
e.setValue(new Long(7));
- System.out.println("result -> "+result);
+ getLog().debug("result -> "+result);
Boolean bool = (Boolean) result.apply();
assertTrue("is true", bool.booleanValue());
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
