1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Commit Graph

824 Commits

Author SHA1 Message Date
smoogipoo
5820793d11 Make TestMultiplayerRoomContainer inherit TestRoomContainer 2021-06-24 21:02:29 +09:00
smoogipoo
9cf2c9ddae Fix incorrect dependency creation 2021-06-24 21:02:21 +09:00
smoogipoo
a21cf87b5f Split room manager and allow overrides 2021-06-24 19:14:05 +09:00
smoogipoo
5115299e9a Merge RoomManagerTestScene into OnlinePlaySubScreenTestScene 2021-06-24 19:09:31 +09:00
smoogipoo
a7b5c3bed1 Add OnlinePlaySubScreenTestScene 2021-06-24 17:01:28 +09:00
smoogipoo
9287fae5f7 Simplify 2021-06-24 16:54:09 +09:00
smoogipoo
4af119a407 Re-namespace 2021-06-24 16:29:06 +09:00
smoogipoo
c9ec4b9da4 Remove RoomTestScene inheritance from simple test scenes 2021-06-24 16:02:20 +09:00
Dean Herbert
151dfdfb79
Merge pull request #13627 from Joehuu/fix-multiplayer-exit-logic
Fix multiplayer leave dialog not working on all exit operations
2021-06-23 14:56:57 +09:00
Joseph Madamba
49000b9501 Add multiplayer leave navigation tests 2021-06-22 19:30:40 -07:00
Salman Ahmed
31cbb36a64 Implement FindProvider and AllSources properly on all test ISkinSources 2021-06-22 12:03:14 +03:00
Salman Ahmed
b12adc6073 Remove all test skinning changes in favour of the ISkinSource.AllSources path 2021-06-22 10:48:03 +03:00
Dean Herbert
0ad189e357 Expose skin sources via ISkinSource and revert to consuming based on hierarchy 2021-06-22 16:19:55 +09:00
Dean Herbert
1b0aadcc6f Merge branch 'master' into transformers-per-skin 2021-06-22 16:03:15 +09:00
Salman Ahmed
11b78ad849 Make TestPlayer skin assigning logic not flaky 2021-06-21 06:46:00 +03:00
Salman Ahmed
5cfd0e3223 Remove implicit LegacySkin check and refactor anything using it 2021-06-21 04:16:58 +03:00
Salman Ahmed
5ebf570ec4 Revert GetRulesetTransformedSkin accessibility change
This reverts commit 521077b714.

Forgot to do it when I made this `protected`, but subclasses in test scenes require this.
2021-06-16 16:49:38 +03:00
smoogipoo
2155a4da0a Fix intermittent HUD test failure 2021-06-16 19:52:58 +09:00
ekrctb
2b0e6b6b51 Don't invoke "completed" action for test scene virtual track
`MusicController` tries to play the next music when a track is completed.
In test scenes, we want to keep the virtual track, not random songs.
2021-06-16 17:44:21 +09:00
Dean Herbert
4b45d8318e
Merge branch 'master' into transformers-per-skin 2021-06-16 16:37:28 +09:00
Dean Herbert
564682270a Revert "Add nested PlatformActionContainer to allow testing of platform actions in visual tests"
This reverts commit be91203c92.
2021-06-14 13:18:52 +09:00
smoogipoo
58d71e4aea Remove local "next frame" storage 2021-06-10 22:41:38 +09:00
Salman Ahmed
680791301f Consume new method rather than caching skin sources on top of Player 2021-06-10 16:36:46 +03:00
Salman Ahmed
23d6c366ac Add method for assigning arbitrary skins to player in test scenes 2021-06-10 16:36:46 +03:00
Dan Balasescu
791855dfa0
Merge branch 'master' into legacy-skin-default-fallback 2021-06-08 16:54:26 +09:00
Dean Herbert
39f99bf785 Move FindProvider to ISkinSource 2021-06-06 12:17:32 +09:00
Dean Herbert
9f6e3996b1
Merge branch 'master' into fix-osutestscene-content 2021-06-05 14:49:19 +09:00
Craftplacer
1084906d40
Add DummyAPIAccess one parent up 2021-06-05 03:30:21 +02:00
Dan Balasescu
69009a36b7
Merge branch 'master' into autoplay-pause-support 2021-06-03 16:37:41 +09:00
Dean Herbert
be91203c92 Add nested PlatformActionContainer to allow testing of platform actions in visual tests 2021-06-03 15:35:32 +09:00
Dan Balasescu
44b1102241
Merge branch 'master' into autoplay-pause-support 2021-06-03 13:26:00 +09:00
Dean Herbert
cde8de154d Remove unused test property for now 2021-06-02 19:11:09 +09:00
Dean Herbert
f8ae70e562 Update existing function type rather than adding an override 2021-06-02 16:04:53 +09:00
Dean Herbert
45984f035b Make autoplay tests test via the ReplayPlayer code path 2021-06-02 11:49:06 +09:00
Dean Herbert
911256603b Rewrite comment to hopefully be more informative 2021-06-02 11:10:02 +09:00
Dean Herbert
289dc00f38 Merge branch 'master' into autoplay-pause-support 2021-06-01 16:50:44 +09:00
Dean Herbert
6e861a9b7f Revert incorrect ScoreProcessor change 2021-06-01 16:39:50 +09:00
Dean Herbert
790f1dacc9 Ensure ScoreProcessor is still hooked up in special case 2021-06-01 16:24:38 +09:00
Salman Ahmed
7c6400735f Merge branch 'master' into remove-hud-component-lookup 2021-06-01 10:17:52 +03:00
Salman Ahmed
c090110ae2 Provide cell skin on content creation 2021-06-01 10:16:13 +03:00
Dean Herbert
240f7facba Add local concessions for autoplay test handling 2021-06-01 15:39:02 +09:00
Dean Herbert
6ef9b346e1 Fix newly found inspections from 2021.1EAP1 2021-06-01 14:33:21 +09:00
Dan Balasescu
9036b13637
Merge pull request #13260 from peppy/legacy-skin-resource-improvements
Allow `LegacyDefaultSkin` to be constructed without extra resource store parameter
2021-05-31 20:49:21 +09:00
Dean Herbert
f60e9cb085 Remove weird override logic in TestCase methods 2021-05-31 20:00:47 +09:00
Dean Herbert
e78391db7a Fix usage of DI before it's ready in combo colour tests 2021-05-31 19:58:19 +09:00
Dean Herbert
17fa2426d4 Merge branch 'master' into legacy-skin-resource-improvements 2021-05-31 19:36:09 +09:00
Dean Herbert
ebfc24a499 Rename conflicting resources 2021-05-31 19:14:49 +09:00
Dean Herbert
65709ec7d7 Move leagcy resource store construction local to DefaultLegacySkin 2021-05-31 19:14:49 +09:00
Dan Balasescu
46b6f49a92
Merge pull request #13230 from peppy/non-nullable-beatmapset-files
Make `BeatmapSet.Files` non-nullable
2021-05-31 19:10:03 +09:00
Dean Herbert
d1ef5483bc
Merge pull request #12826 from frenzibyte/catch-hide-combo-workaround
Hide legacy HUD combo counters on osu!catch ruleset
2021-05-31 19:04:25 +09:00
Dean Herbert
b16d10bd95 Provide game-wide resources via IStorageResourceProvider 2021-05-31 18:57:47 +09:00
Dean Herbert
d4cb70735d Merge branch 'master' into non-nullable-beatmapset-files 2021-05-31 18:19:57 +09:00
Dean Herbert
5925beaf21 Fix bindable lease failure in editor beatmap creation tests 2021-05-31 14:24:46 +09:00
Dean Herbert
06bd696cc2 Remove previous consumption logic in GetWorkingBeatmap
This should not be required since the introduction of `workingCache`,
which does the same thing in a more global way.
2021-05-31 14:11:58 +09:00
Bartłomiej Dach
ab077c6656
Merge branch 'master' into non-nullable-beatmapset-files 2021-05-31 00:10:03 +02:00
Salman Ahmed
d12e93bfc6 Add skin traget resetting on setup/teardown steps 2021-05-31 00:02:55 +03:00
Salman Ahmed
fb81e5133f Merge branch 'master' into catch-hide-combo-workaround 2021-05-30 14:16:46 +03:00
Dean Herbert
9b239e308b Merge branch 'master' into beatmap-skin 2021-05-29 15:36:43 +09:00
Dean Herbert
581a86b91a Revert "Revert "Fix editor tests failing due to empty files being specified""
This reverts commit 1af684c4b2.
2021-05-28 14:33:06 +09:00
Dean Herbert
121dd175e6 Fix test failure in TestSceneMultiplayerGameplayLeaderboard
The transfer of users was not accounting for the fact that the
`StartPlay` calls are now scheduled and not necessarily run in time.
2021-05-27 19:57:21 +09:00
Dean Herbert
14a4095140 Merge branch 'master' into beatmap-skin 2021-05-26 18:39:47 +09:00
Salman Ahmed
3585e2900e Replace unnecessary empty skin implementation with null 2021-05-24 12:28:52 +03:00
Salman Ahmed
4f6de6fdc6 Implement GetSkin() for other working beatmaps 2021-05-21 20:21:29 +03:00
Salman Ahmed
04e75d8f2b Return empty skin for GetSkin() in TestWorkingBeatmap 2021-05-21 20:21:13 +03:00
smoogipoo
a74405d0ed Merge branch 'master' into restructure-spectator-client 2021-05-20 18:53:42 +09:00
smoogipoo
9d07749959 Improve implementation of TestSpectatorClient
There was a lot of weirdness here, such as storing the playing users,
clearing the playing users from test scenes (!!), and storing the users
being wathed.
This was all a thing because the previous implementation overrode the
base method implementations, which is no longer a thing.
2021-05-20 17:41:46 +09:00
smoogipoo
750a5c3ea9 Fix test compilation error 2021-05-20 17:20:30 +09:00
smoogipoo
6beeb7f7c4 Rename SpectatorStreamingClient -> SpectatorClient 2021-05-20 15:55:07 +09:00
smoogipoo
d197a7f6f5 Rename multiplayer client classes 2021-05-20 15:39:45 +09:00
Salman Ahmed
3d99b89633 Add back actually needed change
*no comment*
2021-05-20 00:03:11 +03:00
Salman Ahmed
d8efcc0793 Remove drive-by change 2021-05-19 23:44:53 +03:00
Bartłomiej Dach
e9cab29134 Cache editor beatmap in placement blueprint test scene 2021-05-19 20:48:06 +02:00
Salman Ahmed
c98d036b48 Merge branch 'master' into catch-hide-combo-workaround 2021-05-18 17:47:20 +03:00
Salman Ahmed
e7d2f42149 Revert "Merge branch 'fix-legacy-skin-test' into catch-hide-combo-workaround"
This reverts commit 380d004683, reversing
changes made to ff419af512.
2021-05-18 17:46:15 +03:00
Dean Herbert
a96603f025
Merge pull request #12782 from smoogipoo/rework-hitobject-blueprints
Rename hitobject blueprints and tie them to HitObjects
2021-05-18 16:30:58 +09:00
Salman Ahmed
380d004683 Merge branch 'fix-legacy-skin-test' into catch-hide-combo-workaround 2021-05-18 09:45:43 +03:00
Salman Ahmed
265a89e5cc Fix LegacySkinPlayerTestScene overriden by default beatmap skin 2021-05-18 09:45:32 +03:00
smoogipoo
882d54a8f8 Remove now unnecessary Apply() method 2021-05-18 14:26:26 +09:00
smoogipoo
e621cfc4ea Add Apply() method for applying new DHOs 2021-05-18 14:14:10 +09:00
Salman Ahmed
f00799cc64 Remove unused using directive
...damn it
2021-05-15 18:36:47 +03:00
Salman Ahmed
243c8aa585 Add test coverage 2021-05-15 18:02:38 +03:00
Bartłomiej Dach
b51d038088 Ignore possible path-related nulls
They're all in test code anyway, so any issue there will cause a test to
fail.
2021-05-15 00:09:34 +02:00
smoogipoo
ffb6135a1b Rework hitobject blueprints to take in hitobject models 2021-05-13 19:53:32 +09:00
smoogipoo
e1dacde314 Add combo to test streaming client 2021-05-12 14:22:15 +09:00
smoogipoo
e0e8f5ab80 Fix ordering + threading issues 2021-05-12 13:06:28 +09:00
smoogipoo
ad11818868 Remove watched users on stop watching 2021-05-12 13:05:02 +09:00
smoogipoo
9b09361cc9 Add testable spectator streaming client 2021-05-12 12:16:41 +09:00
smoogipoo
811282a975 Add failing test 2021-05-11 19:01:41 +09:00
smoogipoo
10a4a5decb Merge branch 'master' into multiplayer-spectator-screen 2021-05-11 17:33:09 +09:00
Salman Ahmed
7c4e54a1d4 Unrevert null-colaescing/conditionals removal 2021-05-07 09:54:14 +03:00
Salman Ahmed
37f44d2e37 Revert wrong not-null track changes
This reverts commit f9d99a9882.
This reverts commit 71547bece0.
2021-05-07 08:28:44 +03:00
Salman Ahmed
71547bece0 Remove any null-coalescing/conditionals in WorkingBeatmap.Track usages 2021-05-07 07:46:23 +03:00
Salman Ahmed
4cdfdcaddf Expand the combo colours used for testing
To avoid potential false positive.
2021-05-05 09:22:01 +03:00
Salman Ahmed
fda6d8685c Let LegacyBeatmapSkinColourTest inherit from TestPlayer instead 2021-05-05 09:21:09 +03:00
Dean Herbert
120fb8974d Combine more instances of test player IDs 2021-04-26 17:22:16 +09:00
smoogipoo
0ee73b8e53 Add failing test 2021-04-22 23:22:44 +09:00
Naxess
400f8b3938 Add GetStream to IWorkingBeatmap
This is necessary to obtain the filesize of the audio and background files.
2021-04-17 17:47:13 +02:00
Dean Herbert
b5954a55ad Remove empty <returns> xmldoc 2021-04-12 17:46:14 +09:00
Dean Herbert
1e23f671fa
Merge pull request #12321 from smoogipoo/add-spectate-button-and-state
Add multiplayer spectating user state and button
2021-04-08 19:48:58 +09:00
Dean Herbert
8aff53172d Remove necessity for nested PassThroughInputManger 2021-04-08 15:18:31 +09:00
smoogipoo
93c5935ebc Add match subscreen support + test 2021-04-07 20:46:30 +09:00
smoogipoo
6be9c9f0f4 Link up ready button to spectate state 2021-04-07 16:35:50 +09:00
Dan Balasescu
2321101518
Merge branch 'master' into fix-overzealousmouse-button-blocking 2021-04-06 16:45:25 +09:00
Dean Herbert
53c1bc666c Make addition of nested GlobalActionContainer in OsuGameTestScene optional 2021-04-06 15:18:00 +09:00
Dean Herbert
beebdb0734 Clean up implementation 2021-04-05 22:30:51 +09:00
Bartłomiej Dach
4df7ff21c7 Fix editor arrow seek snapping not updating after control point changes
The editor clock, which is responsible for performing the seek, was not
aware of changes in control points due to reading from the wrong
beatmap. `loadableBeatmap` is not actually changed by any of the editor
components; `playableBeatmap` and `editorBeatmap` are.

For now this is changed to use `playableBeatmap`. A better follow-up
would be to use `editorBeatmap`, but it would probably be best to move
the beat snap bindable into `EditorBeatmap` first.
2021-04-03 14:02:46 +02:00
Dean Herbert
aeff9bd853 Add return bool to HandleRequest to better trigger failures 2021-03-23 18:17:29 +09:00
Dean Herbert
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +09:00
smoogipoo
6affe33fb2 Fix another test scene 2021-03-03 19:40:19 +09:00
smoogipoo
30ff0b83c1 Fix test failures due to unpopulated room 2021-03-02 19:06:21 +09:00
smoogipoo
7adb33f40e Fix beatmap getting nulled due to failing web request 2021-03-01 17:24:54 +09:00
smoogipoo
f7e4cfa4d0 Fix initial room settings not being returned correctly 2021-03-01 17:24:32 +09:00
smoogipoo
97bb217830 Fix test room playlist items not getting ids 2021-03-01 17:24:05 +09:00
Salman Ahmed
0771154dd2 Make PauseCooldownActive protected and expose on test class 2021-02-19 11:42:30 +03:00
Dean Herbert
5fbed05d04
Merge pull request #11551 from smoogipoo/fix-leave-room-race-2
Fix client potentially not leaving a room on exiting multiplayer
2021-02-08 19:23:14 +09:00
smoogipoo
dbea6d4cee Remove unused using 2021-02-05 00:57:23 +09:00
smoogipoo
18e5081523 Fix test failures 2021-02-05 00:42:38 +09:00
smoogipoo
f538963607 Extra mods -> user mods 2021-02-01 17:57:32 +09:00
smoogipoo
ac2a995041 Add user and panel states 2021-02-01 17:54:56 +09:00
smoogipoo
964976f604 Use a task chain and fix potential misordering of events 2021-01-25 21:01:39 +09:00
Bartłomiej Dach
82e5a5bf6f Mark legacy beatmap skin colour test as abstract 2021-01-19 23:10:15 +01:00
Dean Herbert
1364de1166
Merge branch 'master' into beatmap-colour-setting 2021-01-18 16:07:46 +09:00
Dean Herbert
edb6d3907b
Merge pull request #11472 from frenzibyte/explicit-beatmap-markers
Add explicit content markers to beatmap panels and overlay
2021-01-17 21:44:10 +09:00
Mysfit
a3535f4b79 Further simplified beatmap colouring tests. 2021-01-16 02:09:35 -05:00
Mysfit
112967c1e8 Created base class for testing beatmap colours. 2021-01-15 23:46:46 -05:00
Salman Ahmed
560b1e970c
Merge branch 'master' into user-beatmap-downloading-states 2021-01-13 22:31:31 +03:00
Salman Ahmed
f827c62081 Add empty online info to test beatmap
This is for `BeatmapSetOverlay` to not eat a null reference trying to access `Beatmap.OnlineInfo`.
2021-01-13 12:27:15 +03:00
Salman Ahmed
90fb67b377 Update code in-line with decided direction 2021-01-11 20:52:24 +03:00
Bartłomiej Dach
8c3955d341 Improve safety of ongoing operation tracker
Finishing an operation started via
`OngoingOperationTracker.BeginOperation()` was risky in cases where the
operation ended at a callback on another thread (which, in the case of
multiplayer, is *most* cases). In particular, if any consumer registered
a callback that mutates transforms when the operation ends, it would
result in crashes after the framework-side safety checks.

Rework `OngoingOperationTracker` into an always-present component
residing in the drawable hierarchy, and ensure that the
`operationInProgress` bindable is always updated on the update thread.
This way consumers don't have to add local schedules in multiple places.
2021-01-09 22:45:24 +01:00
Bartłomiej Dach
ff60d652ed Move out test ongoing operation tracker to higher level 2021-01-08 22:28:21 +01:00
Salman Ahmed
dfa8be9173 Add beatmap availability change state & event methods 2021-01-03 05:48:49 +03:00
Dean Herbert
046a76cb1d Allow null users to still be displayed in the participant list
The fix here is correcting the access of `user.Country`. The deicision
to have null users display is because this is the best we can do (if
osu-web could not resolve the user). We still want the users in the
lobby to be aware of this user's presence, rather than hiding them from
view.

osu-stable does a similar thing, showing these users as `[Loading]`. I
decided to go with blank names instead because having *any* text there
causes confusion. We can iterate on this in future design updates.
2020-12-28 15:03:44 +09:00
Bartłomiej Dach
83fb7c7a1a Re-namespace all files in OnlinePlay directory 2020-12-25 16:50:09 +01:00
Dean Herbert
5d4b73baa5 RealtimeMultiplayer -> Multiplayer 2020-12-25 14:10:59 +09:00
Bartłomiej Dach
6750f1574f
Merge branch 'master' into disallow-multiplayer-restart-retry 2020-12-24 09:45:50 +01:00
Bartłomiej Dach
47020c8887 Add failing test cases 2020-12-23 21:00:47 +01:00
Dean Herbert
3c8f871b28 Move player constructor configuration to dedicated class; add AllowRestart parameter 2020-12-23 17:47:46 +09:00
Dean Herbert
d7279dab40
Merge pull request #11226 from peppy/fix-legacy-skin-texture-loader-store
Fix incorrectly provided texture loader store to skins
2020-12-23 16:41:01 +09:00
Dean Herbert
a7f78d706a Merge branch 'master' into fix-legacy-skin-texture-loader-store 2020-12-22 12:09:35 +09:00
Dean Herbert
10c2745682 Add region specifications around implicit interface implementations 2020-12-22 12:01:09 +09:00
smoogipoo
8427ee1b8e Fix incorrect cached type 2020-12-21 18:42:23 +09:00
smoogipoo
c3d1eaf36d Make RealtimeMultiplayerTestScene abstract 2020-12-21 16:21:05 +09:00
Dean Herbert
a5bcf1dc20 Expose resources to skin via interface (and share common pieces with beatmap) 2020-12-21 15:18:52 +09:00
smoogipoo
ba4307a74c Directly return task 2020-12-20 18:24:13 +09:00
smoogipoo
9b08f573ba Fix room not created before being joined 2020-12-19 02:41:04 +09:00
smoogipoo
3f4a66c4ae Add realtime multiplayer test scene abstract class 2020-12-19 02:23:42 +09:00
smoogipoo
7d1fe7955e Small improvements to testable room manager 2020-12-19 01:57:40 +09:00
smoogipoo
2fc5561b7e Add handling for GetRoomRequest() 2020-12-19 01:22:52 +09:00
smoogipoo
c6da680c80 Add a container for testing purposes 2020-12-19 01:19:08 +09:00
smoogipoo
c6555c53cc Add a testable realtime room manager 2020-12-19 01:17:24 +09:00