1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 10:22:56 +08:00
Commit Graph

7014 Commits

Author SHA1 Message Date
smoogipoo
b0b27a47d5 Rename test scene 2021-10-28 15:28:16 +09:00
smoogipoo
cf15282077 Merge branch 'master' into fix-playlists-room-subscreen-tests 2021-10-28 15:26:48 +09:00
Dean Herbert
56e3a42abe Remove unused using statement 2021-10-28 15:14:29 +09:00
smoogipoo
0e293471c2 Clean up multiplayer-screen tests by removing intermediate screen 2021-10-28 14:29:49 +09:00
Dean Herbert
aaabaaa5dd
Merge pull request #15320 from smoogipoo/fix-online-play-request-handling
Fix online play request handling in tests
2021-10-28 14:24:00 +09:00
smoogipoo
1213c5553a Remove forgotten attribute 2021-10-28 13:16:50 +09:00
Dean Herbert
add39fbd4f Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-28 06:24:24 +09:00
Bartłomiej Dach
798349243f
Cache test request handler in screen navigation test 2021-10-27 20:38:52 +02:00
Bartłomiej Dach
cd04ca1240
Remove unused using statement 2021-10-27 20:35:19 +02:00
Dean Herbert
7245baba69 Remove IBeatmapSetOnlineInfo implementation from BeatmapSetInfo to avoid null cases 2021-10-28 00:50:45 +09:00
Dean Herbert
347f41f367 Change test to allow for potentially single-frame delayed events firing 2021-10-27 23:54:10 +09:00
Dean Herbert
746d6a4c16 Fix some oversights and test failures 2021-10-27 23:42:27 +09:00
Dean Herbert
f014ceaead Update remaining usages of download tracking 2021-10-27 21:00:46 +09:00
smoogipoo
72bb72a559 Fix a case of missed base.SetUpSteps() 2021-10-27 20:56:11 +09:00
smoogipoo
a87d8d0359 Fix dependency missing in a few TestScenes
Hopefully these are rather temporary cases until a better solution is
found for these dependency-loading screens.
2021-10-27 20:47:40 +09:00
smoogipoo
48f280440c Fix incorrect clearing of room 2021-10-27 19:36:43 +09:00
smoogipoo
f3dba49aae Rename room managers 2021-10-27 19:36:32 +09:00
Dean Herbert
d19580cf60 Fix incorrectly changed difficulty count in recently updated test 2021-10-27 16:44:11 +09:00
smoogipoo
676070946c Fix missed base.SetUpSteps() 2021-10-27 15:25:26 +09:00
Dean Herbert
58237f6fee Fix weird import flows 2021-10-27 14:26:37 +09:00
Dean Herbert
84bb3a962b Centralise room "creation" 2021-10-27 14:11:57 +09:00
Dean Herbert
c4a253cc75 Replace local instantiation of TestBeatmap with helper method 2021-10-27 13:55:14 +09:00
Dean Herbert
2bc2420012 Rename test scene
It's not testing the sub-screen. It's testing creating playlists.
2021-10-27 13:54:21 +09:00
Dean Herbert
95837990f3 Apply some second-pass inspections that appeared after previous changes 2021-10-27 13:09:30 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Bartłomiej Dach
3de994449d
Add support for changing dimensions of difficulty spectrum display 2021-10-26 23:06:52 +02:00
Bartłomiej Dach
1a77e98537
Implement difficulty spectrum display 2021-10-26 23:06:52 +02:00
Jason Won
c633e2e952 only propagate unmodified right click 2021-10-26 16:24:53 -04:00
Jason Won
4efa1f23bb fix context menu test 2021-10-26 15:29:50 -04:00
Jason Won
f64fa65fd5 right click on unselected object shows context menu 2021-10-26 14:52:15 -04:00
Dean Herbert
d5b4c68d3a Merge branch 'master' into fix-slider-path-extension-incorrectness 2021-10-26 17:36:50 +09:00
Dean Herbert
aa0762ebe2 Add test coverage for failing slider case 2021-10-26 17:35:03 +09:00
Dean Herbert
b259192a8a Add failing test coverage showing hitobject local control points are defaults 2021-10-26 16:06:03 +09:00
Dan Balasescu
f687ed8599
Merge pull request #15283 from peppy/test-api-beatmap-set
Add ability to make test `APIBeatmapSet`s from test scenes
2021-10-26 15:34:19 +09:00
Dan Balasescu
7b8982c87c
Merge pull request #15302 from peppy/fix-multiplayer-chat-escape-focus
Fix gameplay chat display not losing focus on escape key press
2021-10-26 15:34:05 +09:00
Dan Balasescu
efe6763226
Merge branch 'master' into move-online-beatmap-metrics 2021-10-26 14:24:40 +09:00
Dean Herbert
6c38028d06 Fix gameplay chat display not losing focus on escape key press
Closes #15293.
2021-10-26 13:55:08 +09:00
Dan Balasescu
1e3c84b34b
Merge branch 'master' into use-beatmap-interfaces-more-uncontested 2021-10-26 13:51:55 +09:00
Bartłomiej Dach
5a03e1736e
Merge branch 'master' into update-beatmap-set-status-pill-appearance 2021-10-25 20:26:49 +02:00
Bartłomiej Dach
6802e9ec10
Remove FixedWidth and add AutoSizeAxes specs to all usages 2021-10-25 20:24:48 +02:00
Dean Herbert
2c308f3008 Rename BeatmapMetrics to APIFailTimes 2021-10-25 15:34:41 +09:00
Dean Herbert
20baae9094 Move online metrics out of BeatmapInfo model 2021-10-25 15:32:18 +09:00
Dean Herbert
045dd94a6e Move online metrics out of BeatmapSetInfo model 2021-10-25 15:12:39 +09:00
Dean Herbert
94175bfb4a Update PreviewTrackManager to use IBeatmapSetInfo 2021-10-25 14:25:01 +09:00
Dean Herbert
19312435d0 Add ability to make test APIBeatmaps from test scenes
Allow tests to create a sample `APIBeatmapSet`

One step towards removing calls to `ToBeatmap` / `ToBeatmapSet`.
2021-10-25 14:18:13 +09:00
Bartłomiej Dach
feedd53a53
Add support for setting fixed size of status pill 2021-10-24 21:37:00 +02:00
Bartłomiej Dach
207ccc4756
Add test scene for beatmapset online status pill display 2021-10-24 20:35:26 +02:00
Bartłomiej Dach
00732822c3
Replace insufficiently specific exception type
Resolves compilation failures for the newly-added Android build-only CI
job caused by inspection CA2201 ("Exception type System.Exception is not
sufficiently specific").
2021-10-24 17:45:39 +02:00
Dean Herbert
99d01f2162 Fix a couple of new layout inspections introduces in Rider 2021.3 EAP5 2021-10-24 23:51:49 +09:00
Bartłomiej Dach
d24fbc6ade
Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-24 12:58:56 +02:00
Dan Balasescu
c6ca0e5895
Merge branch 'master' into fix-password-popover-focus 2021-10-22 22:52:46 +09:00
smoogipoo
d7a98097a1 Make DrawableRoomPlaylist handle expired items 2021-10-22 21:04:52 +09:00
Dean Herbert
93482414d6 Remove SkinConfiguration subclasses and allow configuration parsing for all skin types 2021-10-22 14:42:23 +09:00
Dean Herbert
08971ff8f2
Fix typo in region spedc
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-22 11:03:28 +09:00
Dean Herbert
9e0d839ef3
Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-21 20:33:47 +09:00
Dean Herbert
32d01f022f Rename usages which rely on online backing 2021-10-21 16:58:42 +09:00
Dean Herbert
0706ad70fb Move BeatmapSetOnlineInfo to an interface type 2021-10-21 16:58:42 +09:00
Dean Herbert
59b7210efa Revert disallowing imports with no files
While it is logical that we want this, from a testing perspective this is a bit of a nightmare to fix. Let's revisit at a later point in time.
2021-10-21 13:43:42 +09:00
Dean Herbert
7a1be99999 Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-21 13:05:05 +09:00
Bartłomiej Dach
a7f3beabe3
Modify OsuTextBox test scene to test against colour provider 2021-10-20 22:49:23 +02:00
Dean Herbert
fd01a226db
Remove redundant parenthesis
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-20 18:11:33 +09:00
Dean Herbert
e9a35cbe7e
Merge pull request #15202 from EVAST9919/prev-username-test-fix
Fix and improve TestSceneUserProfilePreviousUsernames
2021-10-20 18:03:25 +09:00
Dean Herbert
5f53dd8021 Rename test variable for legibility 2021-10-20 17:56:45 +09:00
Dean Herbert
602303e947 Add test coverage for skin.ini contents 2021-10-20 17:56:45 +09:00
Dean Herbert
19f30177ea Rewrite tests completely 2021-10-20 17:45:06 +09:00
Dean Herbert
789c715f13 Add skin.ini write support to allow for more correct hashing 2021-10-20 17:45:06 +09:00
smoogipoo
116ce09e49 Merge branch 'master' into multi-queueing-modes 2021-10-20 17:27:25 +09:00
Andrei Zavatski
0f8d270442 Remove online part since it doesn't really check anything 2021-10-20 11:27:24 +03:00
Andrei Zavatski
faabc75a3e Fix failing test 2021-10-20 10:54:08 +03:00
Dan Balasescu
08f3bc3f44
Merge pull request #15120 from peppy/realm-importer
Implement realm beatmap importer
2021-10-20 16:44:16 +09:00
Andrei Zavatski
6f38e6166d Fix and improve TestSceneUserProfilePreviousUsernames 2021-10-20 10:32:00 +03:00
Bartłomiej Dach
6c18d46443
Add test scene for demonstrating OsuDropdown appearance 2021-10-19 22:09:50 +02:00
Dean Herbert
7cf4395875 Merge branch 'master' into default-value-indicator 2021-10-19 16:23:02 +09:00
Dean Herbert
32cbf6e54b Add test coverage ensuring password popover keeps focus 2021-10-19 15:53:29 +09:00
Dean Herbert
8944b1dd78 Add basic test coverage of DrawableLoungeRoom 2021-10-19 15:36:27 +09:00
Dean Herbert
f7ec135b9b Fix TestSceneLoungeRoomsContainer crashing on selecting a room with a password 2021-10-19 15:36:27 +09:00
Dan Balasescu
30af27e561
Merge branch 'master' into realm-importer 2021-10-19 11:06:11 +09:00
Bartłomiej Dach
95ed9a431c
Add test coverage for no submission for ruleset with null ID 2021-10-19 00:06:07 +02:00
Bartłomiej Dach
cc9727ec11
Merge branch 'master' into default-value-indicator 2021-10-18 22:07:58 +02:00
Bartłomiej Dach
88a1b31fae
Remove grid usage in SettingsItem 2021-10-18 22:07:32 +02:00
Dean Herbert
b3219bb592 Update usages of OnlineID 2021-10-18 16:16:36 +09:00
Dean Herbert
6904938dc1 Merge branch 'realm-indexed-online-id' into realm-importer 2021-10-18 16:14:37 +09:00
Dan Balasescu
8643c725cc
Merge pull request #15175 from peppy/fail-animation-flash-controlled-by-setting
Don't flash screen red on fail if the user has disabled red tinting
2021-10-18 15:27:10 +09:00
Dean Herbert
b2f9f8b8da Update logic surrounding removal of previous OnlineIDs when running a new import 2021-10-18 15:14:13 +09:00
Dean Herbert
762949f49f Don't flash screen red on fail if the user has disabled red tinting 2021-10-18 14:20:38 +09:00
Dean Herbert
50bde0fe38 Refactor test to better keep existing toggle values
I also changed the type of the button to `float` because it was mentally
hard to parse a default button that is tracking a `bool` state. Probably
not what we want for a test like this.
2021-10-18 13:53:28 +09:00
Dean Herbert
0d992a0493 Add failing test showing epilepsy warning is not fading on early exit 2021-10-18 13:30:24 +09:00
Bartłomiej Dach
f422ebb281
Adjust SettingsItem to accommodate new default value indicator 2021-10-17 21:50:03 +02:00
Bartłomiej Dach
818f35c35f
Restyle default value indicator 2021-10-17 21:50:03 +02:00
5ln
3529f34c98
Multi: Hide mods when spectating or Beatmap isn't Locally Available.
Signed-off-by: 5ln <xnafumie@gmail.com>
2021-10-18 02:01:50 +08:00
Bartłomiej Dach
b34086a792
Add failing test case for incorrect RulesetID population in submission flow 2021-10-16 16:10:42 +02:00
Bartłomiej Dach
29ec498f6c
Add failing test case for player sending wrong ruleset ID to spectator server 2021-10-16 13:34:24 +02:00
smoogipoo
6cc8184041 Make test scene create room immediately 2021-10-15 20:17:43 +09:00
Dean Herbert
49969ac328 Add beatmap import and file store tests 2021-10-15 17:07:34 +09:00
Dan Balasescu
3604a762d0
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-15 16:58:01 +09:00
Dan Balasescu
56758435ee
Merge pull request #15043 from peppy/realm-ruleset-store
Add realm `RulesetStore`
2021-10-15 16:49:48 +09:00
Dean Herbert
c9d8645341 Fix startup import test waiting on potentially incorrect notification type 2021-10-15 13:26:31 +09:00
Dean Herbert
ec5c967e71 Add test coverage of SettingsCheckbox 2021-10-15 12:13:24 +09:00
Dean Herbert
b15137ecdc Add test coverage of slider bars with colour provider applied 2021-10-15 11:48:08 +09:00
Dean Herbert
874d722820
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-15 11:14:45 +09:00
Dean Herbert
02d29097a2 Switch away from metadata screen before making any changes in test logic 2021-10-15 11:14:03 +09:00
Dean Herbert
ad0732484f Just wait for metadata section to be loaded 2021-10-14 22:12:38 +09:00
Dan Balasescu
fb9c3fe72e
Merge pull request #14619 from peppy/no-more-difficulty-control-points-info
Move `DifficultyControlPoint`s to be specified at a per-`HitObject` level
2021-10-14 17:24:32 +09:00
smoogipoo
0fd5fa17c0 Add more thorough check 2021-10-14 16:50:38 +09:00
Dean Herbert
119e9ad83e Fix multiplayer gameplay flow test scene failures due to button not being ready 2021-10-14 15:58:42 +09:00
Dean Herbert
464bcd2b24
Merge pull request #15070 from bdach/dropdown-refresh
Refresh dropdown appearance & add themed variant to settings sidebar
2021-10-14 14:40:58 +09:00
Dean Herbert
2e0a2a28ab Check mutations at each point in the process (and also check artist/title) 2021-10-14 14:40:20 +09:00
Dean Herbert
3964e5c448 Fix test failure due to retyped class 2021-10-14 14:11:12 +09:00
Dean Herbert
b6c5797394 Fix AudioFilter test not stopping track on forced exit 2021-10-14 12:55:02 +09:00
smoogipoo
aa380a11c1 Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-14 12:02:10 +09:00
Dean Herbert
8d479bbe56
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-14 10:17:01 +09:00
Bartłomiej Dach
c7db286b94
Merge branch 'master' into file-sanity-checks 2021-10-14 00:17:29 +02:00
Dan Balasescu
e49f1f6e6b
Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-13 20:17:57 +09:00
Dean Herbert
af15a8a54b Merge branch 'master' into fix-gamehost-tests 2021-10-13 18:02:18 +09:00
Dan Balasescu
d88daf0cc2
Merge pull request #15073 from peppy/fix-player-loader-low-pass
Improve `PlayerLoader` audio and visual transitions
2021-10-13 17:01:49 +09:00
Dan Balasescu
a781930135
Merge pull request #15042 from peppy/realm-live
Add realm `Live<T>` implementation
2021-10-13 17:01:02 +09:00
Dean Herbert
db5099de3a Add missing licence header 2021-10-13 15:45:01 +09:00
Dean Herbert
2fb5c85377
Merge branch 'master' into realm-ruleset-store 2021-10-13 15:25:18 +09:00
Dean Herbert
f5f0486e18
Merge branch 'master' into realm-live 2021-10-13 15:24:34 +09:00
Dean Herbert
29dfe33465 Rewrite AudioFilter to be easier to follow (and fix tests) 2021-10-13 15:17:20 +09:00
Dean Herbert
02689a1b60 Use actual BeatmapInfo rather than PlayableBeatmap.BeatmapInfo for editor writes 2021-10-13 14:50:12 +09:00
Dan Balasescu
3445d915b9
Merge pull request #15074 from peppy/fix-storyboard-fail-test-fails
Fix storyboard outro during fail test not being lenient enough
2021-10-13 14:16:26 +09:00
Dan Balasescu
df5a76ad9d
Merge pull request #15041 from peppy/realm-file-store
Add realm `FileStore`
2021-10-13 13:54:56 +09:00
Dean Herbert
26a1e40d24 Fix storyboard outro during fail test not being lenient enough 2021-10-13 13:48:57 +09:00
Dean Herbert
b37096f440 Avoid using bindable for AudioFilter cutoff
It doesn't play nicely with screen exiting, as it is automatically
unbound during the exit process. Easiest to just avoid using this for
now.
2021-10-13 13:25:55 +09:00
Dean Herbert
f69a56a26a Add test coverage of startup import sequence 2021-10-13 12:19:10 +09:00
Bartłomiej Dach
3ceee176e6
Merge branch 'master' into frame-stability-container-direction-flip 2021-10-12 18:34:04 +02:00
Bartłomiej Dach
8dcfc3dd7e
Replace no-op seeks with wait steps 2021-10-12 18:31:20 +02:00
Dean Herbert
e468bfb31c
Merge branch 'master' into realm-file-store 2021-10-12 23:11:02 +09:00
smoogipoo
91c286b1ad Fix intermittent TestScenePlaySongSelect test failures 2021-10-12 22:07:57 +09:00
Dan Balasescu
60ba1987ba
Merge pull request #15050 from peppy/fix-cross-thread-list-manipulation-skin-source-provider
Fix cross-thread list manipulation in `SkinProvidingContainer`
2021-10-12 21:59:49 +09:00
Dan Balasescu
7bb401b974
Merge pull request #15040 from peppy/realm-test-game-host
Update realm tests to run inside a `GameHost` to allow running on update thread
2021-10-12 21:16:06 +09:00
Dan Balasescu
f76b58e843
Merge pull request #15055 from peppy/fix-taiko-convert-woes
Fix `BeatmapConverter` not cloning deeply enough
2021-10-12 21:07:39 +09:00
Dan Balasescu
f01e995cd9
Merge branch 'master' into fix-cross-thread-list-manipulation-skin-source-provider 2021-10-12 20:59:17 +09:00
Dean Herbert
79ac64a088 Split out editor save steps to try and catch test failure 2021-10-12 19:40:35 +09:00
smoogipoo
d1b0dd1f6b Fix GameHosts being run on TPL threads 2021-10-12 17:13:36 +09:00
Bartłomiej Dach
55bd7d2512 Add failing coverage for saving difficulty params from editor 2021-10-12 16:43:56 +09:00
Dean Herbert
d7cbacc5a0 Rename OnSourceChanged and expand on xmldoc to mention that it doesn't fire SourceChanged 2021-10-12 13:04:48 +09:00
Gagah Pangeran Rosfatiputra
7fcb01bdf1
add changelog links test 2021-10-12 09:57:46 +07:00
Dean Herbert
39a3482458 Replace Add/Reset methods with single Set method 2021-10-12 11:55:07 +09:00
Dean Herbert
7f95400f46 Add proper stream disposal to tests 2021-10-12 11:04:41 +09:00
Dan Balasescu
696193198a
Merge pull request #15049 from bdach/settings-panel-rounded-buttons
Update appearance of buttons in settings sidebar
2021-10-12 09:32:52 +09:00
Naxesss
bb9cbd3e66 Undo disposal of Stream for use in mocking
Because the Stream object is accessed when the mocked object calls `GetStream`, we cannot close it here.

The resource should be released upon teardown anyway.
2021-10-12 00:35:58 +02:00
Naxesss
47b4d03145 Dispose of Streams when used 2021-10-12 00:13:38 +02:00
Naxesss
01d77fb741 Remove redundant Bass.Init call in test setup 2021-10-11 23:58:06 +02:00
Bartłomiej Dach
ff382259ca
Use rounded buttons in tablet rotation preset settings 2021-10-11 23:17:09 +02:00
Bartłomiej Dach
b1ad3161dd
Add failing test case for frame stable clock direction flip scenario 2021-10-11 21:25:02 +02:00
Dean Herbert
0daa836ecc Add realm RulesetStore
Not yet used in game.
2021-10-11 15:57:33 +09:00
Dean Herbert
81a0fbfc40 Add Live<> casting test 2021-10-11 15:36:41 +09:00
Dean Herbert
b01d82b3fd Add RealmLive implementation 2021-10-11 15:36:41 +09:00
Dean Herbert
03bf88ae81 Add realm FileStore and test coverage 2021-10-11 15:26:16 +09:00
Dean Herbert
b946011292 Update tests to run inside a GameHost to allow running on update thread 2021-10-11 15:19:18 +09:00
Dean Herbert
6b35ccae95 Fix some cases where interface specifications can be used but weren't 2021-10-11 15:06:24 +09:00
Dean Herbert
a16ffd2976
Merge pull request #14999 from smoogipoo/fix-score-async
Fix intermittent playlist results screen test failures
2021-10-11 10:44:04 +09:00
Bartłomiej Dach
21ee24ea6d
Add rounded button variant 2021-10-10 21:45:41 +02:00
Bartłomiej Dach
237c063015
Fix typo in multipleIncrementMods variable name 2021-10-09 14:26:32 +02:00
smoogipoo
bc37cb6f43 Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-08 18:41:17 +09:00
smoogipoo
f199d6c521 Fix another related test failure 2021-10-08 15:26:25 +09:00
smoogipoo
d6ac6a5cd6 Fix intermittent results screen test failures 2021-10-08 15:18:01 +09:00
Dean Herbert
42d3fe8f02 Merge branch 'master' into fix-SettingsTextBox-using-null-as-default 2021-10-08 13:37:28 +09:00
Dan Balasescu
f8e50731b7
Merge pull request #14991 from peppy/intro-tests-no-menu-load
Allow intro screens to be created without loading a `MainMenu`
2021-10-07 20:48:54 +09:00
Dean Herbert
ba84da6ef8 Tidy up test scene 2021-10-07 20:08:28 +09:00
Dean Herbert
b88d4f1913 Fix weird edge case in TestSceneIntroWelcome 2021-10-07 19:58:34 +09:00
Dean Herbert
ef64c64f0b
Merge branch 'master' into popup-filter-effect 2021-10-07 18:56:07 +09:00
Dean Herbert
e578046b20 Rename Filter -> AudioFilter 2021-10-07 18:50:08 +09:00
Dean Herbert
0348c6c7e5 Apply some renaming and code quality fixes 2021-10-07 18:49:22 +09:00
Dan Balasescu
bece807857
Merge pull request #14980 from peppy/difficulty-move-to-beatmap
Copy `BaseDifficulty` to `Beatmap<T>` and move the majority of write operations across
2021-10-07 18:43:44 +09:00
Dean Herbert
f98dd1b811
Merge branch 'master' into popup-filter-effect 2021-10-07 18:40:21 +09:00
Dean Herbert
189358240d Fix intro tests and move steps out of constructor 2021-10-07 18:39:48 +09:00
Dan Balasescu
7074021d1f
Merge branch 'master' into test-scene-osu-game-fix-async-disposal-contention 2021-10-07 17:47:11 +09:00
smoogipoo
e586fee091 Remove unused usings 2021-10-07 17:46:30 +09:00
Dan Balasescu
0e0779e45b
Merge pull request #14988 from peppy/remove-gameplay-mod-bindable-storage
Remove local overridden storage of `Mods` in `Player`
2021-10-07 17:36:23 +09:00
Dan Balasescu
d50443fdf2
Merge branch 'master' into difficulty-move-to-beatmap 2021-10-07 16:50:10 +09:00
Dean Herbert
7e0379441c Change TestSceneOsuGame to use OsuGameTestScene to avoid async disposal deadlock
The original implementation was done so in a way that the nested `OsuGame` would be disposed via the async queue, causing a deadlock for 10-20s during test runs. `OsuGameTestScene` was already fixed to avoid this, so consuming it here seems like the easy fix.
2021-10-07 16:18:48 +09:00
Dean Herbert
0bd5136a29 Fix TestOverlayClosing occasionally failing due to running too fast 2021-10-07 15:55:29 +09:00
Dean Herbert
697f53c445 Fix test failure due to reference of Player.Mods 2021-10-07 15:00:47 +09:00
Jamie Taylor
fc0c3e8758
Attach filters at load time 2021-10-06 17:32:28 +09:00
smoogipoo
456cfd62bf Fix intermittent score panel test failure 2021-10-06 16:46:27 +09:00
Dean Herbert
4ca97bc60a
Merge branch 'master' into difficulty-move-to-beatmap 2021-10-06 16:14:21 +09:00
Dean Herbert
b339c149d8 Copy BaseDifficulty to Beatmap<T> and move all write operations across 2021-10-06 15:10:45 +09:00
Dan Balasescu
80c8612630
Merge pull request #14977 from peppy/fix-working-beatmap-cache-invalidation
Fix changes not being reflected immediately after exiting the editor
2021-10-06 13:51:21 +09:00
Dean Herbert
6e797ddcac Add test coverage of creating, saving and loading a new beatmap 2021-10-06 12:55:04 +09:00
Dan Balasescu
4bbff2ebf7
Merge branch 'master' into new-interfaces 2021-10-06 11:38:17 +09:00
Dan Balasescu
9491e5a547
Merge pull request #14954 from peppy/rename-result-response
Rename `APIRequest.Result` to `Response`
2021-10-06 10:52:33 +09:00
Dan Balasescu
007e5f174c
Merge pull request #14959 from peppy/add-screen-test-debug
Add various logging output in an atttempt to figure multiplayer test failure
2021-10-06 10:11:50 +09:00
Dan Balasescu
4e13af6524
Merge pull request #14957 from peppy/fix-song-select-test-failure
Fix `TestDifficultyIconSelectingForDifferentRuleset` potentially failing due to async load
2021-10-06 10:10:57 +09:00
Dan Balasescu
23f9b7a740
Merge pull request #14958 from peppy/fix-delete-local-score-test-failure
Fix delete local score test not waiting for "fetch" to complete
2021-10-06 10:09:26 +09:00
Dean Herbert
d6f25e07cc Add assert coverage of non-downloadable states 2021-10-06 05:49:18 +09:00
Dean Herbert
31c0c7a888 Remove pointless (and incorrect) click step 2021-10-06 05:49:04 +09:00
Dean Herbert
1a784b788d
Fix incorrect load state check
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-06 05:31:07 +09:00
Dean Herbert
777763a550 Add more comprehensive (and failing) test coverage of replay download button 2021-10-06 05:29:00 +09:00
Bartłomiej Dach
12da27cde7
Add test coverage for loading process on channel join 2021-10-05 20:52:40 +02:00
Dean Herbert
6f7b8293af
Merge pull request #14919 from smoogipoo/realtime-pp-display
Implement real-time PP counter
2021-10-05 20:50:03 +09:00
Dean Herbert
98fef6ece2 Handle judgement reverts with actual display updates 2021-10-05 19:08:30 +09:00
Dean Herbert
e6efdae7c9 Add various logging output in an atttempt to figure multiplayer test failure 2021-10-05 18:53:20 +09:00
Dean Herbert
5d708b612d Fix delete local score test not waiting for "fetch" to complete
Even though this is a completely local operation in this case, there's
still a level of asynchronous operation which was recent introduced with
the score ordering:

853cf6feaa/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs (L159)

This means there is a brief period where the `Scores` property is null,
after `Reset()` is called in the re-fetch procedure.
2021-10-05 18:17:22 +09:00
Dean Herbert
94153e8bba Fix TestDifficultyIconSelectingForDifferentRuleset potentially failing due to async load 2021-10-05 18:06:24 +09:00
Dean Herbert
0859c336de Also dim counter during initial calculation phase 2021-10-05 17:24:36 +09:00
Dean Herbert
04538a69e4 Add assert tests 2021-10-05 17:10:24 +09:00
Dean Herbert
eeb5f3d519 Add basic test scene 2021-10-05 16:51:43 +09:00
Dean Herbert
d3b9660148 Move common interface implementations to extension methods 2021-10-05 14:41:14 +09:00
Dean Herbert
b41fa41c85 Rename APIRequest.Result to Response 2021-10-05 14:28:56 +09:00
smoogipoo
86df4919f7 Fix skin fallbacks test 2021-10-05 11:06:26 +09:00
Dean Herbert
15ec315ec6 Fix test runs hanging due to missing ConfigureAwait 2021-10-05 02:07:00 +09:00
Dean Herbert
57c5be39d3 Merge branch 'master' into remove-local-realm-thread-switch-handling 2021-10-04 20:52:44 +09:00
smoogipoo
031c5a441e Merge branch 'master' into realtime-pp-display 2021-10-04 20:19:37 +09:00
Dan Balasescu
4bd1083388
Merge pull request #14903 from peppy/importer-returns-live
Add `ILive<T>` and use as return type of `Import` methods
2021-10-04 20:16:32 +09:00
smoogipoo
4871db2f86 Merge branch 'master' into importer-returns-live 2021-10-04 19:42:36 +09:00
Dean Herbert
853cf6feaa Rename last remaining BeatmapInfo Beatmap usage 2021-10-04 17:35:53 +09:00
Dan Balasescu
5937a93e2d
Merge pull request #14949 from peppy/login-error-display
Show login failure messages on login form
2021-10-04 17:23:11 +09:00
Dean Herbert
ae5d1e8ac0 Merge branch 'master' into remove-local-realm-thread-switch-handling 2021-10-04 17:17:10 +09:00
Dean Herbert
916342c837 Merge branch 'master' into importer-returns-live 2021-10-04 16:24:26 +09:00
smoogipoo
69c2b7dc59 Merge branch 'master' into rename-beatmap-info-beatmap-fields 2021-10-04 16:03:22 +09:00
Dan Balasescu
aa1bfc16d2
Merge pull request #14929 from peppy/gameplay-state
Replace `GameplayBeatmap` with `GameplayState`
2021-10-04 15:56:44 +09:00
Dan Balasescu
d82829fad3
Merge pull request #14909 from peppy/realm-context-factory-safer-blocking
Ensure realm blocks until all threaded usages are completed
2021-10-04 15:52:45 +09:00
Dean Herbert
266b4c7124 Expose login errors from IAPIProvider and show on the login form 2021-10-04 15:40:24 +09:00
Dean Herbert
537b29654e Fix stream being held open causing windows CI failures 2021-10-04 14:30:22 +09:00
Dean Herbert
c8419ebedb
Merge pull request #14946 from bdach/torus-alternate
Add alternate Torus font
2021-10-04 11:47:11 +09:00
Bartłomiej Dach
67d08a3eee
Add test scene for previewing Torus alternates 2021-10-04 00:26:41 +02:00
Bartłomiej Dach
83fa1be713
Merge branch 'master' into fix-keybinds-reset-search 2021-10-03 13:54:57 +02:00
Bartłomiej Dach
f05cb6bb5b
Add test case covering reset section button hiding 2021-10-03 13:53:26 +02:00
Bartłomiej Dach
281a3a0cea
Add test case for legacy loop count behaviour 2021-10-02 18:40:41 +02:00
Dean Herbert
ec61c3c5ee Rename all remaining cases 2021-10-03 00:55:29 +09:00
Dean Herbert
6ec2223b5c Catch potential file access exceptions also in async flow 2021-10-02 23:01:44 +09:00
Dean Herbert
973c31132b Rename BeatmapInfo variables which were named beatmap for clarity 2021-10-02 12:45:34 +09:00
Susko3
6d6fda8337 Fix some usages of SettingsTextBox using a bindable with null as default 2021-10-01 19:55:22 +02:00
Dean Herbert
32afd3f426 Replace all basic usages 2021-10-02 02:22:23 +09:00
Jamie Taylor
2a4a376b87
Refactor Filter to behave closer to a Transformable 2021-10-02 01:32:47 +09:00
Dean Herbert
682fe5be78
Merge branch 'master' into realm-context-factory-safer-blocking 2021-10-02 00:30:09 +09:00
Dan Balasescu
a620b55d55
Merge pull request #14900 from peppy/model-downloader-split
Split `ArchiveModelManager` into two pieces
2021-10-01 23:16:09 +09:00
smoogipoo
4e3d9da22d Increase test lenience 2021-10-01 22:58:40 +09:00
Dan Balasescu
d24f89fead
Merge pull request #14906 from peppy/update-realm-context-factory
Refine `RealmContext` implementation
2021-10-01 22:57:03 +09:00
Dean Herbert
b5345235ca Handle window file access errors 2021-10-01 10:40:55 +09:00
Dean Herbert
9c0abae2b0 Add failing test coverage of realm blocking behaviour 2021-10-01 01:20:06 +09:00
Dean Herbert
ca7346e01f Add test coverage 2021-10-01 00:34:09 +09:00
Dean Herbert
9fa901f6aa Refine RealmContext implementation API 2021-09-30 23:56:38 +09:00
Dean Herbert
a2e61883e3 Initial push to use ILive in import process 2021-09-30 22:55:25 +09:00
Dean Herbert
3e3b9bc963 Split out IModelDownloader and also split apart ScoreManager 2021-09-30 18:25:20 +09:00
Dean Herbert
90225f2082 Hook up all required interfaces to new BeatmapManager 2021-09-30 17:18:39 +09:00
Jamie Taylor
1304b55c41
Move visual test to correct namespace 2021-09-30 15:19:15 +09:00
Dean Herbert
6ffd9fdcfa Split out BeatmapOnlineLookupQueue from BeatmapManager 2021-09-30 14:46:01 +09:00
smoogipoo
18ab6747f7 Fix tests 2021-09-30 12:01:28 +09:00
Jamie Taylor
909f8d1d98
Add visual tests for Filter 2021-09-29 20:46:15 +09:00
smoogipoo
67d847fbd3 Add room status text to DrawableRoom 2021-09-29 20:24:49 +09:00
smoogipoo
d89577b2e7 Add host to DrawableRoomParticipantsList 2021-09-29 19:34:40 +09:00
smoogipoo
73ee82ee2b Rename RecentParticipantsList -> DrawableRoomParticipantsList 2021-09-29 19:15:58 +09:00
Dan Balasescu
f96effb2ea
Merge branch 'master' into enable-ipc-test 2021-09-29 16:32:53 +09:00
Dan Balasescu
625711e6d2
Merge pull request #14776 from peppy/fix-pause-with-audio-offset
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
2021-09-28 18:44:22 +09:00
Dean Herbert
46bafb6252 Merge branch 'master' into no-more-difficulty-control-points-info 2021-09-28 13:53:56 +09:00
Bartłomiej Dach
1a1fc00b44
Add failing test case 2021-09-27 20:54:29 +02:00
Dean Herbert
41fb3371e5
Merge branch 'master' into blueprint-container-sorting 2021-09-27 14:12:09 +09:00
Bartłomiej Dach
81d160c85a
Add test covering expected UX of range selection 2021-09-26 19:27:47 +02:00
Bartłomiej Dach
0de7db5840
Add test coverage for timeline selection logic 2021-09-26 19:20:55 +02:00
Bartłomiej Dach
7caa0a81ec
Rename TestScene{Editor -> Composer}Selection
In line with an upcoming split in functionality between the composer
blueprint container and the timeline blueprint container.
2021-09-26 17:22:58 +02:00
Bartłomiej Dach
ce70d1082d
Add failing test for "ghost timeline blueprint" 2021-09-26 15:29:00 +02:00
Bartłomiej Dach
0057400bb7
Rename test scene to reflect its new purpose 2021-09-26 15:09:30 +02:00
Bartłomiej Dach
4aadff3fd7
Add failing test for incorrect composer selection 2021-09-26 15:08:43 +02:00
Dean Herbert
dcadf3b81d Add failing test coverage of some dialogs being held on to 2021-09-23 19:18:51 +09:00
Dean Herbert
60c9e9f704
Merge pull request #14805 from bdach/rectangular-snap-grid
Add rectangular snap grid to osu! editor composer
2021-09-22 00:12:03 +09:00
Dean Herbert
78e7755df1 Re-enable IPC import test 2021-09-21 17:54:25 +09:00
Bartłomiej Dach
761548e533
Merge branch 'master' into 14470-ur-not-updating 2021-09-20 22:07:33 +02:00
Bartłomiej Dach
4e094b2127
Implement grid size toggling matching stable 2021-09-19 20:26:02 +02:00
sh0ckR6
93ca615c02
Add tests for clearing HitErrorMeter
Works with both `BarHitErrorMeter` and `ColourHitErrorMeter`
2021-09-19 14:15:22 -04:00
Bartłomiej Dach
56e80a0706
Add rectangular position snap grid 2021-09-19 18:07:19 +02:00
Opelkuh
366dbf5c3d Add test for time jumps 2021-09-19 15:35:03 +02:00
Opelkuh
761da45f6a Revert af4c3727d77a16e2534df9bbf452336b5c544342 2021-09-19 14:00:56 +02:00
Opelkuh
1d7d779f66 Merge branch 'master' into add-legacy-star-particles 2021-09-19 04:34:35 +02:00
Opelkuh
3f8454cb76 Remove abstract from ParticleSpewer 2021-09-19 03:19:16 +02:00
Opelkuh
ef530ed87c Normalize particle velocity based on max duration 2021-09-18 23:45:58 +02:00
Opelkuh
846cde53b3 Add RelativePositionAxes support 2021-09-18 22:54:12 +02:00
Dan Balasescu
90f1592d15
Merge pull request #14783 from peppy/login-feedback
Move login panel related files to own namespace and tidy up class nesting
2021-09-17 19:02:23 +09:00
Dan Balasescu
a591fffdbd
Merge pull request #14782 from peppy/refocus-textbox-on-failed-password
Refocus the multiplayer password entry textbox on failed join
2021-09-17 18:59:09 +09:00
Dean Herbert
e49d8d0878 Add test coverage of login dialog 2021-09-17 18:36:09 +09:00
Dean Herbert
a1f587f2c5 Add failing test coverage of password entry textbox not regaining focus 2021-09-17 18:25:25 +09:00
Dean Herbert
45caeb84d3 Fix incorrect type specification when restoring bindable value 2021-09-17 16:28:47 +09:00
Dean Herbert
2ab235ebe7 Use new temporary folder storage for beatmap import tests 2021-09-17 16:24:21 +09:00
Dean Herbert
e0bbc677d2 Fix TestRollbackOnFailure not cleaning up after itself 2021-09-17 16:23:09 +09:00
Dean Herbert
2c071a4d22 Add test coverage of pausing with a large audio offset 2021-09-17 15:43:38 +09:00
Dean Herbert
fde7c88999
Merge branch 'master' into update-framework 2021-09-16 22:49:02 +09:00
Dean Herbert
b399f910e4 Merge branch 'fix-osu-game-test-scene' into update-framework 2021-09-16 22:46:52 +09:00
Dean Herbert
df786afb24
Merge pull request #14763 from kj415j45/localisation-settings-GlobalAction
Add localisation for Settings-KeyBindings-GlobalActions
2021-09-16 21:08:00 +09:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
kj415j45
18e7d86dd4
Resolve test failure after localizing 2021-09-16 17:08:19 +08:00
Dean Herbert
2df4073946 SpawnParticle -> CreateParticle (and set time outside of virtual call)
Allows easier overriding (no need to call the `base.CreateParticle` call
and worry about overwriting the time value.
2021-09-16 16:52:46 +09:00
Dean Herbert
da0667365b
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-16 16:35:11 +09:00
Dean Herbert
fa693bb8a8 Move MusicController adjustment set to inside OsuScreen itself (and result nullable) 2021-09-16 16:08:09 +09:00
Dan Balasescu
43379a2eaa
Merge pull request #14752 from peppy/realm-settings
Move (ruleset) settings to realm
2021-09-16 14:05:41 +09:00
AbstractQbit
9057be1a02 Remove unused usings 2021-09-16 01:30:53 +03:00
AbstractQbit
3cd3e133ce Move AllowTrackAdjustments test to TestSceneOsuScreenStack 2021-09-16 01:24:50 +03:00
AbstractQbit
30c458c662 Oops, fix not compiling test 2021-09-15 21:34:41 +03:00
Dean Herbert
931e873a7e
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-15 22:26:13 +09:00
AbstractQbit
1181317c72 Fix issues found by code quality ci 2021-09-15 12:01:56 +03:00
AbstractQbit
9b101ea9eb Add a test for AllowTrackAdjustments 2021-09-15 11:40:23 +03:00
smoogipoo
cdb44d7239 Fix match footer test scene not working in visual testing 2021-09-15 17:16:11 +09:00
Dean Herbert
520e550764 Bring back SettingsStore to avoid changing ruleset API for now
Also fixes some remaining test failures due to locally constructed
rulesets that are not being tracked by the game.
2021-09-15 17:12:02 +09:00
Dean Herbert
ac377a2e3c Remove unused SettingsStore 2021-09-15 16:31:13 +09:00
Dean Herbert
a2f1752344 Make settings works with current caching structure
Will likely pull out that `RulesetConfigCache` next, but this is an
"everything works" state.
2021-09-15 16:31:13 +09:00
Dean Herbert
623377772c
Merge branch 'master' into fix-spectator-random-mod 2021-09-15 13:55:28 +09:00
Dean Herbert
a2dcef7c0a Use local (or barebones BeatmapInfo) where feasible 2021-09-15 13:40:05 +09:00
smoogipoo
4b3ab42ffd Ensure beatmap is populated 2021-09-15 13:18:46 +09:00
Dean Herbert
1ba716d9f1
Merge pull request #14737 from bdach/editor-difficulty-switch-shared-state
Preserve current time and clipboard contents when switching between difficulties
2021-09-15 12:38:56 +09:00
Bartłomiej Dach
7b9e501fa0
Merge branch 'master' into 14421-multi-password-error-handling 2021-09-14 22:58:20 +02:00
Dean Herbert
67750e6e1a Fix subsequent navigation tests failing due to escape key not being released 2021-09-14 15:08:43 +09:00
Dean Herbert
6851e0000d Add test coverage 2021-09-14 14:06:24 +09:00
Opelkuh
b009772206 Fix code inspect failure 2021-09-13 21:44:28 +02:00
Opelkuh
224244801f Remove Particles namespace 2021-09-13 21:44:27 +02:00
Opelkuh
7327603fc8 Fix outdated test step description 2021-09-13 21:44:26 +02:00
Opelkuh
cfcb46034c Remove ParticleJet 2021-09-13 21:44:23 +02:00
Opelkuh
328c9a5dd0 Change ParticleSpewer.Active to a Bindable 2021-09-13 21:44:18 +02:00
Opelkuh
1a60ce164e Add ParticleJet 2021-09-13 21:44:16 +02:00
Bartłomiej Dach
cbb9ff1c49
Only run prompt-for-save test logic when relevant 2021-09-13 21:04:28 +02:00
Bartłomiej Dach
79d0f4835e
Add failing tests for preserving clipboard content 2021-09-13 21:03:30 +02:00
Bartłomiej Dach
80e54d51f2
Add failing test for preserving editor clock time 2021-09-13 20:56:36 +02:00
Dean Herbert
e8d4e2e6da Fix tests being blocked by notification overlay popup 2021-09-13 19:38:53 +09:00
Dean Herbert
24ae530a80 Add test coverage of double dispose of OsuGame 2021-09-13 19:04:13 +09:00
Dean Herbert
aa71e3f3d4 Update nested game tests in line with framework changes 2021-09-13 19:04:13 +09:00
Dean Herbert
65fdceee79
Merge branch 'master' into editor-test-scenes-through-loader 2021-09-13 14:02:55 +09:00
Dan Balasescu
d9b4fae4e5
Merge branch 'master' into chat-command 2021-09-13 13:32:44 +09:00
Bartłomiej Dach
cd181452be
Add decoding support for SamplesMatchPlaybackRate 2021-09-12 16:45:27 +02:00
Bartłomiej Dach
eae5d62fa5
Store editor beatmap locally before editor exit 2021-09-12 15:50:41 +02:00
Bartłomiej Dach
22fa9a303e
Expose test helper for switching between difficulties 2021-09-12 13:55:48 +02:00
Bartłomiej Dach
5ae2f41930
Make difficulty switching test scene use EditorTestScene 2021-09-12 13:26:05 +02:00
Bartłomiej Dach
3467b1f60c
Retouch chat command test slightly 2021-09-12 13:00:52 +02:00
Davran Dilshat
eeaa8a8380 code quality 2021-09-11 16:47:20 +01:00
Davran Dilshat
605933c467 typo 2021-09-11 16:23:17 +01:00
Davran Dilshat
7924a990a3 add tests for /chat command 2021-09-11 16:22:35 +01:00
Bartłomiej Dach
addba43e7d
Merge branch 'master' into fix-password-popover-back-button 2021-09-11 14:18:25 +02:00
Dean Herbert
5a06954665 Add test coverage of game exit scenario 2021-09-10 18:23:00 +09:00
Dean Herbert
5f61936700 Update legacy encoder tests to only compare pieces we care about 2021-09-10 17:29:09 +09:00
Dan Balasescu
f4b1d8b9d1
Merge pull request #14704 from peppy/modicon-imod-support
Update `LeaderboardModSelector` to avoid creating mod instances
2021-09-10 16:43:32 +09:00
Dean Herbert
309460e505
Merge pull request #14675 from ekrctb/featured-artist-markers
Add featured artist markers to beatmap listing and overlay
2021-09-10 14:30:33 +09:00
Dan Balasescu
2d2c63dde7
Merge branch 'master' into modicon-imod-support 2021-09-10 13:30:05 +09:00
Dan Balasescu
78a83e0903
Merge pull request #14698 from peppy/fix-beatmap-overlay-hide
Fix beatmap listing overlay not hiding via keyboard control when scrolled
2021-09-10 13:18:37 +09:00
Dan Balasescu
80f49ec5fd
Merge branch 'master' into cached-all-mods 2021-09-10 12:47:22 +09:00
Dean Herbert
464797fecf Allow ModIcon to be constructed using an IMod 2021-09-10 12:43:12 +09:00
Dean Herbert
9cf79a80c2 Replace many more calls to CreateAllMods with more specific calls 2021-09-10 12:04:55 +09:00
Dean Herbert
76e877f160 Disable APIMod/Mod cross equality support 2021-09-10 11:24:56 +09:00
Dean Herbert
cf633973a9 Refactor exposed mod retrieval methods for better safety 2021-09-10 11:09:13 +09:00
Bartłomiej Dach
32de13cb96
Use consistent assertions for checking placeholder presence 2021-09-09 21:33:02 +02:00
Dean Herbert
3865988e48 Add test coverage for back button support in password popover 2021-09-10 02:15:13 +09:00
Dean Herbert
2e00c71842 Add failing test coverage 2021-09-10 01:57:33 +09:00
ekrctb
a2c2646230 Use a counter instead of RNG 2021-09-09 19:36:47 +09:00
ekrctb
210640af09 Fix overlay not refreshed in TestSceneBeatmapSetOverlay 2021-09-09 12:39:40 +09:00
Dean Herbert
199f5235a3
Merge branch 'master' into fix-score-panel-list-keyboard-nav 2021-09-09 12:12:16 +09:00
Dean Herbert
6fc46792d3 Fix test regressions 2021-09-09 00:39:54 +09:00
Dean Herbert
7ed995fbc5 Add test with many rooms displayed 2021-09-08 20:52:14 +09:00
ekrctb
8745d299dc Add visual tests for featured artist markers 2021-09-08 13:27:57 +09:00
Bartłomiej Dach
2097889ce1
Add failing test case 2021-09-07 21:12:48 +02:00
Dan Balasescu
87434333d2
Merge pull request #14659 from peppy/update-framework
Update framework
2021-09-07 21:03:37 +09:00
Dean Herbert
c43ac8c946
Merge pull request #14660 from ekrctb/search-featured-artists
Add "featured artists" filter to beatmap listing
2021-09-07 20:58:13 +09:00