Continue to construct feature and tests.

8 files changed, 137 insertions, 29 deletions

diff --git a/Timeline.Tests/Controllers/UserControllerTest.cs b/Timeline.Tests/Controllers/UserControllerTest.cs
index a9cce970..83b8cdcf 100644
--- a/Timeline.Tests/Controllers/UserControllerTest.cs
+++ b/Timeline.Tests/Controllers/UserControllerTest.cs
@@ -13,7 +13,6 @@ using Timeline.Models.Http;
 using Timeline.Services;

 using Timeline.Tests.Helpers;

 using Timeline.Tests.Mock.Data;

-using Timeline.Tests.Mock.Services;

 using Xunit;

 using static Timeline.ErrorCodes.Http.User;

 

diff --git a/Timeline.Tests/Controllers/UserDetailControllerTest.cs b/Timeline.Tests/Controllers/UserDetailControllerTest.cs
index 99341c40..ffd88790 100644
--- a/Timeline.Tests/Controllers/UserDetailControllerTest.cs
+++ b/Timeline.Tests/Controllers/UserDetailControllerTest.cs
@@ -1,4 +1,5 @@
 using FluentAssertions;

+using Microsoft.AspNetCore.Authorization;

 using Microsoft.AspNetCore.Mvc;

 using Moq;

 using System;

@@ -42,6 +43,8 @@ namespace Timeline.Tests.Controllers
 

             var putNickname = typeof(UserDetailController).GetMethod(nameof(UserDetailController.PutNickname));

             putNickname.Should().BeDecoratedWith<HttpPutAttribute>()

+                .And.BeDecoratedWith<AuthorizeAttribute>()

+                .And.BeDecoratedWith<SelfOrAdminAttribute>()

                 .And.BeDecoratedWith<CatchUserNotExistExceptionAttribute>();

             putNickname.GetParameter("username").Should().BeDecoratedWith<UsernameAttribute>()

                 .And.BeDecoratedWith<FromRouteAttribute>();

@@ -53,6 +56,8 @@ namespace Timeline.Tests.Controllers
 

             var deleteNickname = typeof(UserDetailController).GetMethod(nameof(UserDetailController.DeleteNickname));

             deleteNickname.Should().BeDecoratedWith<HttpDeleteAttribute>()

+                .And.BeDecoratedWith<AuthorizeAttribute>()

+                .And.BeDecoratedWith<SelfOrAdminAttribute>()

                 .And.BeDecoratedWith<CatchUserNotExistExceptionAttribute>();

             deleteNickname.GetParameter("username").Should().BeDecoratedWith<UsernameAttribute>()

                 .And.BeDecoratedWith<FromRouteAttribute>();

diff --git a/Timeline.Tests/Helpers/HttpClientExtensions.cs b/Timeline.Tests/Helpers/HttpClientExtensions.cs
index 38641f90..6513bbe7 100644
--- a/Timeline.Tests/Helpers/HttpClientExtensions.cs
+++ b/Timeline.Tests/Helpers/HttpClientExtensions.cs
@@ -35,5 +35,17 @@ namespace Timeline.Tests.Helpers
             content.Headers.ContentType = new MediaTypeHeaderValue(mimeType);

             return client.PutAsync(url, content);

         }

+

+        public static Task<HttpResponseMessage> PutStringAsync(this HttpClient client, string url, string body, string mimeType = null)

+        {

+            return client.PutStringAsync(new Uri(url, UriKind.RelativeOrAbsolute), body, mimeType);

+        }

+

+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope")]

+        public static Task<HttpResponseMessage> PutStringAsync(this HttpClient client, Uri url, string body, string mimeType = null)

+        {

+            var content = new StringContent(body, Encoding.UTF8, mimeType ?? MediaTypeNames.Text.Plain);

+            return client.PutAsync(url, content);

+        }

     }

 }

diff --git a/Timeline.Tests/Helpers/ResponseAssertions.cs b/Timeline.Tests/Helpers/ResponseAssertions.cs
index 08f10b2b..db86ff59 100644
--- a/Timeline.Tests/Helpers/ResponseAssertions.cs
+++ b/Timeline.Tests/Helpers/ResponseAssertions.cs
@@ -91,6 +91,11 @@ namespace Timeline.Tests.Helpers
             var result = JsonConvert.DeserializeObject<T>(body);

             return new AndWhichConstraint<HttpResponseMessage, T>(Subject, result);

         }

+

+        internal void HaveStatusCode(object statusCode)

+        {

+            throw new NotImplementedException();

+        }

     }

 

     public static class AssertionResponseExtensions

diff --git a/Timeline.Tests/IntegratedTests/UserAvatarTest.cs b/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
index ad2e11df..b338665e 100644
--- a/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
+++ b/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
@@ -22,12 +22,12 @@ using static Timeline.ErrorCodes.Http.UserAvatar;
 

 namespace Timeline.Tests.IntegratedTests

 {

-    public class UserAvatarUnitTest : IClassFixture<WebApplicationFactory<Startup>>, IDisposable

+    public class UserAvatarTest : IClassFixture<WebApplicationFactory<Startup>>, IDisposable

     {

         private readonly TestApplication _testApp;

         private readonly WebApplicationFactory<Startup> _factory;

 

-        public UserAvatarUnitTest(WebApplicationFactory<Startup> factory)

+        public UserAvatarTest(WebApplicationFactory<Startup> factory)

         {

             _testApp = new TestApplication(factory);

             _factory = _testApp.Factory;

diff --git a/Timeline.Tests/IntegratedTests/UserDetailTest.cs b/Timeline.Tests/IntegratedTests/UserDetailTest.cs
new file mode 100644
index 00000000..ff2c03a5
--- /dev/null
+++ b/Timeline.Tests/IntegratedTests/UserDetailTest.cs
@@ -0,0 +1,83 @@
+using FluentAssertions;

+using Microsoft.AspNetCore.Mvc.Testing;

+using System;

+using System.Net;

+using System.Threading.Tasks;

+using Timeline.Tests.Helpers;

+using Timeline.Tests.Helpers.Authentication;

+using Timeline.Tests.Mock.Data;

+using Xunit;

+

+namespace Timeline.Tests.IntegratedTests

+{

+    public class UserDetailTest : IClassFixture<WebApplicationFactory<Startup>>, IDisposable

+    {

+        private readonly TestApplication _testApp;

+        private readonly WebApplicationFactory<Startup> _factory;

+

+        public UserDetailTest(WebApplicationFactory<Startup> factory)

+        {

+            _testApp = new TestApplication(factory);

+            _factory = _testApp.Factory;

+        }

+

+        public void Dispose()

+        {

+            _testApp.Dispose();

+        }

+

+        [Fact]

+        public async Task PermissionTest()

+        {

+            { // unauthorize

+                using var client = _factory.CreateDefaultClient();

+                { // GET

+                    var res = await client.GetAsync($"users/{MockUser.User.Username}/nickname");

+                    res.Should().HaveStatusCode(HttpStatusCode.OK);

+                }

+                { // PUT

+                    var res = await client.PutStringAsync($"users/{MockUser.User.Username}/nickname", "aaa");

+                    res.Should().HaveStatusCode(HttpStatusCode.Unauthorized);

+                }

+                { // DELETE

+                    var res = await client.DeleteAsync($"users/{MockUser.User.Username}/nickname");

+                    res.Should().HaveStatusCode(HttpStatusCode.Unauthorized);

+                }

+            }

+            { // user

+                using var client = await _factory.CreateClientAsUser();

+                { // GET

+                    var res = await client.GetAsync($"users/{MockUser.User.Username}/nickname");

+                    res.Should().HaveStatusCode(HttpStatusCode.OK);

+                }

+                { // PUT self

+                    var res = await client.PutStringAsync($"users/{MockUser.User.Username}/nickname", "aaa");

+                    res.Should().HaveStatusCode(HttpStatusCode.OK);

+                }

+                { // PUT other

+                    var res = await client.PutStringAsync($"users/{MockUser.Admin.Username}/nickname", "aaa");

+                    res.Should().HaveStatusCode(HttpStatusCode.Forbidden);

+                }

+                { // DELETE self

+                    var res = await client.DeleteAsync($"users/{MockUser.User.Username}/nickname");

+                    res.Should().HaveStatusCode(HttpStatusCode.OK);

+                }

+                { // DELETE other

+                    var res = await client.DeleteAsync($"users/{MockUser.Admin.Username}/nickname");

+                    res.Should().HaveStatusCode(HttpStatusCode.Forbidden);

+                }

+            }

+            { // user

+                using var client = await _factory.CreateClientAsAdmin();

+                { // PUT other

+                    var res = await client.PutStringAsync($"users/{MockUser.User.Username}/nickname", "aaa");

+                    res.Should().HaveStatusCode(HttpStatusCode.OK);

+                }

+                { // DELETE other

+                    var res = await client.DeleteAsync($"users/{MockUser.User.Username}/nickname");

+                    res.Should().HaveStatusCode(HttpStatusCode.OK);

+                }

+            }

+        }

+    }

+}

diff --git a/Timeline.Tests/Properties/launchSettings.json b/Timeline.Tests/Properties/launchSettings.json
index 0c1cae5d..7a94d57a 100644
--- a/Timeline.Tests/Properties/launchSettings.json
+++ b/Timeline.Tests/Properties/launchSettings.json
@@ -1,27 +1,27 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:11197/",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Timeline.Tests": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:11199/;http://localhost:11198/"
-    }
-  }
+{

+  "iisSettings": {

+    "windowsAuthentication": false,

+    "anonymousAuthentication": true,

+    "iisExpress": {

+      "applicationUrl": "http://localhost:52040/",

+      "sslPort": 0

+    }

+  },

+  "profiles": {

+    "IIS Express": {

+      "commandName": "IISExpress",

+      "launchBrowser": true,

+      "environmentVariables": {

+        "ASPNETCORE_ENVIRONMENT": "Development"

+      }

+    },

+    "Timeline.Tests": {

+      "commandName": "Project",

+      "launchBrowser": true,

+      "environmentVariables": {

+        "ASPNETCORE_ENVIRONMENT": "Development"

+      },

+      "applicationUrl": "http://localhost:52041/"

+    }

+  }

 }
\ No newline at end of file
diff --git a/Timeline.Tests/Timeline.Tests.csproj b/Timeline.Tests/Timeline.Tests.csproj
index 497a00b7..21e887eb 100644
--- a/Timeline.Tests/Timeline.Tests.csproj
+++ b/Timeline.Tests/Timeline.Tests.csproj
@@ -31,4 +31,8 @@
     <ItemGroup>

         <ProjectReference Include="..\Timeline\Timeline.csproj" />

     </ItemGroup>

+

+    <ItemGroup>

+      <Folder Include="Properties\" />

+    </ItemGroup>

 </Project>