[jboss-cvs] JBoss Messaging SVN: r6172 - trunk/tests/src/org/jboss/messaging/tests/integration/client.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-03-26 10:01:34 -0400 (Thu, 26 Mar 2009)
New Revision: 6172

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java
Log:
expiry address tests

* added testExpireWithOverridenSublevelAddressSettings

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java	2009-03-26 14:01:05 UTC (rev 6171)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java	2009-03-26 14:01:34 UTC (rev 6172)
@@ -276,18 +276,25 @@
       m.acknowledge();
    }
    
-   public void testExpireWithSublevelAddressSettings() throws Exception
+   public void testExpireWithOverridenSublevelAddressSettings() throws Exception
    {
       SimpleString address = new SimpleString("prefix.address");
       SimpleString queue = randomSimpleString();
-      SimpleString expiryAddress = randomSimpleString();
-      SimpleString exipryQueue = randomSimpleString();
+      SimpleString defaultExpiryAddress = randomSimpleString();
+      SimpleString defaultExpiryQueue = randomSimpleString();
+      SimpleString specificExpiryAddress = randomSimpleString();
+      SimpleString specificExpiryQueue = randomSimpleString();
 
-      AddressSettings addressSettings = new AddressSettings();
-      addressSettings.setExpiryAddress(expiryAddress);
-      messagingService.getServer().getAddressSettingsRepository().addMatch("prefix.*", addressSettings);
+      AddressSettings defaultAddressSettings = new AddressSettings();
+      defaultAddressSettings.setExpiryAddress(defaultExpiryAddress);
+      messagingService.getServer().getAddressSettingsRepository().addMatch("prefix.*", defaultAddressSettings);
+      AddressSettings specificAddressSettings = new AddressSettings();
+      specificAddressSettings.setExpiryAddress(specificExpiryAddress);
+      messagingService.getServer().getAddressSettingsRepository().addMatch("prefix.address", specificAddressSettings);
+
       clientSession.createQueue(address, queue, false);
-      clientSession.createQueue(expiryAddress, exipryQueue, false);
+      clientSession.createQueue(defaultExpiryAddress, defaultExpiryQueue, false);
+      clientSession.createQueue(specificExpiryAddress, specificExpiryQueue, false);
       
       ClientProducer producer = clientSession.createProducer(address);
       ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
@@ -300,8 +307,13 @@
       assertNull(m);
       clientConsumer.close();
 
-      clientConsumer = clientSession.createConsumer(exipryQueue);
+      clientConsumer = clientSession.createConsumer(defaultExpiryQueue);
       m = clientConsumer.receive(500);
+      assertNull(m);
+      clientConsumer.close();
+
+      clientConsumer = clientSession.createConsumer(specificExpiryQueue);
+      m = clientConsumer.receive(500);
       assertNotNull(m);
       assertEquals(m.getBody().readString(), "heyho!");
       m.acknowledge();