Remove not really necessary test cases, fix password reset test

Author: Toastbrot236

RefreshTests.GameServer/Tests/ApiV3/AdminUserEditApiTests.cs

@@ -61,8 +61,9 @@ public void EditsUserByUuidAndName()
         using TestContext context = this.GetServer();
         GameUser mod = context.CreateUser(role: GameUserRole.Moderator);
         HttpClient client = context.GetAuthenticatedClient(TokenType.Api, mod);
-
         GameUser player = context.CreateUser(role: GameUserRole.User);
+
+        // UUID
         ApiAdminUpdateUserRequest request = new()
         {
             Description = "poo"
@@ -71,14 +72,7 @@ public void EditsUserByUuidAndName()
         Assert.That(response?.Data, Is.Not.Null);
         Assert.That(response!.Data!.Description, Is.EqualTo(request.Description));
 
-        request = new()
-        {
-            Description = "pee"
-        };
-        response = client.PatchData<ApiExtendedGameUserResponse>($"/api/v3/admin/users/username/{player.Username}", request);
-        Assert.That(response?.Data, Is.Not.Null);
-        Assert.That(response!.Data!.Description, Is.EqualTo(request.Description));
-
+        // name
         request = new()
         {
             Description = "lmao"

RefreshTests.GameServer/Tests/ApiV3/AdminUserManagementApiTests.cs

@@ -20,6 +20,7 @@ public async Task ResetsUsersPasswordByUuidAndName()
         GameUser mod = context.CreateUser(role: GameUserRole.Moderator);
         HttpClient client = context.GetAuthenticatedClient(TokenType.Api, mod);
 
+        // UUID
         GameUser player1 = context.CreateUser(role: GameUserRole.User);
         ApiResetPasswordRequest request = new()
         {
@@ -33,31 +34,19 @@ public async Task ResetsUsersPasswordByUuidAndName()
         Assert.That(updated1, Is.Not.Null);
         Assert.That(updated1!.ShouldResetPassword, Is.True);
 
+        // Name
         GameUser player2 = context.CreateUser(role: GameUserRole.User);
         request = new()
         {
             PasswordSha512 = HexHelper.BytesToHexString(SHA512.HashData("poo"u8))
         };
-        response = await client.PutAsync($"/api/v3/admin/users/uuid/{player2.UserId}/resetPassword", new StringContent(request.AsJson()));
+        response = await client.PutAsync($"/api/v3/admin/users/name/{player2.Username}/resetPassword", new StringContent(request.AsJson()));
         Assert.That(response.IsSuccessStatusCode, Is.True);
 
         context.Database.Refresh();
         GameUser? updated2 = context.Database.GetUserByObjectId(player2.UserId);
         Assert.That(updated2, Is.Not.Null);
         Assert.That(updated2!.ShouldResetPassword, Is.True);
-
-        GameUser player3 = context.CreateUser(role: GameUserRole.User);
-        request = new()
-        {
-            PasswordSha512 = HexHelper.BytesToHexString(SHA512.HashData("poo"u8))
-        };
-        response = await client.PutAsync($"/api/v3/admin/users/uuid/{player3.UserId}/resetPassword", new StringContent(request.AsJson()));
-        Assert.That(response.IsSuccessStatusCode, Is.True);
-
-        context.Database.Refresh();
-        GameUser? updated3 = context.Database.GetUserByObjectId(player3.UserId);
-        Assert.That(updated3, Is.Not.Null);
-        Assert.That(updated3!.ShouldResetPassword, Is.True);
     }
 
     [Test]
@@ -107,26 +96,5 @@ public async Task GetsAndResetsUserPlanetsByUuidAndName()
         updated = context.Database.GetUserByObjectId(updated.UserId);
         Assert.That(updated, Is.Not.Null);
         Assert.That(updated!.Lbp3PlanetsHash.IsBlankHash(), Is.True);
-
-        // username
-        context.Database.UpdateUserData(updated, new SerializedUpdateData()
-        {
-            PlanetsHash = "lol"
-        }, TokenGame.LittleBigPlanetVita);
-
-        context.Database.Refresh();
-
-        planetResponse = client.GetData<ApiAdminUserPlanetsResponse>($"/api/v3/admin/users/username/{updated.Username}/planets");
-        Assert.That(planetResponse?.Data, Is.Not.Null);
-        Assert.That(planetResponse!.Data!.VitaPlanetsHash, Is.EqualTo("lol"));
-
-        resetResponse = await client.DeleteAsync($"/api/v3/admin/users/username/{updated.Username}/planets");
-        Assert.That(resetResponse.IsSuccessStatusCode, Is.True);
-
-        context.Database.Refresh();
-
-        updated = context.Database.GetUserByObjectId(updated.UserId);
-        Assert.That(updated, Is.Not.Null);
-        Assert.That(updated!.VitaPlanetsHash.IsBlankHash(), Is.True);
     }
 }

RefreshTests.GameServer/Tests/ApiV3/MatchingApiTests.cs

@@ -23,14 +23,12 @@ public void GetsRoomByUserUuidAndName()
         match.Initialize();
         GameRoom room = match.CreateRoomByPlayer(player, TokenPlatform.PS3, TokenGame.LittleBigPlanet2, NatType.Open);
 
+        // UUID
         ApiResponse<ApiGameRoomResponse>? response = context.Http.GetData<ApiGameRoomResponse>($"/api/v3/rooms/uuid/{player.UserId}");
         Assert.That(response?.Data, Is.Not.Null);
         Assert.That(response!.Data!.RoomId.ToString(), Is.EqualTo(room.RoomId.ToString()));
 
-        response = context.Http.GetData<ApiGameRoomResponse>($"/api/v3/rooms/username/{player.Username}");
-        Assert.That(response?.Data, Is.Not.Null);
-        Assert.That(response!.Data!.RoomId.ToString(), Is.EqualTo(room.RoomId.ToString()));
-
+        // name
         response = context.Http.GetData<ApiGameRoomResponse>($"/api/v3/rooms/name/{player.Username}");
         Assert.That(response?.Data, Is.Not.Null);
         Assert.That(response!.Data!.RoomId.ToString(), Is.EqualTo(room.RoomId.ToString()));

RefreshTests.GameServer/Tests/ApiV3/PhotoApiTests.cs

@@ -21,10 +21,6 @@ public void GetsPhotosByUserUuidAndName()
         Assert.That(response?.Data, Is.Not.Null);
         Assert.That(response!.Data!.Count, Is.EqualTo(1));
 
-        response = context.Http.GetList<ApiGamePhotoResponse>($"/api/v3/photos/by/username/{player.Username}");
-        Assert.That(response?.Data, Is.Not.Null);
-        Assert.That(response!.Data!.Count, Is.EqualTo(1));
-
         response = context.Http.GetList<ApiGamePhotoResponse>($"/api/v3/photos/by/name/{player.Username}");
         Assert.That(response?.Data, Is.Not.Null);
         Assert.That(response!.Data!.Count, Is.EqualTo(1));
@@ -41,10 +37,6 @@ public void GetsPhotosWithUserUuidAndName()
         Assert.That(response?.Data, Is.Not.Null);
         Assert.That(response!.Data!.Count, Is.EqualTo(1));
 
-        response = context.Http.GetList<ApiGamePhotoResponse>($"/api/v3/photos/with/username/{player.Username}");
-        Assert.That(response?.Data, Is.Not.Null);
-        Assert.That(response!.Data!.Count, Is.EqualTo(1));
-
         response = context.Http.GetList<ApiGamePhotoResponse>($"/api/v3/photos/with/name/{player.Username}");
         Assert.That(response?.Data, Is.Not.Null);
         Assert.That(response!.Data!.Count, Is.EqualTo(1));
@@ -69,11 +61,5 @@ public async Task DeletesAllPhotosByUserUuidAndName()
         resetResponse = await client.DeleteAsync($"/api/v3/admin/users/name/{player.Username}/photos");
         Assert.That(resetResponse.IsSuccessStatusCode, Is.True);
         Assert.That(context.Database.GetTotalPhotosByUser(player), Is.Zero);
-
-        // username
-        context.CreatePhotoWithSubject(player, TEST_IMAGE_HASH);
-        resetResponse = await client.DeleteAsync($"/api/v3/admin/users/username/{player.Username}/photos");
-        Assert.That(resetResponse.IsSuccessStatusCode, Is.True);
-        Assert.That(context.Database.GetTotalPhotosByUser(player), Is.Zero);
     }
 }