Fix & test logic for autogenerated messageId

Author: Andrew Keynes

src/Message/SecureXMLAbstractRequest.php

@@ -31,9 +31,11 @@ public function setMessageId($value)
      */
     public function getMessageId()
     {
-        return empty($this->getParameter('messageId'))
-            ? substr(md5(microtime()), 0, 30)
-            : $this->getParameter('messageId');
+        if (empty($this->getParameter('messageId'))) {
+            $this->setMessageId(substr(md5(microtime()), 0, 30));
+        }
+
+        return $this->getParameter('messageId');
     }
 
     public function sendData($data)

tests/Message/SecureXMLAuthorizeRequestTest.php

@@ -96,4 +96,16 @@ public function testInvalidMerchantIDFailure()
         $this->assertSame('504', $response->getCode());
         $this->assertSame('Invalid merchant ID', $response->getMessage());
     }
+
+    public function testSetMessageId()
+    {
+        $this->request->setMessageId('message_identifier_here');
+        $this->assertSame('message_identifier_here', $this->request->getMessageId());
+    }
+
+    public function testAutogeneratedMessageId()
+    {
+        $this->assertNotNull($this->request->getMessageId());
+        $this->assertSame(30, strlen($this->request->getMessageId()));
+    }
 }