Merge pull request #3 from PSWinCom/release-2.0.11

Release 2.0.11

Author: herkit

PSWinCom.Gateway.Client.Tests/SendingMessages.cs

@@ -12,12 +12,6 @@ namespace PSWinCom.Gateway.Client.Tests
     public class SendingMessages : SendingMessagesBase
     {
 
-        [Test, ExpectedException(typeof(ArgumentException))]
-        public void Should_not_accept_an_empty_list_of_messages()
-        {
-            client.Send(new Sms[] { });
-        }
-
         [Test]
         public void Should_include_username_and_password()
         {
@@ -256,6 +250,16 @@ public void Should_handle_batch_status()
             response.Status.ShouldEqual(BatchStatus.Fail);
             response.StatusText.ShouldEqual("Username or password is incorrect");
         }
+
+        [Test]
+        public void Should_allow_sending_no_messages_for_authorization_purposes()
+        {
+            Transport_returns_batch_status("OK", "");
+            var response = client.Send();
+            response.Status.ShouldEqual(BatchStatus.Ok);
+            response.StatusText.ShouldEqual("");
+        }
+
     }
 
     [TestFixture]

PSWinCom.Gateway.Client/GatewayClientBase.cs

@@ -32,29 +32,37 @@ public virtual GatewayResponse Send(IEnumerable<Message> messages)
 
         public virtual GatewayResponse Send(string sessionData, IEnumerable<Message> messages)
         {
-            if (messages.Count() == 0)
-                throw new ArgumentException("Message list must contain at least one message", "messages");
-
             var result = new GatewayResponse();
 
-            var thisBatchSize = BatchSize > 0 ? BatchSize : messages.Count();
 
-            var skip = 0;
-            while (messages.Count() > skip)
+            if (messages.Count() == 0)
             {
-                var messageList = messages.Skip(skip).Take(thisBatchSize).ToList();
-                var transportResult = Transport.Send(BuildPayload(sessionData, messageList));
-                var batchResult = GetSendResult(messageList, transportResult);
-
-                if (batchResult.Status == BatchStatus.Ok)
-                    result.Results = result.Results == null ? batchResult.Results : result.Results.Union(batchResult.Results);
-                else
+                var transportResult = Transport.Send(BuildPayload(sessionData, messages));
+                var authResult = GetSendResult(messages, transportResult);
+                result.Status = authResult.Status;
+                result.StatusText = authResult.StatusText;
+            }
+            else
+            {
+                var thisBatchSize = BatchSize > 0 ? BatchSize : messages.Count();
+                var skip = 0;
+                while (messages.Count() > skip)
                 {
-                    result.Status = batchResult.Status;
-                    result.StatusText = batchResult.StatusText;
+                    var messageList = messages.Skip(skip).Take(thisBatchSize).ToList();
+                    var transportResult = Transport.Send(BuildPayload(sessionData, messageList));
+                    var batchResult = GetSendResult(messageList, transportResult);
+
+                    if (batchResult.Status == BatchStatus.Ok)
+                        result.Results = result.Results == null ? batchResult.Results : result.Results.Union(batchResult.Results);
+                    else
+                    {
+                        result.Status = batchResult.Status;
+                        result.StatusText = batchResult.StatusText;
+                    }
+
+                    skip += thisBatchSize;
                 }
 
-                skip += thisBatchSize;
             }
 
             return result;
@@ -76,12 +84,11 @@ protected XDocument BuildPayload(string sessionData, IEnumerable<Message> messag
         private IEnumerable<XElement> GetMessageElements(IEnumerable<Message> messages)
         {
             var numInSession = 1;
-            foreach (var msg in messages)
+            return messages.Select((msg) =>
             {
                 msg.NumInSession = numInSession++;
-                XElement msgElement = new XElement("MSG", GetMessagePropertyElements(msg));
-                yield return msgElement;
-            }
+                return new XElement("MSG", GetMessagePropertyElements(msg));
+            });
         }
 
         private IEnumerable<XElement> GetMessagePropertyElements(Message msg)

version.txt

@@ -1,3 +1,4 @@
 2.0.8
 2.0.9
 2.0.10
+2.0.11