#2: Unit test for looking up msg by delivery receipt

softwaremill · Dec 6, 2012 · e902c4f · e902c4f
1 parent 6536bc2
commit e902c4f
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/core/src/main/scala/org/elasticmq/impl/nativeclient/NativeQueueModule.scala b/core/src/main/scala/org/elasticmq/impl/nativeclient/NativeQueueModule.scala
@@ -99,7 +99,15 @@ trait NativeQueueModule {
     }
 
     def lookupMessage(deliveryReceipt: DeliveryReceipt) = {
-      None // TODO
+      val id = deliveryReceipt.extractId
+      val messageOpt = lookupMessage(id)
+      messageOpt.flatMap(message => {
+        if (message.lastDeliveryReceipt == Some(deliveryReceipt)) {
+          Some(message)
+        } else {
+          None
+        }
+      })
     }
 
     def updateDefaultVisibilityTimeout(defaultVisibilityTimeout: MillisVisibilityTimeout): Queue = {

diff --git a/core/src/test/scala/org/elasticmq/impl/NativeMessageClientImplTestSuite.scala b/core/src/test/scala/org/elasticmq/impl/NativeMessageClientImplTestSuite.scala
@@ -127,6 +127,41 @@ class NativeMessageClientImplTestSuite extends FunSuite with MustMatchers with M
     mockExecutor.findExecutedCommand[ReceiveMessageCommand].newNextDelivery must be (MillisNextDelivery(Now + 1000L))
   }
 
+  test("looking up a message by delivery receipt should succeed if delivery receipts match") {
+    // Given
+    val (queueOperations, mockExecutor) = createQueueOperationsWithMockStorage(createQueueData("q1", MillisVisibilityTimeout(123L)))
+
+    val id = MessageId("abc")
+    val receipt = DeliveryReceipt.generate(id)
+
+    val m = createMessageData(id.id, "z", MillisNextDelivery(123L), Some(receipt))
+    mockExecutor.returnWhenCommandClass(classOf[LookupMessageCommand], Some(m))
+
+    // When
+    val msg = queueOperations.lookupMessage(receipt)
+
+    // Then
+    msg.map(_.id) must be (Some(id))
+  }
+
+  test("looking up a message by delivery receipt should return none if delivery don't receipts match") {
+    // Given
+    val (queueOperations, mockExecutor) = createQueueOperationsWithMockStorage(createQueueData("q1", MillisVisibilityTimeout(123L)))
+
+    val id = MessageId("abc")
+    val receipt1 = DeliveryReceipt.generate(id)
+    val receipt2 = DeliveryReceipt.generate(id)
+
+    val m = createMessageData(id.id, "z", MillisNextDelivery(123L), Some(receipt1))
+    mockExecutor.returnWhenCommandClass(classOf[LookupMessageCommand], Some(m))
+
+    // When
+    val msg = queueOperations.lookupMessage(receipt2)
+
+    // Then
+    msg must be (None)
+  }
+
   def createQueueOperationsWithMockStorage(queueData: QueueData): (QueueOperations, MockStorageCommandExecutor) = {
     val env = new NativeModule
       with StorageModule

diff --git a/core/src/test/scala/org/elasticmq/test/DataCreationHelpers.scala b/core/src/test/scala/org/elasticmq/test/DataCreationHelpers.scala
@@ -1,13 +1,14 @@
 package org.elasticmq.test
 
 import org.elasticmq.data.{MessageData, QueueData}
-import org.elasticmq.{MessageId, MillisNextDelivery, MillisVisibilityTimeout}
+import org.elasticmq.{DeliveryReceipt, MessageId, MillisNextDelivery, MillisVisibilityTimeout}
 import org.joda.time.{DateTime, Duration}
 
 trait DataCreationHelpers {
   def createQueueData(name: String, defaultVisibilityTimeout: MillisVisibilityTimeout) =
     QueueData(name, defaultVisibilityTimeout, Duration.ZERO, new DateTime(0), new DateTime(0))
 
-  def createMessageData(id: String, content: String, nextDelivery: MillisNextDelivery) =
-    MessageData(MessageId(id), None, content, nextDelivery, new DateTime(0))
+  def createMessageData(id: String, content: String, nextDelivery: MillisNextDelivery,
+                        deliveryReceipt: Option[DeliveryReceipt] = None) =
+    MessageData(MessageId(id), deliveryReceipt, content, nextDelivery, new DateTime(0))
 }