From 1713936ce7a0811de8b2c3022cf08a63fc62b966 Mon Sep 17 00:00:00 2001 From: Rory& Date: Tue, 17 Sep 2024 13:54:51 +0200 Subject: Fix unit tests, add authenticated media --- .../Abstractions/HomeserverAbstraction.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Tests/LibMatrix.Tests/Abstractions/HomeserverAbstraction.cs') diff --git a/Tests/LibMatrix.Tests/Abstractions/HomeserverAbstraction.cs b/Tests/LibMatrix.Tests/Abstractions/HomeserverAbstraction.cs index c9727d6..13b5c1b 100644 --- a/Tests/LibMatrix.Tests/Abstractions/HomeserverAbstraction.cs +++ b/Tests/LibMatrix.Tests/Abstractions/HomeserverAbstraction.cs @@ -1,14 +1,17 @@ using ArcaneLibs.Extensions; using LibMatrix.Homeservers; using LibMatrix.Responses; +using LibMatrix.Services; +using Microsoft.Extensions.Logging.Abstractions; namespace LibMatrix.Tests.Abstractions; public static class HomeserverAbstraction { + private static HomeserverResolverService _hsResolver = new HomeserverResolverService(NullLogger.Instance); + private static HomeserverProviderService _hsProvider = new HomeserverProviderService(NullLogger.Instance, _hsResolver); + public static async Task GetHomeserver() { - var rhs = await RemoteHomeserver.Create("https://matrixunittests.rory.gay"); - // string username = Guid.NewGuid().ToString(); - // string password = Guid.NewGuid().ToString(); + var rhs = await _hsProvider.GetRemoteHomeserver("matrixunittests.rory.gay"); var username = "@f1a2d2d6-1924-421b-91d0-893b347b2a49:matrixunittests.rory.gay"; var password = "d6d782d6-8bc9-4fac-9cd8-78e101b4298b"; LoginResponse reg; @@ -23,8 +26,7 @@ public static class HomeserverAbstraction { else throw new Exception("Failed to register", e); } - var hs = await reg.GetAuthenticatedHomeserver("https://matrixunittests.rory.gay"); - + var hs = await _hsProvider.GetAuthenticatedWithToken(reg.Homeserver, reg.AccessToken); //var rooms = await hs.GetJoinedRooms(); // var disbandRoomTasks = rooms.Select(async room => { @@ -45,9 +47,9 @@ public static class HomeserverAbstraction { } public static async Task GetRandomHomeserver() { - var rhs = await RemoteHomeserver.Create("https://matrixunittests.rory.gay"); + var rhs = await _hsProvider.GetRemoteHomeserver("matrixunittests.rory.gay"); var reg = await rhs.RegisterAsync(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "Unit tests!"); - var hs = await reg.GetAuthenticatedHomeserver("https://matrixunittests.rory.gay"); + var hs = await _hsProvider.GetAuthenticatedWithToken(reg.Homeserver, reg.AccessToken); // var rooms = await hs.GetJoinedRooms(); // -- cgit 1.4.1