Merge pull request #12 from uneecorn/ReworkUnicornConfig

Tyler Mendes de Brito · web-flow · commit 36ceaf4597de · 2019-10-24T20:45:29.000-03:00
rework config
diff --git a/Tests/HttUnicorn.Tests/DeleteTest.cs b/Tests/HttUnicorn.Tests/DeleteTest.cs
@@ -6,6 +6,7 @@
 using HttUnicorn.Tests.Model;
 using HttUnicorn.Tests.Util;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static HttUnicorn.Config.UnicornConfig;
 
 namespace HttUnicorn.Tests
 {
@@ -15,20 +16,20 @@ public class DeleteTest
         [TestMethod]
         public void DeleteResponse()
         {
-            List<Todo> oldTodos = new Unicorn(new UnicornConfig(Constants.URL))
+            List<Todo> oldTodos = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .GetModelAsync<List<Todo>>().Result;
             Assert.IsTrue(oldTodos != null && oldTodos.Count > 0);
 
             int oldCount = oldTodos.Count;
 
             Todo first = oldTodos.FirstOrDefault();
 
-            HttpResponseMessage result = new Unicorn(new UnicornConfig(Constants.URL))
+            HttpResponseMessage result = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .DeleteResponseAsync(first.Id).Result;
 
             Assert.IsTrue(result.IsSuccessStatusCode);
 
-            List<Todo> newTodos = new Unicorn(new UnicornConfig(Constants.URL))
+            List<Todo> newTodos = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .GetModelAsync<List<Todo>>().Result;
 
             Assert.IsTrue(newTodos != null && newTodos.Count > 0);
@@ -41,18 +42,18 @@ public void DeleteResponse()
         [TestMethod]
         public void DeleteJson()
         {
-            List<Todo> oldTodos = new Unicorn(new UnicornConfig(Constants.URL))
+            List<Todo> oldTodos = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .GetModelAsync<List<Todo>>().Result;
             Assert.IsTrue(oldTodos != null && oldTodos.Count > 0);
 
             int oldCount = oldTodos.Count;
 
             Todo first = oldTodos.FirstOrDefault();
 
-            string result = new Unicorn(new UnicornConfig(Constants.URL))
+            string result = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .DeleteStringAsync(first.Id).Result;
 
-            List<Todo> newTodos = new Unicorn(new UnicornConfig(Constants.URL))
+            List<Todo> newTodos = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .GetModelAsync<List<Todo>>().Result;
 
             Assert.IsTrue(newTodos != null && newTodos.Count > 0);
diff --git a/Tests/HttUnicorn.Tests/GetTest.cs b/Tests/HttUnicorn.Tests/GetTest.cs
@@ -6,6 +6,7 @@
 using HttUnicorn.Tests.Model;
 using HttUnicorn.Tests.Util;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static HttUnicorn.Config.UnicornConfig;
 
 namespace HttUnicorn.Tests
 {
@@ -16,7 +17,7 @@ public class GetTest
         public void GetResponse()
         {
             using (HttpResponseMessage responseMessage =
-                new Unicorn(new UnicornConfig(Constants.URL))
+                new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .GetResponseAsync().Result)
             {
                 Assert.IsTrue(responseMessage.IsSuccessStatusCode);
@@ -26,18 +27,18 @@ public void GetResponse()
         [TestMethod]
         public void GetString()
         {
-            string jsonString = new Unicorn(new UnicornConfig(Constants.URL)).GetStringAync().Result;
+            string jsonString = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL)).GetStringAync().Result;
             Assert.IsTrue(jsonString.Length > 0);
         }
 
         [TestMethod]
         public void GetModel()
         {
-            List<Todo> todos = new Unicorn(new UnicornConfig(Constants.URL)).GetModelAsync<List<Todo>>().Result;
+            List<Todo> todos = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL)).GetModelAsync<List<Todo>>().Result;
 
             Assert.IsTrue(todos != null && todos.Count > 0);
 
-            Todo model = new Unicorn(new UnicornConfig(Constants.URL + "/" + todos.FirstOrDefault().Id)).GetModelAsync<Todo>().Result;
+            Todo model = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL + "/" + todos.FirstOrDefault().Id)).GetModelAsync<Todo>().Result;
             Assert.IsNotNull(model);
             Assert.IsTrue(model.Id > 0);
         }
diff --git a/Tests/HttUnicorn.Tests/PostTest.cs b/Tests/HttUnicorn.Tests/PostTest.cs
@@ -4,6 +4,7 @@
 using HttUnicorn.Tests.Model;
 using HttUnicorn.Tests.Util;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static HttUnicorn.Config.UnicornConfig;
 
 namespace HttUnicorn.Tests
 {
@@ -15,7 +16,7 @@ public void PostResponse()
         {
 
             using (HttpResponseMessage result =
-                new Unicorn(new UnicornConfig(Constants.URL))
+                new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .PostRespnseAsync(new Todo
                 {
                     Completed = true,
@@ -30,7 +31,7 @@ public void PostResponse()
         [TestMethod]
         public void PostString()
         {
-            string result = new Unicorn(new UnicornConfig(Constants.URL))
+            string result = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .PostStringAsync(new Todo
                 {
                     Completed = true,
@@ -44,7 +45,7 @@ public void PostString()
         [TestMethod]
         public void PostModel()
         {
-            Todo result = new Unicorn(new UnicornConfig(Constants.URL)).PostModelAsync<Todo, Todo>(new Todo
+            Todo result = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL)).PostModelAsync<Todo, Todo>(new Todo
             {
                 Completed = true,
                 Title = "My todo",
diff --git a/Tests/HttUnicorn.Tests/PutTest.cs b/Tests/HttUnicorn.Tests/PutTest.cs
@@ -5,6 +5,7 @@
 using HttUnicorn.Tests.Model;
 using HttUnicorn.Tests.Util;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static HttUnicorn.Config.UnicornConfig;
 
 namespace HttUnicorn.Tests
 {
@@ -15,14 +16,14 @@ public class PutTest
         public void PutResponse()
         {
             string url = Constants.URL + "/21";
-            Todo oldModel = new Unicorn(new UnicornConfig(url)).GetModelAsync<Todo>().Result;
+            Todo oldModel = new Unicorn(UnicornConfigFactory.NewInstance(url)).GetModelAsync<Todo>().Result;
             Assert.IsNotNull(oldModel);
             Assert.IsTrue(oldModel.Id > 0);
 
             oldModel.Title = "My edited todo";
 
             using (HttpResponseMessage responseMessage =
-                new Unicorn(new UnicornConfig(Constants.URL))
+                new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .PutResponseAsync(oldModel, oldModel.Id).Result)
             {
                 Assert.IsTrue(responseMessage.IsSuccessStatusCode);
@@ -37,14 +38,14 @@ public void PutResponse()
         public void PutString()
         {
             string urlGet = Constants.URL + "/22";
-            Todo oldModel = new Unicorn(new UnicornConfig(urlGet))
+            Todo oldModel = new Unicorn(UnicornConfigFactory.NewInstance(urlGet))
                 .GetModelAsync<Todo>().Result;
             Assert.IsNotNull(oldModel);
             Assert.IsTrue(oldModel.Id > 0);
 
             oldModel.Title = "My edited todo";
 
-            string stringResult = new Unicorn(new UnicornConfig(Constants.URL))
+            string stringResult = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .PutStringAsync(oldModel, oldModel.Id).Result;
 
             Todo newModel = Serializer.Deserialize<Todo>(stringResult);
@@ -57,14 +58,14 @@ public void PutString()
         public void PutModel()
         {
             string urlGet = Constants.URL + "/23";
-            Todo oldModel = new Unicorn(new UnicornConfig(urlGet))
+            Todo oldModel = new Unicorn(UnicornConfigFactory.NewInstance(urlGet))
                             .GetModelAsync<Todo>().Result;
             Assert.IsNotNull(oldModel);
             Assert.IsTrue(oldModel.Id > 0);
 
             oldModel.Title = "My edited todo";
 
-            Todo newModel = new Unicorn(new UnicornConfig(Constants.URL))
+            Todo newModel = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))
                 .PutModelAsync<Todo, Todo>(oldModel, oldModel.Id).Result;
 
             Assert.IsNotNull(newModel);
diff --git a/src/HttUnicorn/HttUnicorn/Config/UnicornConfig.cs b/src/HttUnicorn/HttUnicorn/Config/UnicornConfig.cs
@@ -34,69 +34,31 @@ private set
         /// </summary>
         public IList<UnicornHeader> Headers { get; private set; }
 
-        /// <summary>
-        /// Creates a new config object with default timeout (20 seconds),
-        /// default header list (empty list), specified url and method.
-        /// </summary>
-        /// <param name="url">Request's url</param>
-        public UnicornConfig(string url)
-        {
-            Url = url;
-            Timeout = Constants.DEFAULT_TIMEOUT_VALUE;
-            Headers = Constants.DEFAULT_HEADERS;
-        }
-
-        /// <summary>
-        /// Creates a new config object with default header list (empty list),
-        /// specified url, method and timeout
-        /// </summary>
-        /// <param name="url">Request's url</param>
-        /// <param name="timeout">Request's timeout</param>
-        public UnicornConfig(string url, TimeSpan timeout)
-        {
-            Url = url;
-            Timeout = timeout;
-            Headers = Constants.DEFAULT_HEADERS;
-        }
-
-        /// <summary>
-        /// Creates a new config object with default header list (empty list),
-        /// specified url, method and timeout
-        /// </summary>
-        /// <param name="url">Request's url</param>
-        /// <param name="timeout">Request's timeout</param>
-        public UnicornConfig(string url, short timeoutSeconds)
+        public static class UnicornConfigFactory
         {
-            Url = url;
-            Timeout = TimeSpan.FromSeconds(timeoutSeconds);
-            Headers = Constants.DEFAULT_HEADERS;
-        }
+            /// <summary>
+            /// Creates a new config object
+            /// </summary>
+            /// <param name="url">Request's url</param>
+            /// <param name="timeout">Request's timeout</param>
+            /// <param name="headers">Request's headers</param>
+            /// <returns>New instance of UnicornConfig class</returns>
+            public static UnicornConfig NewInstance(string url,
+                TimeSpan? timeout = null,
+                IList<UnicornHeader> headers = null)
+            {
+                return new UnicornConfig
+                {
+                    Url = url,
+                    Timeout = GetTimeout(timeout),
+                    Headers = GetHeaders(headers),
+                };
+            }
 
-        /// <summary>
-        /// Creates a new config object with default timeout (20 seconds),
-        /// specified url, method and header list
-        /// </summary>
-        /// <param name="url">Request's url</param>
-        /// <param name="headers">Request's headers</param>
-        public UnicornConfig(string url, IList<UnicornHeader> headers)
-        {
-            Url = url;
-            Headers = headers;
-            Timeout = Constants.DEFAULT_TIMEOUT_VALUE;
+            static TimeSpan GetTimeout(TimeSpan? timeout = null) => timeout ?? Constants.DEFAULT_TIMEOUT_VALUE;
+            static IList<UnicornHeader> GetHeaders(IList<UnicornHeader> headers = null) => headers ?? Constants.DEFAULT_HEADERS;
         }
 
-        /// <summary>
-        /// Creates a new config object with specified url, 
-        /// method, timeout and header list
-        /// </summary>
-        /// <param name="url">Request's url</param>
-        /// <param name="timeout">Request's timeout</param>
-        /// <param name="headers">Request's headers</param>
-        public UnicornConfig(string url, TimeSpan timeout, IList<UnicornHeader> headers)
-        {
-            Url = url;
-            Timeout = timeout;
-            Headers = headers;
-        }
+        private UnicornConfig() { }
     }
 }
diff --git a/src/HttUnicorn/HttUnicorn/Request/UnicornRequest.cs b/src/HttUnicorn/HttUnicorn/Request/UnicornRequest.cs

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using HttUnicorn.Tests.Model;`
`7`	`7`	`using HttUnicorn.Tests.Util;`
`8`	`8`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
	`9`	`+using static HttUnicorn.Config.UnicornConfig;`
`9`	`10`
`10`	`11`	`namespace HttUnicorn.Tests`
`11`	`12`	`{`
`@@ -16,7 +17,7 @@ public class GetTest`
`16`	`17`	`public void GetResponse()`
`17`	`18`	`{`
`18`	`19`	`using (HttpResponseMessage responseMessage =`
`19`		`- new Unicorn(new UnicornConfig(Constants.URL))`
	`20`	`+ new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))`
`20`	`21`	`.GetResponseAsync().Result)`
`21`	`22`	`{`
`22`	`23`	`Assert.IsTrue(responseMessage.IsSuccessStatusCode);`
`@@ -26,18 +27,18 @@ public void GetResponse()`
`26`	`27`	`[TestMethod]`
`27`	`28`	`public void GetString()`
`28`	`29`	`{`
`29`		`- string jsonString = new Unicorn(new UnicornConfig(Constants.URL)).GetStringAync().Result;`
	`30`	`+ string jsonString = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL)).GetStringAync().Result;`
`30`	`31`	`Assert.IsTrue(jsonString.Length > 0);`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`[TestMethod]`
`34`	`35`	`public void GetModel()`
`35`	`36`	`{`
`36`		`- List<Todo> todos = new Unicorn(new UnicornConfig(Constants.URL)).GetModelAsync<List<Todo>>().Result;`
	`37`	`+ List<Todo> todos = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL)).GetModelAsync<List<Todo>>().Result;`
`37`	`38`
`38`	`39`	`Assert.IsTrue(todos != null && todos.Count > 0);`
`39`	`40`
`40`		`- Todo model = new Unicorn(new UnicornConfig(Constants.URL + "/" + todos.FirstOrDefault().Id)).GetModelAsync<Todo>().Result;`
	`41`	`+ Todo model = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL + "/" + todos.FirstOrDefault().Id)).GetModelAsync<Todo>().Result;`
`41`	`42`	`Assert.IsNotNull(model);`
`42`	`43`	`Assert.IsTrue(model.Id > 0);`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using HttUnicorn.Tests.Model;`
`5`	`5`	`using HttUnicorn.Tests.Util;`
`6`	`6`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
	`7`	`+using static HttUnicorn.Config.UnicornConfig;`
`7`	`8`
`8`	`9`	`namespace HttUnicorn.Tests`
`9`	`10`	`{`
`@@ -15,7 +16,7 @@ public void PostResponse()`
`15`	`16`	`{`
`16`	`17`
`17`	`18`	`using (HttpResponseMessage result =`
`18`		`- new Unicorn(new UnicornConfig(Constants.URL))`
	`19`	`+ new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))`
`19`	`20`	`.PostRespnseAsync(new Todo`
`20`	`21`	`{`
`21`	`22`	`Completed = true,`
`@@ -30,7 +31,7 @@ public void PostResponse()`
`30`	`31`	`[TestMethod]`
`31`	`32`	`public void PostString()`
`32`	`33`	`{`
`33`		`- string result = new Unicorn(new UnicornConfig(Constants.URL))`
	`34`	`+ string result = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL))`
`34`	`35`	`.PostStringAsync(new Todo`
`35`	`36`	`{`
`36`	`37`	`Completed = true,`
`@@ -44,7 +45,7 @@ public void PostString()`
`44`	`45`	`[TestMethod]`
`45`	`46`	`public void PostModel()`
`46`	`47`	`{`
`47`		`- Todo result = new Unicorn(new UnicornConfig(Constants.URL)).PostModelAsync<Todo, Todo>(new Todo`
	`48`	`+ Todo result = new Unicorn(UnicornConfigFactory.NewInstance(Constants.URL)).PostModelAsync<Todo, Todo>(new Todo`
`48`	`49`	`{`
`49`	`50`	`Completed = true,`
`50`	`51`	`Title = "My todo",`