Continue to write tests.

3 files changed, 50 insertions, 2 deletions

diff --git a/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs b/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
index aaa6215c..2e5b86fa 100644
--- a/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
+++ b/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
@@ -24,6 +24,55 @@ namespace Timeline.Tests.IntegratedTests
         }
 
         [Fact]
+        public async Task TimelineGet_Should_Work()
+        {
+            using var client = Factory.CreateDefaultClient();
+            var res = await client.GetAsync("users/user/timeline");
+            var body = res.Should().HaveStatusCode(200)
+                .And.HaveJsonBody<BaseTimelineInfo>().Which;
+            body.Owner.Should().Be("user");
+            body.Visibility.Should().Be(TimelineVisibility.Register);
+            body.Description.Should().Be("");
+            body.Members.Should().NotBeNull().And.BeEmpty();
+        }
+
+        [Fact]
+        public async Task Description_Should_Work()
+        {
+            using var client = await Factory.CreateClientAsUser();
+
+            async Task AssertDescription(string description)
+            {
+                var res = await client.GetAsync("users/user/timeline");
+                var body = res.Should().HaveStatusCode(200)
+                    .And.HaveJsonBody<BaseTimelineInfo>()
+                    .Which.Description.Should().Be(description);
+            }
+
+            const string mockDescription = "haha";
+
+            await AssertDescription("");
+            {
+                var res = await client.PostAsJsonAsync("users/user/timeline/op/property",
+                    new TimelinePropertyChangeRequest { Description = mockDescription });
+                res.Should().HaveStatusCode(200);
+                await AssertDescription(mockDescription);
+            }
+            {
+                var res = await client.PostAsJsonAsync("users/user/timeline/op/property",
+                    new TimelinePropertyChangeRequest { Description = null });
+                res.Should().HaveStatusCode(200);
+                await AssertDescription(mockDescription);
+            }
+            {
+                var res = await client.PostAsJsonAsync("users/user/timeline/op/property",
+                    new TimelinePropertyChangeRequest { Description = "" });
+                res.Should().HaveStatusCode(200);
+                await AssertDescription("");
+            }
+        }
+
+        [Fact]
         public async Task Member_Should_Work()
         {
             const string getUrl = "users/user/timeline";
diff --git a/Timeline/Models/Timeline.cs b/Timeline/Models/Timeline.cs
index 85fefff5..752c698d 100644
--- a/Timeline/Models/Timeline.cs
+++ b/Timeline/Models/Timeline.cs
@@ -1,6 +1,5 @@
 using System;

 using System.Collections.Generic;

-using Timeline.Entities;

 

 namespace Timeline.Models

 {

diff --git a/Timeline/Services/TimelineService.cs b/Timeline/Services/TimelineService.cs
index 1d199aae..1e64353c 100644
--- a/Timeline/Services/TimelineService.cs
+++ b/Timeline/Services/TimelineService.cs
@@ -717,7 +717,7 @@ namespace Timeline.Services
 

             return new BaseTimelineInfo

             {

-                Description = timelineEntity.Description,

+                Description = timelineEntity.Description ?? "",

                 Owner = username,

                 Visibility = timelineEntity.Visibility,

                 Members = memberUsernames.ToList()