Dan Balasescu
d22e1b9001
Add another until step to guard against async test issues
2021-12-15 17:00:06 +09:00
Dan Balasescu
740a6f16c7
Fix exception when updating the room's visual playlist
2021-12-15 16:53:25 +09:00
Dean Herbert
cebfeb5220
Merge pull request #16045 from smoogipoo/multiplayer-local-beatmap-query
...
Rework multiplayer's current item tracking
2021-12-14 18:33:30 +09:00
Dean Herbert
309290a3c9
Use new method in more places that can benefit from it
2021-12-13 16:56:43 +09:00
Dan Balasescu
bf3abb2455
Merge branch 'master' into multiplayer-local-beatmap-query
2021-12-12 16:37:41 +09:00
Dan Balasescu
9f792fec49
Fix test failures from async item loading
2021-12-12 16:11:48 +09:00
Dan Balasescu
99cd36d2f6
Resolve some test failures due to async population
2021-12-11 22:52:08 +09:00
Dan Balasescu
25b274c323
Fix starting gameplay too early after import
2021-12-11 22:47:50 +09:00
Dan Balasescu
cdb8237a4b
Merge branch 'master' into pre-realm-score-tidy
2021-12-11 19:25:39 +09:00
Dan Balasescu
6057037e35
Move playlist item beatmap population to MatchSubScreen
2021-12-10 20:08:59 +09:00
Dean Herbert
dbb08f7d46
Use OnlineID for set operations
2021-12-10 16:11:48 +09:00
Dean Herbert
50bf2f368d
Merge branch 'master' into host-enqueue-2
2021-12-10 14:09:19 +09:00
Dean Herbert
1952819db2
Merge pull request #16019 from smoogipoo/cleanup-playlist-item-buttons
...
Cleanup duplicated classes in DrawableRoomPlaylistItem
2021-12-10 12:01:26 +09:00
Dan Balasescu
a445dcd2c6
Fix incorrect test namespace
2021-12-10 02:09:31 +09:00
Dan Balasescu
671582a925
Allow host to enqeue items and items to be edited
2021-12-10 01:15:19 +09:00
Dan Balasescu
048a495115
Add edit button to DrawableRoomPlaylistItem
2021-12-10 01:08:54 +09:00
Dan Balasescu
05aa9635a8
Privatise button again
2021-12-10 00:38:18 +09:00
Dan Balasescu
f9af239ed9
Cleanup duplicated classes in DrawableRoomPlaylistItem
2021-12-09 23:56:49 +09:00
Dean Herbert
dfe19f3509
Minor code reformatting
2021-12-09 17:53:40 +09:00
Dan Balasescu
aec36adf6c
Fix test failures
2021-12-09 04:22:34 +09:00
Dan Balasescu
3b4833ca8e
A bit of cleanup + xmldocs on classes/members
2021-12-09 01:40:16 +09:00
Dan Balasescu
26f6c5e5a5
Remove ctor params from PlaylistsRoomPlaylist
2021-12-09 01:16:37 +09:00
Dan Balasescu
3be4d8b68d
Remove ctor params from DrawableRoomPlaylist/DrawablePlaylistItem
2021-12-09 01:04:56 +09:00
Dan Balasescu
beb5d61a42
Separate playlist item deletion to Playlists-specific class
2021-12-08 20:50:25 +09:00
Bartłomiej Dach
e9694dc74e
Wait for match type changes in team versus test
2021-12-07 20:40:10 +01:00
Dan Balasescu
5ffe702dd6
Add match type and queue mode to multiplayer room panels
2021-12-07 18:57:13 +09:00
Dean Herbert
0fa1a96e9d
Wait for beatmap sets to finish loading to avoid test failures
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-12-06 15:03:17 +09:00
Dean Herbert
a76cfbea21
Add test coverage of incorrect beatmap being used in multiplayer when match started from song select
2021-12-06 14:03:33 +09:00
Dean Herbert
517a344bcc
Merge branch 'master' into new-multiplayer-playlist
2021-12-04 13:16:09 +09:00
Dan Balasescu
d5803e541b
Give playlist items a PlayedAt date
2021-12-03 20:25:51 +09:00
Dean Herbert
1eed2436e6
Clean up unused resolved properties
2021-12-03 18:49:49 +09:00
Dan Balasescu
10932dd282
Remove now unnecessary test
2021-12-02 22:58:25 +09:00
Dan Balasescu
89c47708a1
Merge branch 'master' into new-multiplayer-playlist
2021-12-01 21:35:23 +09:00
Dan Balasescu
f9b4e6f004
Add test considering expired items
2021-12-01 21:35:23 +09:00
Dan Balasescu
e87b0003fb
Fix queue mode not being bound to in all cases
2021-12-01 21:35:23 +09:00
Dan Balasescu
ad35f3434b
Fix queue list not considering expired items
2021-12-01 21:35:23 +09:00
Dan Balasescu
1152c4e8e9
Fix tests
2021-12-01 21:35:22 +09:00
Dan Balasescu
95050d6597
Extract class to file
2021-12-01 21:35:22 +09:00
Dan Balasescu
11c137cf83
Ignore test
2021-12-01 21:35:22 +09:00
Dan Balasescu
0b3cc47a51
Fix list not repopulating on new room
2021-12-01 21:35:22 +09:00
Dan Balasescu
a4cd22d5a9
Clear lists on room leave
2021-12-01 21:35:22 +09:00
Dan Balasescu
fc8c8685b8
Add playlist queue tests
2021-12-01 21:35:22 +09:00
Dan Balasescu
e0ca1af9b8
Remove ctor params
2021-12-01 21:35:22 +09:00
Dan Balasescu
bfd2dc28c8
Rename QueueList -> MultiplayerQueueList
2021-12-01 21:35:22 +09:00
Dan Balasescu
01108016a7
Add reorder test
2021-12-01 21:35:22 +09:00
Dan Balasescu
89d22824c3
Fix incorrect comment
2021-12-01 21:35:22 +09:00
Dan Balasescu
7e800659aa
Fix incorrect assertion
2021-12-01 21:35:22 +09:00
Dan Balasescu
48a181af1f
Fix test button display
2021-12-01 21:35:22 +09:00
Dan Balasescu
ef170471f0
Merge branch 'master' into new-multiplayer-playlist
2021-12-01 21:35:22 +09:00
Dan Balasescu
68bb49fc1e
Add QueueList tests
2021-12-01 21:33:48 +09:00
Dan Balasescu
0cb35e8b18
Separate out QueueList
2021-12-01 21:33:48 +09:00
Dan Balasescu
17bc0b51aa
Merge branch 'playlist-item-add-owner' into new-multiplayer-playlist
2021-12-01 21:33:48 +09:00
Dan Balasescu
942e48ffbd
Merge branch 'master' into new-multiplayer-playlist
2021-12-01 21:33:11 +09:00
Dan Balasescu
c38537a51a
Initial implementation of MultiplayerPlaylist
2021-12-01 21:32:56 +09:00
Dan Balasescu
7d0135063e
Merge pull request #15875 from peppy/fix-match-type-propagation
...
Fix match type not being propagated correctly to other users' settings
2021-12-01 11:23:28 +09:00
Bartłomiej Dach
de034b4d9c
Fix test failures due to wrong asserts & uninitialised playlist
...
* The "create room" button was disabled headless due to not specifying
the imported beatmap. In visual tests it seems to work due to
selecting from the local database randomly.
* The test asserts are brought in line with expectations.
2021-11-30 20:57:08 +01:00
Bartłomiej Dach
b74b09eb3a
Add extra until step to make cause of potential failures more obvious
2021-11-30 20:56:11 +01:00
Dean Herbert
dda7142f48
Fix double screen exit in multiplayer song select tests potentially causing failure
2021-12-01 02:06:40 +09:00
Dean Herbert
8de06803a8
Fix incorrect test step text
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-11-30 17:16:30 +09:00
Dean Herbert
049d9ce5ef
Add test coverage of match type propagating to other users' settings
2021-11-30 17:09:32 +09:00
Bartłomiej Dach
05f7ea6b6d
Remove mentions of "panel" and "direct" from names of old download buttons
2021-11-27 15:08:03 +01:00
Bartłomiej Dach
a043d1e427
Move old beatmap download button to more general namespace
2021-11-27 15:06:57 +01:00
Dan Balasescu
e1445dcb05
Only show owner in match subscreen
2021-11-26 17:40:45 +09:00
Dan Balasescu
e9a19aacd7
Fix tests by requiring host
2021-11-26 17:23:50 +09:00
Dan Balasescu
8541db1e85
Merge branch 'master' into playlist-item-add-owner
2021-11-26 17:13:23 +09:00
Dan Balasescu
1f5d95666e
Add owner avatar to multiplayer items
2021-11-25 23:15:29 +09:00
Dean Herbert
7a3c69544b
Merge pull request #15799 from smoogipoo/fix-songselect-test-failures-2
...
Fix SongSelect-related test failures
2021-11-25 23:01:06 +09:00
Dan Balasescu
09dd054283
Fix SongSelect-related test failures
2021-11-25 21:11:13 +09:00
Dan Balasescu
132bb59203
Update working beatmap when returning to match
2021-11-24 19:56:02 +09:00
Dean Herbert
0c819b9cfb
Combine all test data BeatmapSetInfo creation into a single method
2021-11-24 18:07:32 +09:00
Dan Balasescu
8ce5324c8b
Merge pull request #15772 from peppy/remove-model-list-inits
...
Initialise `BeatmapSet.Beatmaps` list at construction time
2021-11-24 16:41:19 +09:00
Dean Herbert
44c34ca7b2
Revert changes causing BeatmapSet.Metadata to be expectedly null in some tests
2021-11-24 14:52:08 +09:00
Dean Herbert
8c60f37508
Fix cases of dynamically assigning Beatmaps to BeatmapSetInfo using list assignment
2021-11-24 13:27:37 +09:00
Dean Herbert
b1f3e98045
Fix incorrect usage of ID in TestSceneMultiplayerResults
2021-11-24 13:05:51 +09:00
Dan Balasescu
a521d1b835
Wait for ready button to be enabled first
2021-11-23 17:09:38 +09:00
Dan Balasescu
69a9fc9732
Fix a few more multiplayer test timeouts
...
These can be tested by adding a `Task.Delay(3000);` at the end of the
`MultiplayerClient.JoinRoom` task. The reason is typically that
`Client.Room` becomes not-null but the join task still hasn't completed
yet, so e.g. the ready button is still disabled.
2021-11-23 16:07:03 +09:00
Dan Balasescu
10bd7176e0
Fix potential test failure in TestSceneMultiplayerReadyButton
...
Couldn't exactly reproduce https://github.com/ppy/osu/runs/4294316800 ,
but I found a similar issue via:
```diff
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 84b63a5733..29cac9b061 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -3,6 +3,7 @@
using System;
using System.Linq;
+using System.Threading;
using System.Threading.Tasks;
using NUnit.Framework;
using osu.Framework.Allocation;
@@ -81,6 +82,8 @@ private void load(GameHost host, AudioManager audio)
await Client.ToggleReady();
+ Thread.Sleep(1000);
+
readyClickOperation.Dispose();
});
}
```
2021-11-23 14:07:55 +09:00
Dan Balasescu
f64d20ed71
Fix APIRoom queue mode not updated on change
2021-11-22 13:46:01 +09:00
Dan Balasescu
cad6d1d25d
Adjust test to match new logic
2021-11-22 11:20:19 +09:00
Dan Balasescu
53dbbd6d64
Compare playlist item IDs instead in tests
2021-11-22 11:17:32 +09:00
Dan Balasescu
4e625b78e2
Update queue mode names
2021-11-19 18:28:43 +09:00
Dan Balasescu
a6a786b167
Remove namespacing of queue tests
2021-11-19 15:43:11 +09:00
Dean Herbert
0c289bf8e5
Remove pointless namespace
2021-11-19 14:46:53 +09:00
Dan Balasescu
1dacc50ecb
Merge branch 'master' into multi-queueing-modes
2021-11-18 15:16:27 +09:00
Dean Herbert
2d125893fc
Add tests and disable selection on invalid items
2021-11-16 17:23:52 +09:00
Dan Balasescu
29d0d5badf
Rename QueueModes -> QueueMode
2021-11-16 14:53:10 +09:00
Dan Balasescu
6fb2ccbb86
Add failing test ensuring room is updated after join
2021-11-13 02:32:00 +09:00
Dan Balasescu
060b4fa526
Fix failing multiplayer player test
2021-11-13 02:01:48 +09:00
Dan Balasescu
3b24ec3643
Merge branch 'master' into multi-queueing-modes
2021-11-12 22:16:04 +09:00
Dean Herbert
692e846acd
Rename BeatmapSetInfo.OnlineBeatmapSetID to OnlineID to match interface
2021-11-12 17:52:44 +09:00
Dean Herbert
6a098a8634
Rename BeatmapInfo.OnlineBeatmapID to OnlineID to match interface
2021-11-12 17:46:24 +09:00
Dan Balasescu
5c8c121446
Update behaviour to match server (removing playlist items) + tests
2021-11-11 23:39:15 +09:00
Dan Balasescu
07a7b4bcdc
Merge branch 'master' into multi-queueing-modes
2021-11-11 22:19:30 +09:00
Dan Balasescu
4db2ad1cb3
Merge branch 'master' into rename-ef-model-properties
2021-11-11 19:12:54 +09:00
Dean Herbert
51a353e12d
Rename BeatmapInfo.Version to DifficultyName to match underlying interface
2021-11-11 17:20:53 +09:00
Dean Herbert
ebe58cee11
Rename BeatmapInfo.StarDifficulty to StarRating to match underlying interface
2021-11-11 17:19:46 +09:00
Bartłomiej Dach
f38d6ef8db
Add failing test steps
2021-11-11 09:01:50 +01:00
Dean Herbert
52c740b377
Add failing test showing team display display failure
2021-11-10 13:44:31 +09:00
smoogipoo
c716051530
Merge branch 'master' into multi-queueing-modes
2021-11-08 19:19:50 +09:00
Dean Herbert
0ecf5f201c
Rename User to APIUser and move to correct namespace
2021-11-07 11:26:01 +09:00
