2 files changed, 7 insertions, 9 deletions
diff --git a/Timeline.Tests/Services/UserAvatarServiceTest.cs b/Timeline.Tests/Services/UserAvatarServiceTest.cs
index cf3d2a0a..2729aa6f 100644
--- a/Timeline.Tests/Services/UserAvatarServiceTest.cs
+++ b/Timeline.Tests/Services/UserAvatarServiceTest.cs
@@ -11,7 +11,6 @@ using System.Threading.Tasks;
 using Timeline.Entities;
 using Timeline.Services;
 using Timeline.Tests.Helpers;
-using Timeline.Tests.Mock.Data;
 using Xunit;
 
 namespace Timeline.Tests.Services
@@ -139,7 +138,7 @@ namespace Timeline.Tests.Services
 
             _database = new TestDatabase();
 
-            _service = new UserAvatarService(NullLogger<UserAvatarService>.Instance, _database.DatabaseContext, _mockDefaultAvatarProvider.Object, _mockValidator.Object, _mockETagGenerator.Object, _mockClock.Object);
+            _service = new UserAvatarService(NullLogger<UserAvatarService>.Instance, _database.Context, _mockDefaultAvatarProvider.Object, _mockValidator.Object, _mockETagGenerator.Object, _mockClock.Object);
         }
 
         public void Dispose()
@@ -171,7 +170,7 @@ namespace Timeline.Tests.Services
             string username = MockUser.User.Username;
             var mockAvatarEntity = CreateMockAvatarEntity("aaa");
             {
-                var context = _database.DatabaseContext;
+                var context = _database.Context;
                 var user = await context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
                 user.Avatar = mockAvatarEntity;
                 await context.SaveChangesAsync();
@@ -205,7 +204,7 @@ namespace Timeline.Tests.Services
             string username = MockUser.User.Username;
             var mockAvatarEntity = CreateMockAvatarEntity("aaa");
             {
-                var context = _database.DatabaseContext;
+                var context = _database.Context;
                 var user = await context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
                 user.Avatar = mockAvatarEntity;
                 await context.SaveChangesAsync();
@@ -237,7 +236,7 @@ namespace Timeline.Tests.Services
         {
             string username = MockUser.User.Username;
 
-            var user = await _database.DatabaseContext.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
+            var user = await _database.Context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
 
             var avatar1 = CreateMockAvatar("aaa");
             var avatar2 = CreateMockAvatar("bbb");
diff --git a/Timeline.Tests/Services/UserDetailServiceTest.cs b/Timeline.Tests/Services/UserDetailServiceTest.cs
index c7037c6e..9a869c89 100644
--- a/Timeline.Tests/Services/UserDetailServiceTest.cs
+++ b/Timeline.Tests/Services/UserDetailServiceTest.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Timeline.Entities;
 using Timeline.Services;
 using Timeline.Tests.Helpers;
-using Timeline.Tests.Mock.Data;
 using Xunit;
 
 namespace Timeline.Tests.Services
@@ -21,7 +20,7 @@ namespace Timeline.Tests.Services
         public UserDetailServiceTest()
         {
             _testDatabase = new TestDatabase();
-            _service = new UserDetailService(_testDatabase.DatabaseContext, NullLogger<UserDetailService>.Instance);
+            _service = new UserDetailService(_testDatabase.Context, NullLogger<UserDetailService>.Instance);
         }
 
         public void Dispose()
@@ -51,7 +50,7 @@ namespace Timeline.Tests.Services
         {
             const string nickname = "aaaaaa";
             {
-                var context = _testDatabase.DatabaseContext;
+                var context = _testDatabase.Context;
                 var userId = (await context.Users.Where(u => u.Name == MockUser.User.Username).Select(u => new { u.Id }).SingleAsync()).Id;
                 context.UserDetails.Add(new UserDetail
                 {
@@ -84,7 +83,7 @@ namespace Timeline.Tests.Services
         public async Task SetNickname_ShouldWork()
         {
             var username = MockUser.User.Username;
-            var user = await _testDatabase.DatabaseContext.Users.Where(u => u.Name == username).Include(u => u.Detail).SingleAsync();
+            var user = await _testDatabase.Context.Users.Where(u => u.Name == username).Include(u => u.Detail).SingleAsync();
 
             var nickname1 = "nickname1";
             var nickname2 = "nickname2";