Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java Mon Dec 18 05:02:27 2006 @@ -27,7 +27,7 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSTextMessage; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import javax.jms.Destination; import javax.jms.JMSException; @@ -119,8 +119,17 @@ m.setJMSPriority(100); // Queue - Queue q = //_session.createTemporaryQueue(); - q = new AMQQueue("TestReply"); + Queue q; + + if (i / 2 == 0) + { + q = _session.createTemporaryQueue(); + } + else + { + q = new AMQQueue("TestReply"); + } + m.setJMSReplyTo(q); m.setStringProperty("TempQueue", q.toString()); @@ -173,6 +182,8 @@ (int) Integer.MAX_VALUE, m.getIntProperty("Int")); Assert.assertEquals("Check CorrelationID properties are correctly transported", "Correlation", m.getJMSCorrelationID()); + + _logger.warn("getJMSPriority not being verified."); // Assert.assertEquals("Check Priority properties are correctly transported", // 100, m.getJMSPriority()); @@ -180,8 +191,9 @@ Assert.assertEquals("Check ReplyTo properties are correctly transported", m.getStringProperty("TempQueue"), m.getJMSReplyTo().toString()); -// Assert.assertEquals("Check Type properties are correctly transported", -// "Test", m.getJMSType()); + Assert.assertEquals("Check Type properties are correctly transported", + "Test", m.getJMSType()); + Assert.assertEquals("Check Short properties are correctly transported", (short) Short.MAX_VALUE, m.getShortProperty("Short")); Assert.assertEquals("Check UnsignedInt properties are correctly transported",
Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java Mon Dec 18 05:02:27 2006 @@ -26,7 +26,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.BasicMessageProducer; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.test.VMBrokerSetup; + import org.apache.log4j.Logger; import javax.jms.JMSException; @@ -57,6 +57,7 @@ protected void tearDown() throws Exception { super.tearDown(); + TransportConnection.killAllVMBrokers(); } private void init(AMQConnection connection) throws Exception @@ -71,7 +72,7 @@ connection.start(); - String selector= null; + String selector = null; // selector = "Cost = 2 AND JMSDeliveryMode=" + DeliveryMode.NON_PERSISTENT; // selector = "JMSType = Special AND Cost = 2 AND AMQMessageID > 0 AND JMSDeliveryMode=" + DeliveryMode.NON_PERSISTENT; @@ -135,6 +136,6 @@ public static junit.framework.Test suite() { - return new VMBrokerSetup(new junit.framework.TestSuite(SelectorTest.class)); + return new junit.framework.TestSuite(SelectorTest.class); } } Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java Mon Dec 18 05:02:27 2006 @@ -26,7 +26,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import javax.jms.JMSException; import javax.jms.Message; Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java Mon Dec 18 05:02:27 2006 @@ -21,13 +21,10 @@ package org.apache.qpid.test.unit.basic; import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; -import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.client.message.JMSTextMessage; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import org.apache.log4j.Logger; import java.util.ArrayList; Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java Mon Dec 18 05:02:27 2006 @@ -28,7 +28,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.AMQException; import org.apache.qpid.url.URLSyntaxException; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import java.lang.reflect.Method; import javax.jms.*; Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java Mon Dec 18 05:02:27 2006 @@ -27,7 +27,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import org.apache.qpid.url.URLSyntaxException; import javax.jms.JMSException; Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java Mon Dec 18 05:02:27 2006 @@ -24,7 +24,7 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import org.apache.log4j.Logger; import javax.jms.*; Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java Mon Dec 18 05:02:27 2006 @@ -22,12 +22,10 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQAuthenticationException; -import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.AMQException; import org.apache.qpid.AMQConnectionException; import org.apache.qpid.AMQUnresolvedAddressException; -import org.apache.qpid.test.VMBrokerSetup; import javax.jms.Connection; @@ -40,6 +38,18 @@ String _broker_NotRunning = "vm://:2"; String _broker_BadDNS = "tcp://hg3sgaaw4lgihjs"; + + protected void setUp() throws Exception + { + super.setUp(); + TransportConnection.createVMBroker(1); + } + + protected void tearDown() throws Exception + { + TransportConnection.killAllVMBrokers(); + } + public void testSimpleConnection() { try @@ -102,8 +112,30 @@ } } + public void testClientIdCannotBeChanged() throws Exception + { + Connection connection = new AMQConnection(_broker, "guest", "guest", + "fred", "/test"); + try + { + connection.setClientID("someClientId"); + fail("No IllegalStateException thrown when resetting clientid"); + } + catch (javax.jms.IllegalStateException e) + { + // PASS + } + } + + public void testClientIdIsPopulatedAutomatically() throws Exception + { + Connection connection = new AMQConnection(_broker, "guest", "guest", + null, "/test"); + assertNotNull(connection.getClientID()); + } + public static junit.framework.Test suite() { - return new VMBrokerSetup(new junit.framework.TestSuite(ConnectionTest.class)); + return new junit.framework.TestSuite(ConnectionTest.class); } } Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java Mon Dec 18 05:02:27 2006 @@ -22,7 +22,7 @@ import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import junit.framework.TestCase; Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java Mon Dec 18 05:02:27 2006 @@ -7,9 +7,9 @@ * 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 @@ -20,14 +20,15 @@ */ package org.apache.qpid.test.unit.client.message; +import junit.framework.TestCase; import org.apache.qpid.client.message.JMSBytesMessage; import org.apache.qpid.client.message.TestMessageHelper; +import javax.jms.MessageEOFException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; -import javax.jms.MessageEOFException; - -import junit.framework.TestCase; +import javax.jms.MessageFormatException; +import java.util.HashMap; public class BytesMessageTest extends TestCase { @@ -82,6 +83,18 @@ bm.writeInt(10); } + public void testWriteBoolean() throws Exception + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + bm.writeBoolean(true); + bm.writeBoolean(false); + bm.reset(); + boolean val = bm.readBoolean(); + assertEquals(true, val); + val = bm.readBoolean(); + assertEquals(false, val); + } + public void testWriteInt() throws Exception { JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); @@ -102,6 +115,61 @@ assertEquals("Bananas", res); } + public void testWriteBytes() throws Exception + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + byte[] bytes = {1,2,3,4}; + bm.writeBytes(bytes, 1, 2); + bm.reset(); + bytes = new byte[2]; + bm.readBytes(bytes); + assertEquals(2, bytes[0]); + assertEquals(3, bytes[1]); + } + + public void testWriteObject() throws Exception + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + bm.writeObject(new Boolean(true)); + bm.writeObject(new Boolean(false)); + bm.writeObject(new Byte((byte)2)); + bm.writeObject(new byte[]{1,2,3,4}); + bm.writeObject(new Character('g')); + bm.writeObject(new Short((short) 29)); + bm.writeObject(new Integer(101)); + bm.writeObject(new Long(50003222L)); + bm.writeObject("Foobar"); + bm.writeObject(new Float(1.7f)); + bm.writeObject(new Double(8.7d)); + bm.reset(); + assertTrue(bm.readBoolean()); + assertTrue(!bm.readBoolean()); + assertEquals((byte)2, bm.readByte()); + byte[] bytes = new byte[4]; + bm.readBytes(bytes); + assertEquals('g', bm.readChar()); + assertEquals((short) 29, bm.readShort()); + assertEquals(101, bm.readInt()); + assertEquals(50003222L, bm.readLong()); + assertEquals("Foobar", bm.readUTF()); + assertEquals(1.7f, bm.readFloat()); + assertEquals(8.7d, bm.readDouble()); + } + + public void testWriteObjectRejectsNonPrimitives() throws Exception + { + try + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + bm.writeObject(new HashMap()); + fail("expected MessageFormatException was not thrown"); + } + catch (MessageFormatException e) + { + // pass + } + } + public void testWriteObjectThrowsNPE() throws Exception { try @@ -126,7 +194,83 @@ bm.writeBoolean(true); bm.reset(); boolean result = bm.readBoolean(); - assertTrue(result); + assertTrue(result); + } + + public void testReadUnsignedByte() throws Exception + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + bm.writeByte((byte) 9); + bm.reset(); + int result = bm.readUnsignedByte(); + assertEquals(9, result); + } + + public void testReadUnsignedShort() throws Exception + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + bm.writeShort((byte) 9); + bm.reset(); + int result = bm.readUnsignedShort(); + assertEquals(9, result); + } + + public void testReadBytesChecksNull() throws Exception + { + try + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + bm.readBytes(null); + } + catch (IllegalArgumentException e) + { + // pass + } + + try + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + bm.readBytes(null, 1); + } + catch (IllegalArgumentException e) + { + // pass + } + } + + public void testReadBytesChecksMaxSize() throws Exception + { + try + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + byte[] bytes = new byte[100]; + bm.readBytes(bytes, 120); + } + catch (IllegalArgumentException e) + { + // pass + } + } + + public void testReadBytesReturnsCorrectLengths() throws Exception + { + JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); + byte[] bytes = {2, 3}; + bm.writeBytes(bytes); + bm.reset(); + int len = bm.readBytes(bytes); + assertEquals(2, len); + len = bm.readBytes(bytes); + assertEquals(-1, len); + len = bm.readBytes(bytes, 2); + assertEquals(-1, len); + bm.reset(); + len = bm.readBytes(bytes, 2); + assertEquals(2, len); + bm.reset(); + len = bm.readBytes(bytes, 1); + assertEquals(1, len); + } public void testEOFByte() throws Exception @@ -406,16 +550,6 @@ assertEquals((byte)3, result[0]); assertEquals((byte)4, result[1]); assertEquals((byte)0, result[2]); - } - - public void testToBodyString() throws Exception - { - JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); - final String testText = "This is a test"; - bm.writeUTF(testText); - bm.reset(); - String result = bm.toBodyString(); - assertEquals(testText, result); } public void testToBodyStringWithNull() throws Exception Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java Mon Dec 18 05:02:27 2006 @@ -14,15 +14,14 @@ * "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. + * under the License. + * * - * */ package org.apache.qpid.test.unit.client.message; -import junit.framework.TestCase; import junit.framework.Assert; -import org.apache.qpid.framing.PropertyFieldTable; +import junit.framework.TestCase; import org.apache.qpid.client.message.JMSMapMessage; import org.apache.qpid.client.message.TestMessageHelper; @@ -103,6 +102,27 @@ { Assert.fail("JMSException received." + e); } + + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + + mm.setString("value", null); + char c = mm.getChar("value"); + fail("Expected NullPointerException"); + + } + catch (NullPointerException e) + { + ; // pass + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + + + } public void testDoubleLookup() @@ -203,7 +223,7 @@ { JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); mm.getByte("random"); - Assert.fail("NumberFormatException should be received."); + Assert.fail("NumberFormatException expected"); } catch (NumberFormatException e) { @@ -221,7 +241,12 @@ try { JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); - Assert.assertEquals(null, mm.getBytes("random")); + mm.getBytes("random"); + Assert.fail("MessageFormatException expected"); + } + catch (MessageFormatException mfe) + { + //normal path } catch (JMSException e) { @@ -235,9 +260,9 @@ { JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); mm.getChar("random"); - Assert.fail("NullPointerException should be received."); + Assert.fail("MessageFormatException expected"); } - catch (NullPointerException e) + catch (MessageFormatException e) { //normal execution } @@ -325,7 +350,7 @@ { JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); mm.getShort("random"); - Assert.fail("NumberFormatException should be received."); + Assert.fail("NumberFormatException should be received."); } catch (NumberFormatException e) { Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java Mon Dec 18 05:02:27 2006 @@ -24,9 +24,7 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import javax.jms.MessageListener; import javax.jms.MessageProducer; @@ -36,6 +34,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.ArrayList; +import java.util.Arrays; import junit.framework.TestCase; @@ -44,6 +43,7 @@ private AMQConnection connection; private AMQDestination destination; private AMQSession session; + private MessageProducer producer; private Serializable[] data; private volatile boolean waiting; private int received; @@ -57,6 +57,13 @@ connection = new AMQConnection(_broker, "guest", "guest", randomize("Client"), "/test_path"); destination = new AMQQueue(randomize("LatencyTest"), true); session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE); + + //set up a consumer + session.createConsumer(destination).setMessageListener(this); + connection.start(); + + //create a publisher + producer = session.createProducer(destination, false, false, true); A a1 = new A(1, "A"); A a2 = new A(2, "a"); B b = new B(1, "B"); @@ -83,7 +90,7 @@ _broker = broker; } - public void test() throws Exception + public void testSendAndReceive() throws Exception { try { @@ -102,16 +109,74 @@ } } - private void send() throws Exception + public void testSetObjectPropertyForString() throws Exception { - //set up a consumer - session.createConsumer(destination).setMessageListener(this); - connection.start(); + String testStringProperty = "TestStringProperty"; + ObjectMessage msg = session.createObjectMessage(data[0]); + msg.setObjectProperty("TestStringProperty",testStringProperty); + assertEquals(testStringProperty, msg.getObjectProperty("TestStringProperty")); + } - //create a publisher - MessageProducer producer = session.createProducer(destination, false, false, true); + public void testSetObjectPropertyForBoolean() throws Exception + { + ObjectMessage msg = session.createObjectMessage(data[0]); + msg.setObjectProperty("TestBooleanProperty",Boolean.TRUE); + assertEquals(Boolean.TRUE, msg.getObjectProperty("TestBooleanProperty")); + } + public void testSetObjectPropertyForByte() throws Exception + { + ObjectMessage msg = session.createObjectMessage(data[0]); + msg.setObjectProperty("TestByteProperty",Byte.MAX_VALUE); + assertEquals(Byte.MAX_VALUE, msg.getObjectProperty("TestByteProperty")); + } + public void testSetObjectPropertyForShort() throws Exception + { + ObjectMessage msg = session.createObjectMessage(data[0]); + msg.setObjectProperty("TestShortProperty",Short.MAX_VALUE); + assertEquals(Short.MAX_VALUE, msg.getObjectProperty("TestShortProperty")); + } + public void testSetObjectPropertyForInteger() throws Exception + { + ObjectMessage msg = session.createObjectMessage(data[0]); + msg.setObjectProperty("TestIntegerProperty",Integer.MAX_VALUE); + assertEquals(Integer.MAX_VALUE, msg.getObjectProperty("TestIntegerProperty")); + } + + public void testSetObjectPropertyForDouble() throws Exception + { + ObjectMessage msg = session.createObjectMessage(data[0]); + msg.setObjectProperty("TestDoubleProperty",Double.MAX_VALUE); + assertEquals(Double.MAX_VALUE, msg.getObjectProperty("TestDoubleProperty")); + } + + public void testSetObjectPropertyForFloat() throws Exception + { + ObjectMessage msg = session.createObjectMessage(data[0]); + msg.setObjectProperty("TestFloatProperty",Float.MAX_VALUE); + assertEquals(Float.MAX_VALUE, msg.getObjectProperty("TestFloatProperty")); + } + + public void testSetObjectPropertyForByteArray() throws Exception + { + byte[] array = {1,2,3,4,5}; + ObjectMessage msg = session.createObjectMessage(data[0]); + msg.setObjectProperty("TestByteArrayProperty",array); + assertTrue(Arrays.equals(array,(byte[])msg.getObjectProperty("TestByteArrayProperty"))); + } + + + public void testSetObjectForNull() throws Exception + { + ObjectMessage msg = session.createObjectMessage(); + msg.setObject(null); + assertNull(msg.getObject()); + } + + + private void send() throws Exception + { for (int i = 0; i < data.length; i++) { ObjectMessage msg; @@ -207,7 +272,7 @@ { System.out.println("Usage: <broker>"); } - new ObjectMessageTest(broker).test(); + new ObjectMessageTest(broker).testSendAndReceive(); } private static class A implements Serializable Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java Mon Dec 18 05:02:27 2006 @@ -7,9 +7,9 @@ * 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 @@ -22,8 +22,13 @@ import org.apache.qpid.client.message.TestMessageHelper; import org.apache.qpid.client.message.JMSTextMessage; +import org.apache.qpid.client.message.JMSMapMessage; import junit.framework.TestCase; +import junit.framework.Assert; + +import javax.jms.JMSException; +import javax.jms.MessageFormatException; public class TextMessageTest extends TestCase { @@ -46,6 +51,248 @@ val = tm.getText(); assertEquals(val, "Banana"); } + + + public void testBooleanPropertyLookup() + { + try + { + JMSTextMessage tm = TestMessageHelper.newJMSTextMessage(); + + tm.setBooleanProperty("value", true); + Assert.assertEquals(true, tm.getBooleanProperty("value")); + Assert.assertEquals("true", tm.getStringProperty("value")); + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + } + + public void testBytePropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.setByteProperty("value", Byte.MAX_VALUE); + + Assert.assertEquals(Byte.MAX_VALUE, mm.getByteProperty("value")); + Assert.assertEquals((short) Byte.MAX_VALUE, mm.getShortProperty("value")); + Assert.assertEquals(Byte.MAX_VALUE, mm.getIntProperty("value")); + Assert.assertEquals((long) Byte.MAX_VALUE, mm.getLongProperty("value")); + Assert.assertEquals("" + Byte.MAX_VALUE, mm.getStringProperty("value")); + + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + } + + public void testShortPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.setShortProperty("value", Short.MAX_VALUE); + Assert.assertEquals(Short.MAX_VALUE, mm.getShortProperty("value")); + Assert.assertEquals((int) Short.MAX_VALUE, mm.getIntProperty("value")); + Assert.assertEquals((long) Short.MAX_VALUE, mm.getLongProperty("value")); + Assert.assertEquals("" + Short.MAX_VALUE, mm.getStringProperty("value")); + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + } + + public void testDoublePropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.setDoubleProperty("value", Double.MAX_VALUE); + Assert.assertEquals(Double.MAX_VALUE, mm.getDoubleProperty("value")); + Assert.assertEquals("" + Double.MAX_VALUE, mm.getStringProperty("value")); + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + } + + public void testFloatPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.setFloatProperty("value", Float.MAX_VALUE); + Assert.assertEquals(Float.MAX_VALUE, mm.getFloatProperty("value")); + Assert.assertEquals((double) Float.MAX_VALUE, mm.getDoubleProperty("value")); + Assert.assertEquals("" + Float.MAX_VALUE, mm.getStringProperty("value")); + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + } + + public void testIntPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.setIntProperty("value", Integer.MAX_VALUE); + Assert.assertEquals(Integer.MAX_VALUE, mm.getIntProperty("value")); + Assert.assertEquals((long) Integer.MAX_VALUE, mm.getLongProperty("value")); + Assert.assertEquals("" + Integer.MAX_VALUE, mm.getStringProperty("value")); + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + } + + public void testLongPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.setLongProperty("value", Long.MAX_VALUE); + Assert.assertEquals(Long.MAX_VALUE, mm.getLongProperty("value")); + Assert.assertEquals("" + Long.MAX_VALUE, mm.getStringProperty("value")); + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + } + + + // Failed Lookups + + public void testFailedBooleanPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + Assert.assertEquals(false, mm.getBooleanProperty("int")); + } + catch (JMSException e) + { + Assert.fail("JMSException received." + e); + } + } + + public void testFailedBytePropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.getByteProperty("random"); + Assert.fail("NumberFormatException expected"); + } + catch (NumberFormatException e) + { + //normal execution + } + catch (JMSException e) + { + Assert.fail("JMSException received:" + e); + } + + } + + public void testFailedDoublePropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.getDoubleProperty("random"); + Assert.fail("NullPointerException should be received."); + } + catch (NullPointerException e) + { + //normal execution + } + catch (JMSException e) + { + Assert.fail("JMSException received:" + e); + } + } + + public void testFailedFloatPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.getFloatProperty("random"); + Assert.fail("NullPointerException should be received."); + } + catch (NullPointerException e) + { + //normal execution + } + catch (JMSException e) + { + Assert.fail("JMSException received:" + e); + } + } + + public void testFailedIntPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.getIntProperty("random"); + Assert.fail("NumberFormatException should be received."); + } + catch (NumberFormatException e) + { + //normal execution + } + catch (JMSException e) + { + Assert.fail("JMSException received:" + e); + } + } + + public void testFailedLongPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.getLongProperty("random"); + Assert.fail("NumberFormatException should be received."); + } + catch (NumberFormatException e) + { + //normal execution + } + catch (JMSException e) + { + Assert.fail("JMSException received:" + e); + } + } + + public void testFailedShortPropertyLookup() + { + try + { + JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); + mm.getShortProperty("random"); + Assert.fail("NumberFormatException should be received."); + } + catch (NumberFormatException e) + { + //normal execution + } + catch (JMSException e) + { + Assert.fail("JMSException received:" + e); + } + } + public static junit.framework.Test suite() { Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java Mon Dec 18 05:02:27 2006 @@ -7,9 +7,9 @@ * 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 @@ -87,19 +87,19 @@ _testSession.getMinaProtocolSession().setLocalPort(_port); testAddress = _testSession.genQueueName(); - assertEquals("Failure when generating a queue name from an address with special chars",_generatedAddress,testAddress); + assertEquals("Failure when generating a queue exchange from an address with special chars",_generatedAddress,testAddress); //test empty address _testSession.getMinaProtocolSession().setStringLocalAddress(_emptyAddress); testAddress = _testSession.genQueueName(); - assertEquals("Failure when generating a queue name from an empty address",_generatedAddress_2,testAddress); + assertEquals("Failure when generating a queue exchange from an empty address",_generatedAddress_2,testAddress); //test address with no special chars _testSession.getMinaProtocolSession().setStringLocalAddress(_validAddress); testAddress = _testSession.genQueueName(); - assertEquals("Failure when generating a queue name from an address with no special chars",_generatedAddress_3,testAddress); + assertEquals("Failure when generating a queue exchange from an address with no special chars",_generatedAddress_3,testAddress); } Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Mon Dec 18 05:02:27 2006 @@ -27,7 +27,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import javax.jms.JMSException; import javax.jms.Message; Modified: incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?view=diff&rev=488262&r1=488261&r2=488262 ============================================================================== --- incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java (original) +++ incubator/qpid/branches/jmsselectors/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java Mon Dec 18 05:02:27 2006 @@ -25,7 +25,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; -import org.apache.qpid.test.VMBrokerSetup; +import org.apache.qpid.testutil.VMBrokerSetup; import javax.jms.*;
