[jboss-cvs] joramtests/src/main/java/org/objectweb/jtests/jms/conform/session ...
Clebert Suconic
csuconic at jboss.com
Tue Jun 19 19:32:35 EDT 2007
User: csuconic
Date: 07/06/19 19:32:35
Modified: src/main/java/org/objectweb/jtests/jms/conform/session
TopicSessionTest.java QueueSessionTest.java
SessionTest.java
Log:
Several fixes on flawed tests
Revision Changes Path
1.2 +3 -6 joramtests/src/main/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TopicSessionTest.java
===================================================================
RCS file: /cvsroot/jboss/joramtests/src/main/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TopicSessionTest.java 29 Mar 2007 04:28:37 -0000 1.1
+++ TopicSessionTest.java 19 Jun 2007 23:32:35 -0000 1.2
@@ -41,10 +41,10 @@
/**
* Test topic sessions
* <br />
- * See JMS specifications, §4.4 Session
+ * See JMS specifications, �4.4 Session
*
* @author Jeff Mesnil (jmesnil at inrialpes.fr)
- * @version $Id: TopicSessionTest.java,v 1.1 2007/03/29 04:28:37 starksm Exp $
+ * @version $Id: TopicSessionTest.java,v 1.2 2007/06/19 23:32:35 csuconic Exp $
*/
public class TopicSessionTest extends PubSubTestCase
{
@@ -124,10 +124,7 @@
publisher.publish(message);
subscriberConnection = subscriberTCF.createTopicConnection();
- if (subscriberConnection.getClientID() == null)
- {
subscriberConnection.setClientID("subscriberConnection");
- }
subscriberSession = subscriberConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
subscriber = subscriberSession.createDurableSubscriber(subscriberTopic, "testTopic");
subscriberConnection.start();
1.2 +7 -2 joramtests/src/main/java/org/objectweb/jtests/jms/conform/session/QueueSessionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: QueueSessionTest.java
===================================================================
RCS file: /cvsroot/jboss/joramtests/src/main/java/org/objectweb/jtests/jms/conform/session/QueueSessionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- QueueSessionTest.java 29 Mar 2007 04:28:37 -0000 1.1
+++ QueueSessionTest.java 19 Jun 2007 23:32:35 -0000 1.2
@@ -40,10 +40,10 @@
/**
* Test queue sessions
* <br />
- * See JMS specifications, §4.4 Session
+ * See JMS specifications, �4.4 Session
*
* @author Jeff Mesnil (jmesnil at inrialpes.fr)
- * @version $Id: QueueSessionTest.java,v 1.1 2007/03/29 04:28:37 starksm Exp $
+ * @version $Id: QueueSessionTest.java,v 1.2 2007/06/19 23:32:35 csuconic Exp $
*/
public class QueueSessionTest extends PTPTestCase
{
@@ -70,6 +70,11 @@
// we create it again but as a transacted session
receiverSession = receiverConnection.createQueueSession(true, 0);
assertEquals(true, receiverSession.getTransacted());
+
+ if (receiver!=null)
+ {
+ receiver.close();
+ }
// we create again the receiver
receiver = receiverSession.createReceiver(receiverQueue);
receiverConnection.start();
1.2 +11 -7 joramtests/src/main/java/org/objectweb/jtests/jms/conform/session/SessionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SessionTest.java
===================================================================
RCS file: /cvsroot/jboss/joramtests/src/main/java/org/objectweb/jtests/jms/conform/session/SessionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SessionTest.java 29 Mar 2007 04:28:37 -0000 1.1
+++ SessionTest.java 19 Jun 2007 23:32:35 -0000 1.2
@@ -38,10 +38,10 @@
/**
* Test sessions
* <br />
- * See JMS specifications, §4.4 Session
+ * See JMS specifications, �4.4 Session
*
* @author Jeff Mesnil (jmesnil at inrialpes.fr)
- * @version $Id: SessionTest.java,v 1.1 2007/03/29 04:28:37 starksm Exp $
+ * @version $Id: SessionTest.java,v 1.2 2007/06/19 23:32:35 csuconic Exp $
*/
public class SessionTest extends PTPTestCase
{
@@ -226,6 +226,10 @@
{
try
{
+ if (receiverSession!=null)
+ {
+ receiverSession.close();
+ }
receiverSession = receiverConnection.createQueueSession(false, Session.CLIENT_ACKNOWLEDGE);
receiver = receiverSession.createReceiver(receiverQueue);
@@ -235,7 +239,7 @@
Message m = receiver.receive(TestConfig.TIMEOUT);
receiverSession.close();
m.acknowledge();
- fail("§4.4.1 Invoking the acknowledge method of a received message from a closed "
+ fail("�4.4.1 Invoking the acknowledge method of a received message from a closed "
+ " session must throw an [javax.jms.]IllegalStateException.\n");
}
catch (javax.jms.IllegalStateException e)
@@ -247,7 +251,7 @@
}
catch (java.lang.IllegalStateException e)
{
- fail("§4.4.1 Invoking the acknowledge method of a received message from a closed "
+ fail("�4.4.1 Invoking the acknowledge method of a received message from a closed "
+ "session must throw an [javax.jms.]IllegalStateException, "
+ "[not a java.lang.IllegalStateException]");
}
@@ -271,7 +275,7 @@
}
catch (Exception e)
{
- fail("§4.4.1 It is valid to continue to use message objects created or received via "
+ fail("�4.4.1 It is valid to continue to use message objects created or received via "
+ "the [closed] session.\n");
}
}
@@ -286,7 +290,7 @@
{
senderSession.close();
senderSession.createMessage();
- fail("§4.4.1 An attempt to use [a closed session] must throw a [javax.jms.]IllegalStateException.\n");
+ fail("�4.4.1 An attempt to use [a closed session] must throw a [javax.jms.]IllegalStateException.\n");
}
catch (javax.jms.IllegalStateException e)
{
@@ -317,7 +321,7 @@
}
catch (Exception e)
{
- fail("§4.4.1 Closing a closed session must NOT throw an exception.\n");
+ fail("�4.4.1 Closing a closed session must NOT throw an exception.\n");
}
}
More information about the jboss-cvs-commits
mailing list