From 7929fe33209d106f1060a866cc7812ff54ea3728 Mon Sep 17 00:00:00 2001
From: hubera01 <andreas.huber@lawo.com>
Date: Mon, 25 Apr 2016 10:56:31 +0200
Subject: [PATCH] Add missing argument checks in Consumer<>.CreateAsync

References #21
---
 Lawo.EmberPlusSharp/Model/Consumer.cs         | 20 ++++++++++++++++++-
 Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs | 11 ++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/Lawo.EmberPlusSharp/Model/Consumer.cs b/Lawo.EmberPlusSharp/Model/Consumer.cs
index a367514a..e03a6cf2 100644
--- a/Lawo.EmberPlusSharp/Model/Consumer.cs
+++ b/Lawo.EmberPlusSharp/Model/Consumer.cs
@@ -174,7 +174,14 @@ public static Task<Consumer<TRoot>> CreateAsync(S101Client client, int timeout,
         /// <param name="slot">The slot to communicate with. All outgoing <see cref="S101Message"/> objects will have
         /// their <see cref="S101Message.Slot"/> property set to this value. Incoming messages are ignored, if their
         /// <see cref="S101Message.Slot"/> property does not match this value.</param>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="timeout"/> is less than -1.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// <list type="bullet">
+        /// <item><paramref name="timeout"/> is less than -1, and/or</item>
+        /// <item><paramref name="childrenRetrievalPolicy"/> is either less than
+        /// <see cref="ChildrenRetrievalPolicy.None"/> or greater than <see cref="ChildrenRetrievalPolicy.All"/>.
+        /// </item>
+        /// </list></exception>
+        /// <exception cref="ArgumentNullException"><paramref name="client"/> equals <c>null</c>.</exception>
         /// <exception cref="Exception">An exception was thrown from one of the callbacks passed to the
         /// <see cref="S101Client"/> constructor, see <see cref="Exception.Message"/> for more information.</exception>
         /// <exception cref="ModelException">The model does either not match the data sent by the provider, or the
@@ -201,6 +208,17 @@ public static Task<Consumer<TRoot>> CreateAsync(S101Client client, int timeout,
         public static async Task<Consumer<TRoot>> CreateAsync(
             S101Client client, int timeout, ChildrenRetrievalPolicy childrenRetrievalPolicy, byte slot)
         {
+            if (client == null)
+            {
+                throw new ArgumentNullException("client");
+            }
+
+            if ((childrenRetrievalPolicy < ChildrenRetrievalPolicy.None) ||
+                (childrenRetrievalPolicy > ChildrenRetrievalPolicy.All))
+            {
+                throw new ArgumentOutOfRangeException("childrenRetrievalPolicy");
+            }
+
             var result = new Consumer<TRoot>(client, timeout, childrenRetrievalPolicy, slot);
             await result.RetrieveChildrenAsync();
             result.ReceiveLoop();
diff --git a/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs b/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs
index f3ef7f2a..d2849df6 100644
--- a/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs
+++ b/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs
@@ -911,6 +911,16 @@ public void ExceptionTest()
             AsyncPump.Run(
                 async () =>
                 {
+                    await AssertThrowAsync<ArgumentNullException>(() => Consumer<SingleNodeRoot>.CreateAsync(null));
+
+                    using (var dummy = new S101Client(Stream.Null, Stream.Null.ReadAsync, Stream.Null.WriteAsync))
+                    {
+                        await AssertThrowAsync<ArgumentOutOfRangeException>(
+                            () => Consumer<SingleNodeRoot>.CreateAsync(dummy, -2),
+                            () => Consumer<SingleNodeRoot>.CreateAsync(dummy, 10000, ChildrenRetrievalPolicy.None - 1),
+                            () => Consumer<SingleNodeRoot>.CreateAsync(dummy, 10000, ChildrenRetrievalPolicy.All + 1));
+                    }
+
                     TestStandardExceptionConstructors<ModelException>();
                     await AssertThrowInCreateAsync<TimeoutException, SingleNodeRoot>(
                         "IncompleteLog1.xml",
@@ -1761,6 +1771,7 @@ private static int CountChildren(IEnumerable<IElement> children)
         private static void CheckValues(MainRoot root)
         {
             Assert.IsNull(root.Parent);
+            Assert.AreEqual(0, root.Number);
             Assert.AreEqual(string.Empty, root.Identifier);
             Assert.IsNull(root.Description);
             Assert.IsTrue(root.GetPath() == "/");