Improving file reading + Adding ability to split configuration into several files

redisdev · redisdev · commit 25f650f4f44b · 2019-05-04T01:10:19.000+02:00
diff --git a/Example/App/App.csproj b/Example/App/App.csproj
@@ -9,14 +9,33 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <None Update="api.cfg.json">
+    <None Update="api2.cfg.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="DownloadFile.txt">
+    <None Update="Config\Api\api.cfg.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Config\Api\User\usersApi.cfg.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Config\Api\User\Response\getUserById.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Src\FakeApi\FakeApi.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Config\" />
+    <Folder Include="Config\Api\" />
+    <Folder Include="Config\Api\User\" />
+    <Folder Include="Config\Api\Order\" />
+    <Folder Include="Config\Api\User\Response\" />
+    <Folder Include="Config\Api\Order\Response\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Program.cs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
 </Project>
diff --git a/Example/App/Config/Api/Order/ordersApi.cfg.json b/Example/App/Config/Api/Order/ordersApi.cfg.json
@@ -0,0 +1,29 @@
+﻿{
+  "apis": [
+    {
+      "url": "https://localhost/api/orders/{orderId}",
+      "responses": [
+        {
+          "active": 1,
+          "file": "Response/User/getOrderById.json"
+        },
+        {
+          "active": 1,
+          "method": "PUT",
+          "file": "Response/User/putOrder.json"
+        },
+        {
+          "active": 1,
+          "method": "DELETE",
+          "httpCode": 400,
+          "customApiException": {
+            "fullTypeName": "App.CustomWebException, App",
+            "constructorArgs": [
+              "Order not found"
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/Example/App/Config/Api/User/Response/getUserById.json b/Example/App/Config/Api/User/Response/getUserById.json
@@ -0,0 +1,5 @@
+﻿{
+  "id": 128,
+  "firstname": "john",
+  "lastname": "doe"
+}
diff --git a/Example/App/Config/Api/User/Response/postUser1.json b/Example/App/Config/Api/User/Response/postUser1.json
@@ -0,0 +1,5 @@
+﻿{
+  "id": 128,
+  "firstname": "john",
+  "lastname": "doe"
+}
diff --git a/Example/App/Config/Api/User/Response/postUser2.json b/Example/App/Config/Api/User/Response/postUser2.json
@@ -0,0 +1,5 @@
+﻿{
+  "id": 256,
+  "firstname": "kerry",
+  "lastname": "king"
+}
diff --git a/Example/App/Config/Api/User/Response/searchUsersPage0.json b/Example/App/Config/Api/User/Response/searchUsersPage0.json
@@ -0,0 +1,14 @@
+﻿{
+  "results": [
+    {
+      "id": 128,
+      "firstname": "john",
+      "lastname": "doe"
+    },
+    {
+      "id": 256,
+      "firstname": "kerry",
+      "lastname": "king"
+    }
+  ]
+}
diff --git a/Example/App/Config/Api/User/Response/searchUsersPage1.json b/Example/App/Config/Api/User/Response/searchUsersPage1.json
@@ -0,0 +1,14 @@
+﻿{
+  "results": [
+    {
+      "userId": 512,
+      "firstname": "paul",
+      "lastname": "mc cartney"
+    },
+    {
+      "id": 1024,
+      "firstname": "quentin",
+      "lastname": "tarantino"
+    }
+  ]
+}
diff --git a/Example/App/Config/Api/User/usersApi.cfg.json b/Example/App/Config/Api/User/usersApi.cfg.json
@@ -0,0 +1,46 @@
+﻿{
+  "apis": [
+    {
+      "url": "https://localhost/api/users/{userId}",
+      "responses": [
+        {
+          "active": 1,
+          "file": "Config/Api/User/Response/getUserById.json"
+        },
+        {
+          "active": 1,
+          "method": "PUT",
+          "file": "Config/Api/User/Response/putUser.json"
+        }
+      ]
+    },
+    {
+      "url": "https://localhost/api/users",
+      "responses": [
+        {
+          "active": 1,
+          "method": "POST",
+          "file": "Config/Api/User/Response/postUser1.json"
+        },
+        {
+          "active": 0,
+          "method": "POST",
+          "file": "Config/Api/User/Response/postUser2.json"
+        }
+      ]
+    },
+    {
+      "url": "https://localhost/api/users?pIndex={0}&pSize={1}",
+      "responses": [
+        {
+          "active": 1,
+          "file": "Config/Api/User/Response/searchUsersPage0.json"
+        },
+        {
+          "active": 0,
+          "file": "Config/Api/User/Response/searchUsersPage1.json"
+        }
+      ]
+    }
+  ]
+}
diff --git a/Example/App/Config/Api/api.cfg.json b/Example/App/Config/Api/api.cfg.json
@@ -1,7 +1,10 @@
 ﻿{
-  "defaultDelay": 500,
+  "defaultDelay": 250,
   "defaultHttpCode": 200,
   "defaultMethod": "GET",
+  "apisDirectories": [
+      "Config/Api/User"
+  ],
   "apis": [
     {
       "url": "http://localhost:8080/api/users/{idUser}",
diff --git a/Example/App/DownloadFile.txt b/Example/App/DownloadFile.txt
diff --git a/Example/App/OrderAddress.cs b/Example/App/OrderAddress.cs
diff --git a/Example/App/Program.cs b/Example/App/Program.cs
@@ -13,98 +13,28 @@ static void Main(string[] args)
         {
             var serviceCollection = new ServiceCollection();
 
-#if DEBUG
             serviceCollection.AddScoped<IHttpRequester, FakeHttpRequester>(provider =>
             {
-                return new FakeHttpRequester("api.cfg.json");
+                return new FakeHttpRequester("Config/Api/api.cfg.json");
             });
-#endif
 
             var serviceProvider = serviceCollection.BuildServiceProvider();
             var httpRequester = serviceProvider.GetService<IHttpRequester>();
 
-            //Get user request
-            var getUserRequest = (HttpWebRequest)WebRequest.Create("http://localhost:8080/api/users/56");
-            var getUserResponse = httpRequester.GetResponse(getUserRequest);
+            //Users apis
+            var getUserByIdRequest = WebRequest.Create("https://localhost/api/users/128");
+            var getUserByIdResponse = httpRequester.GetResponse(getUserByIdRequest);
 
-            using (var stream = new StreamReader(getUserResponse.GetResponseStream()))
-            {
-                var data = stream.ReadToEnd();
-                var user = JsonConvert.DeserializeObject<User>(data);
-                Console.WriteLine($"json data from {getUserRequest.RequestUri}");
-                Console.WriteLine($"Firstname : {user.Firstname} | Lastname : {user.Lastname} | Id : {user.Id}");
-            }
-
-            Console.WriteLine();
-
-            //Get order address
-            var getOrderAddressRequest = (HttpWebRequest)WebRequest.Create("http://localhost:8080/api/orders/666/addresses/2");
-            var getOrderAddressResponse = httpRequester.GetResponse(getOrderAddressRequest);
-
-            using (var stream = new StreamReader(getOrderAddressResponse.GetResponseStream()))
-            {
-                var data = stream.ReadToEnd();
-                var orderAddress = JsonConvert.DeserializeObject<OrderAddress>(data);
-                Console.WriteLine($"json data from {getOrderAddressRequest.RequestUri}");
-                Console.WriteLine($"OrderId : {orderAddress.OrderId} | Street Address : {orderAddress.StreetAddress} | Id : {orderAddress.City}");
-
-                foreach (var cookie in getOrderAddressResponse.Cookies)
-                {
-                    Console.WriteLine($"Cookie: {cookie}");
-                }
+            using (var stream = new StreamReader(getUserByIdResponse.GetResponseStream()))
+            {
+                var serializer = new JsonSerializer();
+                var user = (User)serializer.Deserialize(stream, typeof(User));
 
-                foreach (var header in getOrderAddressResponse.Headers)
-                {
-                    Console.WriteLine($"Header: {header}");
-                }
-            }
-
-            Console.WriteLine();
-
-            //Get error
-            var getErrorRequest = (HttpWebRequest)WebRequest.Create("http://localhost:8080/api/ad/56");
-
-            try
-            {
-                Console.WriteLine($"Send request to {getErrorRequest.RequestUri}");
-                var getErrorResponse = httpRequester.GetResponse(getErrorRequest);
-            }
-            catch (WebException ex)
-            {
-                Console.WriteLine($"HttpErrorCode : {ex.Status} | Message : {ex.Message}");
+                Console.WriteLine("Data from https://localhost/api/users/128 : ");
+                Console.WriteLine($"UserId : {user.Id} | Firstname : {user.Firstname} | Lastname : {user.Lastname}");
             }
 
-            Console.WriteLine();
-
-            //Get custom error
-            var getCustomErrorRequest = (HttpWebRequest)WebRequest.Create("http://localhost:8080/api/ad/900/custom-error");
-
-            try
-            {
-                Console.WriteLine($"Send request to {getCustomErrorRequest.RequestUri}");
-                var getCustomErrorResponse = httpRequester.GetResponse(getCustomErrorRequest);
-            }
-            catch (CustomWebException ex)
-            {
-                Console.WriteLine($"Message : {ex.Message}");
-            }
-
-            Console.WriteLine();
-
-            //Get file
-            var getFileRequest = (HttpWebRequest)WebRequest.Create("http://localhost:8080/api/get-file");
-            var getFileResponse = httpRequester.GetResponse(getFileRequest);
-
-            using (var stream = new StreamReader(getFileResponse.GetResponseStream()))
-            {
-                Console.WriteLine($"Get file from {getFileRequest.RequestUri}");
-                var data = stream.ReadToEnd();
-                Console.WriteLine($"Data from file : {data}");
-            }
-
-            Console.WriteLine();
             Console.Read();
         }
-
     }
 }
diff --git a/FakeApiTest/ConfigIOTests.cs b/FakeApiTest/ConfigIOTests.cs
@@ -39,7 +39,7 @@ public void GetConfigShouldThrowExceptionWhenConfigIsNull()
             });
 
             //Assert
-            Assert.AreEqual("An error occured when deserialized file content", ex.Message);
+            Assert.AreEqual("An error occured when deserialized file BadConfigFile.json", ex.Message);
         }
 
         [TestMethod]
diff --git a/FakeApiTest/FakeHttpRequesterTests.cs b/FakeApiTest/FakeHttpRequesterTests.cs
@@ -325,7 +325,7 @@ public void ShouldThrowExceptionWhenFileNotExists()
             });
 
             //Assert
-            Assert.AreEqual("File FakePath nor exists", exception.Message);
+            Assert.AreEqual("File FakePath not exists", exception.Message);
         }
     }
 }
diff --git a/Src/FakeApi/Config.cs b/Src/FakeApi/Config.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Net;
 using Newtonsoft.Json;
+using System.IO;
 
 namespace FakeApi
 {
@@ -37,6 +38,8 @@ internal class Config
 
         public IEnumerable<ApiConfig> Apis { get; set; }
 
+        public IEnumerable<string> ApisDirectories { get; set; }
+
         [JsonIgnore]
         public CookieCollection CookieCollection
         {
diff --git a/Src/FakeApi/ConfigIO.cs b/Src/FakeApi/ConfigIO.cs
diff --git a/Src/FakeApi/FakeHttpRequester.cs b/Src/FakeApi/FakeHttpRequester.cs

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`{`
`2`		`- "defaultDelay": 500,`
	`2`	`+ "defaultDelay": 250,`
`3`	`3`	`"defaultHttpCode": 200,`
`4`	`4`	`"defaultMethod": "GET",`
	`5`	`+ "apisDirectories": [`
	`6`	`+ "Config/Api/User"`
	`7`	`+ ],`
`5`	`8`	`"apis": [`
`6`	`9`	`{`
`7`	`10`	`"url": "http://localhost:8080/api/users/{idUser}",`