1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:07:52 +08:00
Commit Graph

469 Commits

Author SHA1 Message Date
Dean Herbert
7f65f3a47f Remove all usage of BaseDifficulty (and access Difficulty instead) 2022-01-18 22:57:39 +09:00
Dean Herbert
1b62a685f3 Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-18 15:07:59 +09:00
Dean Herbert
125439d177 Update all (non-NET6) nuget packages 2022-01-18 11:09:26 +09:00
Dean Herbert
5601f6f1fe Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-17 12:29:02 +09:00
Bartłomiej Dach
8e5ff201a1
Modify mania special skin to demonstrate failure case 2022-01-16 18:59:26 +01:00
Bartłomiej Dach
093b76e0ff
Fix drawable mania judgement scene looking broken 2022-01-16 18:56:21 +01:00
Dean Herbert
b5f670cc5b Add far too many fixes for ruleset non-nullable requirements 2022-01-12 23:24:11 +09:00
Dean Herbert
f9713b8895 Replace usage of TimeoutAttribute to fix beatmap conversion test failures 2022-01-04 11:51:41 +09:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Bartłomiej Dach
c429c74d89
Expose and use test ruleset config cache in test scenes 2021-12-23 19:42:26 +01:00
Bartłomiej Dach
5cbaa028eb
Use extracted ruleset config cache implementation in DI 2021-12-23 19:02:10 +01:00
Dean Herbert
441b7baa93 Provide a realm factory to usages of ToLive/RealmLive 2021-12-14 14:26:34 +09:00
Dean Herbert
f6a3709060 Store default skins to database 2021-11-29 18:28:25 +09:00
Dean Herbert
23146d59d1 Use ILive for current skin 2021-11-29 18:28:25 +09:00
Dean Herbert
e0629ba81c Update all dependencies 2021-11-20 13:31:10 +09:00
Dean Herbert
fabf253381 Update difficulty calculator tests to also use IWorkingBeatmap 2021-11-15 19:16:49 +09:00
Dean Herbert
369b4ba789 Update DifficultyCalculator to take an IRulesetInfo 2021-11-15 19:16:48 +09:00
Bartłomiej Dach
5e31e890ae
Extract class for clipboard contents for DI purposes 2021-11-10 12:36:23 +01:00
Bartłomiej Dach
410e9159d1
Fix test failures due to missing dependencies 2021-11-09 19:54:38 +01:00
dependabot[bot]
7747fd5810
Bump Microsoft.NET.Test.Sdk from 16.11.0 to 17.0.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.11.0 to 17.0.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.11.0...v17.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:01:54 +00:00
Dean Herbert
5c7623e68e
Merge pull request #15255 from goodtrailer/node-samples-ilist
Change IHasRepeats.NodeSamples to IList from List
2021-10-28 14:24:26 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
goodtrailer
4440b9ca11 Change IHasRepeats.NodeSamples to IList from List 2021-10-23 01:59:07 -07:00
Dean Herbert
46bafb6252 Merge branch 'master' into no-more-difficulty-control-points-info 2021-09-28 13:53:56 +09:00
Dean Herbert
bb132f9509 Update a few more missed event changes in tests 2021-09-16 22:41:35 +09:00
Dean Herbert
45b07aa362 Add some basic animated textures to mania metric skin 2021-09-16 15:33:55 +09:00
smoogipoo
f9af24df23 Fix mania hitobject tests 2021-09-15 15:22:27 +09:00
Bartłomiej Dach
1edf608260
Add failing test case 2021-09-12 18:17:39 +02:00
Bartłomiej Dach
fdd48c3e71
Refactor note colouring test scene 2021-09-12 17:42:35 +02:00
Dean Herbert
1952ebece9 Update tests to use more correct control point definitions 2021-09-06 22:04:51 +09:00
Dean Herbert
d4e5a612ea Update IPositionalSnapProvider to take a HitObject as reference, rather than raw time
This allows fetching the correct `DifficultyControlPoint` from the
hitobject. Nothing more.
2021-09-03 17:11:12 +09:00
Dean Herbert
a3d9ab1e2e Move approach rate to EffectControlPoint 2021-09-03 16:58:16 +09:00
dependabot[bot]
5a1eccd8e3
Bump Microsoft.NET.Test.Sdk from 16.10.0 to 16.11.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.10.0 to 16.11.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.10.0...v16.11.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-01 18:17:37 +00:00
Salman Ahmed
15812520bd Replace global editor test case with mania compose screen test scene 2021-08-26 09:45:01 +03:00
dependabot[bot]
0d3de488de
Bump NUnit3TestAdapter from 3.17.0 to 4.0.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.17.0 to 4.0.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.17...V4.0.0)

---
updated-dependencies:
- dependency-name: NUnit3TestAdapter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 17:02:17 +00:00
ekrctb
9dcd0bf311 Remove IPlayfieldProvider by caching Playfield 2021-06-17 10:15:24 +09:00
ekrctb
a431b4eeda Add scrolling direction toggle for mania selection blueprint test scene 2021-06-15 15:22:36 +09:00
ekrctb
403aa433cf Rewrite mania selection blueprint test scene 2021-06-15 15:14:14 +09:00
ekrctb
d0e57f7dd9 Use HitObject instead of DHO for mania selection blueprint layout
- Fix moving selected hold note between columns will cause a crash
2021-06-15 13:20:51 +09:00
Dean Herbert
5366e7f61e
Merge branch 'master' into remove-hud-component-lookup 2021-06-02 16:10:06 +09:00
Dean Herbert
f8ae70e562 Update existing function type rather than adding an override 2021-06-02 16:04:53 +09:00
dependabot[bot]
967a7c3db5
Bump Microsoft.NET.Test.Sdk from 16.9.4 to 16.10.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.4 to 16.10.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.4...v16.10.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:27 +00:00
Dean Herbert
ebfc24a499 Rename conflicting resources 2021-05-31 19:14:49 +09:00
Dean Herbert
b16d10bd95 Provide game-wide resources via IStorageResourceProvider 2021-05-31 18:57:47 +09:00
Dean Herbert
bddc3121dc Merge branch 'master' into mania-pooling 2021-05-19 17:23:45 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry 2021-05-18 20:10:12 +09:00
smoogipoo
562ac73e96 Merge branch 'hoc-event-queue' into mania-pooling 2021-05-18 14:54:00 +09:00
smoogipoo
72beddaadc Remove nested blueprints from hold notes 2021-05-18 14:25:07 +09:00
smoogipoo
b5afe4e506 Merge branch 'hoc-event-queue' into mania-pooling 2021-05-13 21:53:38 +09:00
smoogipoo
1ae57a6105 Fix hold note input test
Not sure why this was checking visibility. If it needs to be tested, it
does not belong in an "Input" test.
2021-05-13 20:11:06 +09:00
smoogipoo
ffb6135a1b Rework hitobject blueprints to take in hitobject models 2021-05-13 19:53:32 +09:00
smoogipoo
5692cecaa4 Initial implementation of DHO pooling 2021-05-12 16:35:05 +09:00
Justus Franklin Tumacder
0b06c5bcb1 Remove unneeded test data 2021-05-01 15:00:18 +08:00
Justus Franklin Tumacder
ecb053b0de Merge branch 'master' of https://github.com/ppy/osu into justusft/mania-color-snap 2021-05-01 11:20:28 +08:00
ekrctb
fd8e552a8b Fix filename not matching class name 2021-04-29 19:36:52 +09:00
ekrctb
4cc94efb06 Fix failing mania test 2021-04-29 14:39:52 +09:00
ekrctb
799d2a3300 Replace failed mania test (pooling not accounted) with a more robust test
Also fix null reference in Playfield
2021-04-29 14:38:01 +09:00
dependabot[bot]
1b3b07d6a9
Bump NUnit from 3.13.1 to 3.13.2
Bumps [NUnit](https://github.com/nunit/nunit) from 3.13.1 to 3.13.2.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/v3.13.2/CHANGES.md)
- [Commits](https://github.com/nunit/nunit/compare/v3.13.1...v3.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-29 03:51:12 +00:00
Justus Franklin Tumacder
4752a0201a Fix cake errors 2021-04-27 19:40:04 +08:00
Justus Franklin Tumacder
c4d28110d6 Add visual tests for timing based note coloring 2021-04-27 19:02:57 +08:00
Justus Franklin Tumacder
8b9d2a6cff Remove caching for ConfigColourCodedNotes 2021-04-25 08:32:49 +08:00
Justus Franklin Tumacder
bedabc1ddf Fix cake errors 2021-04-24 22:12:07 +08:00
Justus Franklin Tumacder
8b01082cbb Fix visual tests missing dependency for ColourCodedNotes 2021-04-24 21:28:48 +08:00
Justus Franklin Tumacder
f9905ebe68 Remove beatmap argument in Note 2021-04-24 19:37:10 +08:00
Justus Franklin Tumacder
7e3a611f95 Add snap color option for osu!mania 2021-04-24 16:23:52 +08:00
smoogipoo
30e6ea4291 Add failing test 2021-04-22 18:59:57 +09:00
ekrctb
a965e8a75d Remove AutoGenerator workaround of now-fixed issue 2021-04-16 14:13:41 +09:00
Dan Balasescu
345779b19a
Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-04-02 20:58:29 +09:00
dependabot-preview[bot]
6a286c5e21
Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.1 to 16.9.4.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.1...v16.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-01 17:16:02 +00:00
smoogipoo
f78d628878 Improve assertions 2021-03-31 12:21:07 +09:00
smoogipoo
ded91b32a4 Add failing test 2021-03-31 12:11:43 +09:00
smoogipoo
8438fce764 Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-03-26 11:47:38 +09:00
Bartłomiej Dach
d85929d721 Adjust autoplay generation tests to match expected behaviour 2021-03-22 22:45:21 +01:00
Bartłomiej Dach
c4f3714385 Make hold note input tests fail due to head hiding 2021-03-21 18:39:57 +01:00
Bartłomiej Dach
a16c0641b2 Revert EF Core to version 2.2
This reverts commit f3faad74d5, reversing
changes made to 712e7bc7bf.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
2021-03-21 11:05:15 +01:00
Dean Herbert
1573298e68 Update remaining package references to point to efcore5 2021-03-15 13:12:10 +09:00
dependabot-preview[bot]
b03efd6940
Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.3 to 16.9.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.3...v16.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-02 00:43:45 +00:00
smoogipoo
dff1d80f39 Update HasFlag usages to HasFlagFast 2021-02-25 15:38:56 +09:00
Samuel Cattini-Schultz
417bb07b36 Update tests with fixed diffcalc values 2021-02-20 20:23:49 +11:00
Samuel Cattini-Schultz
9d229a5ec2 Add tests for clockrate adjusted difficulty calculations 2021-02-20 16:27:58 +11:00
Dean Herbert
72b2123500 Update nunit in line with framework 2021-02-15 21:42:35 +09:00
smoogipoo
30dae5bf1c Add test to make sure the algorithm is passed down in time 2021-02-04 15:21:26 +09:00
Dean Herbert
1e99357a97 Update build configurations to net5.0 paths 2021-01-19 12:13:27 +09:00
Roman Kapustin
0ea4e221b2 Merge branch 'master' into net5.0 2021-01-14 14:02:51 +03:00
dependabot-preview[bot]
0fd2e368c1
Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-01 17:53:41 +00:00
Dean Herbert
3c8f871b28 Move player constructor configuration to dedicated class; add AllowRestart parameter 2020-12-23 17:47:46 +09:00
Dean Herbert
53da137425
Merge branch 'master' into net5.0 2020-12-10 17:14:21 +09:00
ekrctb
e3c035fe9c Adjust namespace 2020-12-07 12:32:52 +09:00
dependabot-preview[bot]
5772a0811c
Bump Microsoft.NET.Test.Sdk from 16.7.1 to 16.8.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.1 to 16.8.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.1...v16.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:09 +00:00
Dean Herbert
c9a41f9dae Make all objects in selection candidates for spatial snapping
Closes #10898.
2020-11-24 17:35:54 +09:00
Roman Kapustin
3b600f0a7b Target net5.0 instead of netcoreapp3 2020-11-20 10:45:19 +03:00
Bartłomiej Dach
24d7fa03d8
Merge branch 'master' into legacy-jugement-match-stable-transforms 2020-11-18 20:33:58 +01:00
Dean Herbert
191b95810c Fix whitespace issues 2020-11-18 19:47:35 +09:00
Dean Herbert
20bb64c627 Fix mania misses not correctly animating (temporary solution) 2020-11-18 19:34:00 +09:00
Dan Balasescu
cb3280af7c
Merge branch 'master' into hold-note-fade 2020-11-17 13:49:28 +09:00
ekrctb
a53b5ef8b9 Remove --no-restore from VSCode build tasks 2020-11-16 19:22:08 +09:00
Bartłomiej Dach
ee5e70135f Cover mapping fully for mania mods 2020-11-15 15:09:02 +01:00
Bartłomiej Dach
9899687bfe Rename existing method to allow for new one 2020-11-15 14:17:41 +01:00
Bartłomiej Dach
2ccc81ccc0 Add test case for fading hold note 2020-11-13 20:52:15 +01:00
Bartłomiej Dach
2f33aeac9f Move drawable instatiation to [SetUp] 2020-11-13 20:52:15 +01:00
smoogipoo
508ae91a97 Revert unnecessary change 2020-11-11 12:54:36 +09:00
smoogipoo
626231d906 Completely remove check as it can occur for hits too 2020-11-11 12:53:32 +09:00
smoogipoo
1173ef0890 Fix mania notelock crashing with overlapping hitwindows 2020-11-11 12:37:00 +09:00
kamp
ceb17764b1 Also replace / with - for args in other task.jsons 2020-11-07 01:09:21 +01:00
Dean Herbert
7bef695072 Merge branch 'master' into fix-test-beatmap-virtual-clock 2020-10-29 17:51:15 +09:00
smoogipoo
f9bdb664ee Update diffcalc test 2020-10-14 17:09:01 +09:00
smoogipoo
573336cb47 Ensure stable sorting order in beatmap conversion tests 2020-10-09 20:12:17 +09:00
Dean Herbert
7fead6ee41 Add comment making mania test behaviour clearer 2020-10-05 14:22:48 +09:00
Dean Herbert
75ae9f1b30 Remove unused using 2020-10-02 19:57:14 +09:00
Dean Herbert
ed34985fdd Add step for mania note construction 2020-10-02 18:47:11 +09:00
Dean Herbert
1a0171fb2d Fix tests specifying steps in their constructors 2020-10-02 18:23:18 +09:00
smoogipoo
379a4cca85 Adjust hold note tests 2020-09-29 17:48:44 +09:00
Dean Herbert
c41fb67e73 Move all ruleset editor tests to their own namespace 2020-09-25 18:51:26 +09:00
smoogipoo
679dc34aa4 Add test timeouts 2020-09-07 17:18:54 +09:00
smoogipoo
c72a8d4755 Add zero-length slider test 2020-09-07 17:18:40 +09:00
dependabot-preview[bot]
66c0d12da6
Bump Microsoft.NET.Test.Sdk from 16.7.0 to 16.7.1
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.0 to 16.7.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.0...v16.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-01 17:19:46 +00:00
smoogipoo
8151aa6ed8 Remove unused method 2020-08-31 13:32:01 +09:00
smoogipoo
aa151e4cd7 Merge branch 'master' into mania-notelock 2020-08-31 13:31:41 +09:00
Bartłomiej Dach
58742afd99 Add failing test case 2020-08-29 11:47:31 +02:00
smoogipoo
deb172bb6c Implement basic mania hit order policy 2020-08-27 20:24:21 +09:00
smoogipoo
1db836e9e0 Merge branch 'master' into hold-note-lighting 2020-08-26 20:22:07 +09:00
smoogipoo
e6116890af Make hitobject tests display the column 2020-08-26 20:00:38 +09:00
smoogipoo
7e9567dae9 Fix tests 2020-08-25 14:49:29 +09:00
smoogipoo
583760100a Implement mania invert mod 2020-08-18 01:40:55 +09:00
dependabot-preview[bot]
d7de8b2916
Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.7.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-10 17:17:07 +00:00
smoogipoo
e5ebd21156 Fix test scene and add pooling support 2020-07-29 16:25:17 +09:00
smoogipoo
f044c06d08 Fix hold notes accepting presses during release lenience 2020-07-20 22:26:58 +09:00
smoogipoo
03a7b8a6ef Rename 2020-07-16 21:18:24 +09:00
smoogipoo
18d3685023 Pass in content 2020-07-16 21:17:51 +09:00
smoogipoo
b09c584d91 Add test 2020-07-16 17:42:37 +09:00
dependabot-preview[bot]
8087a75c35
Bump NUnit3TestAdapter from 3.15.1 to 3.17.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.17.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-13 17:22:39 +00:00
mcendu
5c2959eeb6
allow lookup of stage decoration paths and add test images 2020-07-05 13:02:50 +08:00
Bartłomiej Dach
5e92809401 Add failing test case 2020-06-27 16:46:43 +02:00
Bartłomiej Dach
c47f762f24 Update test scene to allow checking samples 2020-06-27 16:45:39 +02:00
Bartłomiej Dach
c7d2ce12eb Add failing test cases 2020-06-22 20:08:32 +02:00
Dan Balasescu
904b688b4b
Merge branch 'master' into test-scene-create-ruleset 2020-06-15 16:40:02 +09:00
mcendu
aa476835e7 tidy up code 2020-06-13 11:31:34 +08:00
mcendu
a42bfcb5ab remove reference to stage bottom from skin ini 2020-06-12 23:23:57 +08:00
mcendu
da46288ef0 remove stage bottom image 2020-06-12 23:20:04 +08:00
mcendu
7def6a9181 fix tests incorrectly showing judgements not present in mania 2020-06-12 23:06:19 +08:00
mcendu
8a9d011197 add test files 2020-06-12 22:09:58 +08:00
Dean Herbert
0b6e8783d4
Merge branch 'master' into test-scene-create-ruleset 2020-06-12 17:06:27 +09:00
Bartłomiej Dach
4c6116e6e7 Fix compilation failure in Android test project 2020-06-04 23:50:58 +02:00
Bartłomiej Dach
35544ede50 Add failing test cases 2020-06-04 22:33:30 +02:00
Bartłomiej Dach
6b88141e58 Add mania sample conversion test 2020-06-04 21:53:37 +02:00
Salman Ahmed
741fa20149
Use CreateRuleset() for editor test scenes as well 2020-06-04 00:47:10 +03:00
Salman Ahmed
84b40ea2c6
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
#	osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
#	osu.Game/Tests/Visual/ModTestScene.cs
#	osu.Game/Tests/Visual/OsuTestScene.cs
2020-06-03 22:00:02 +03:00
Dan Balasescu
64d1b4b11b
Merge branch 'master' into move-setter-to-duration 2020-06-01 15:55:48 +09:00
Dean Herbert
e43217f579 Add test resources 2020-05-31 20:01:13 +09:00
Dean Herbert
e8b43e8e1f Merge branch 'master' into move-setter-to-duration 2020-05-29 16:04:23 +09:00