[jboss-svn-commits] JBL Code SVN: r36404 - in labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src: test/java/org/jboss/soa/esb/persistence/tests and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2010-12-14 06:48:40 -0500 (Tue, 14 Dec 2010)
New Revision: 36404

Modified:
   labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
   labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src/test/java/org/jboss/soa/esb/persistence/tests/MessageStoreUnitTest.java
Log:
Fix message store setDelivered: JBESB-3542

Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2010-12-14 10:02:40 UTC (rev 36403)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2010-12-14 11:48:40 UTC (rev 36404)
@@ -208,7 +208,7 @@
             PreparedStatement ps = conn.prepareStatement(sql);
             try
             {
-                ps.setString(1, "FALSE");
+                ps.setString(1, uid.toString());
                 ps.execute();
             }
             finally

Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src/test/java/org/jboss/soa/esb/persistence/tests/MessageStoreUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src/test/java/org/jboss/soa/esb/persistence/tests/MessageStoreUnitTest.java	2010-12-14 10:02:40 UTC (rev 36403)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/services/jbossesb/src/test/java/org/jboss/soa/esb/persistence/tests/MessageStoreUnitTest.java	2010-12-14 11:48:40 UTC (rev 36404)
@@ -27,6 +27,7 @@
  * 
  */
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
@@ -80,35 +81,36 @@
 	}
 	
     @Test
-	public void testSettingUndeliverable () throws Exception
+	public void testSettingUndeliveredDelivered () throws Exception
 	{
 		//test setting one message to undelivered status
 //		 add new messages
 		Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-		assertEquals((msg != null), true);
+		assertNotNull("Message", msg);
 		
 		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store != null), true);
+		assertNotNull("store", store);
 		
+		Map<URI, Message> messages = store.getUndeliveredMessages(MessageStore.CLASSIFICATION_DEFAULT) ;
+		assertEquals("Initial undelivered count", 0, messages.size()) ;
+		
 		URI uid = store.addMessage(msg, MessageStore.CLASSIFICATION_DEFAULT);
+		
+		messages = store.getUndeliveredMessages(MessageStore.CLASSIFICATION_DEFAULT) ;
+		assertEquals("Undelivered count after addition", 0, messages.size()) ;
+		
 		store.setUndelivered(uid);
 
-	}
-	
-    @Test
-	public void testSettingDeliverable() throws Exception
-	{
-		//test setting one message to delivered status
-//		 add new messages
-		Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-		assertEquals((msg != null), true);
+		messages = store.getUndeliveredMessages(MessageStore.CLASSIFICATION_DEFAULT) ;
+		assertEquals("Undelivered count after setUndelivered", 1, messages.size()) ;
 		
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store != null), true);
-		
-		URI uid = store.addMessage(msg,MessageStore.CLASSIFICATION_DEFAULT);
 		store.setDelivered(uid);
 
+		messages = store.getUndeliveredMessages(MessageStore.CLASSIFICATION_DEFAULT) ;
+		assertEquals("Undelivered count after setDelivered", 0, messages.size()) ;
+		
+		final Message storedMessage = store.getMessage(uid);
+		assertNotNull("Stored message", storedMessage) ;
 	}
 	
     @Test