JSON response by default; Session duration could be 0; Fixes tests.

virtyaluk · Aug 27, 2016 · 895f2e6 · 895f2e6
1 parent d1716b4
commit 895f2e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/ModernDev.InTouch.Shared/InTouch.cs b/ModernDev.InTouch.Shared/InTouch.cs
@@ -509,7 +509,7 @@ public async Task<Response<T>> Request<T>(string methodName, Dictionary<string,
 
             CacheReqData(methodName, normalizedParams, isOpenMethod, path);
 
-            var json = await Post($"method/{methodName}.json", normalizedParams);
+            var json = await Post($"method/{methodName}", normalizedParams);
 
             return await Task.Run(() => ParseJsonReponse<T>(json, path));
         }

diff --git a/ModernDev.InTouch.Tests/Ex.cs b/ModernDev.InTouch.Tests/Ex.cs
@@ -22,7 +22,7 @@ public static class Ex
     {
         private static MockHttpMessageHandler WhenAndRespond(this MockHttpMessageHandler @this, string url, string json)
         {
-            @this.When($"/method/{url}.json").Respond("application/json", json);
+            @this.When($"/method/{url}").Respond("application/json", json);
 
             return @this;
         }

diff --git a/ModernDev.InTouch.Tests/GeneralClientTest.cs b/ModernDev.InTouch.Tests/GeneralClientTest.cs
@@ -50,7 +50,7 @@ public void SettingSessionData()
 
             Throws<ArgumentNullException>(() => _it1.SetSessionData("", 0));
             Throws<ArgumentException>(() => _it1.SetSessionData("access_token", 0));
-            Throws<ArgumentException>(() => _it1.SetSessionData("access_token", 1, 0));
+            Throws<ArgumentException>(() => _it1.SetSessionData("access_token", 1, -1));
             Throws<ArgumentNullException>(() => _it1.SetSessionData(null));
             DoesNotThrow(() => _it1.SetSessionData("access_token", 1));
             IsNotNull(_it1.Session, "_it1.Session != null");
@@ -113,7 +113,7 @@ public void Post()
 
             DoesNotThrowAsync(async () =>
             {
-                respJson = await _inTouch.Post("/method/test.json", _emptyDict);
+                respJson = await _inTouch.Post("/method/test", _emptyDict);
             });
 
             IsNotEmpty(respJson, "respJson");
@@ -144,11 +144,12 @@ public void Request()
             ThrowsAsync<NullReferenceException>(async () => await _inTouch.Request<bool>("test"));
             DoesNotThrowAsync(async () => await _inTouch.Request<bool>("test", isOpenMethod: true));
 
-            _inTouch.Session = new APISession("access_token", 12345, 0);
-
-            ThrowsAsync<InTouchException>(async () => await _inTouch.Request<bool>("test"));
-
-            _inTouch.SetApplicationSettings(12345, "super_secret");
+            /* 
+             * Next won't work since session duration could be equal to zero
+             * _inTouch.Session = new APISession("access_token", 12345, 0);
+             * ThrowsAsync<InTouchException>(async () => await _inTouch.Request<bool>("test"));
+             * _inTouch.SetApplicationSettings(12345, "super_secret");
+             */
         }
 
         [Test]