h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:12:54 +08:00
Code Issues Releases Wiki Activity
56,697 Commits 3 Branches 661 Tags 368 MiB
e8603ede15
Commit Graph

458 Commits

Author SHA1 Message Date
Dean Herbert
6cc81c24b4
Merge pull request #13785 from ekrctb/dependency-providing-container 
Add a convenient way to provide ad-hoc dependency to children in visual test
 2021-07-20 14:18:17 +09:00
ekrctb
9db5847344 Add test that a slider path is resampled when the path is edited 2021-07-19 22:53:32 +09:00
ekrctb
8586458704 Implement vertex deletion in juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
08f8d4e65e Implement vertex addition in juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
01f5258a26 Add tests of juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
b88ee3c1a1 Pass DroppedObjectContainer via constructor instead of DI 
It is now just one level deep, so it is not beneficial to use DI here.
This effectively reverts ae09c23e.
 2021-07-19 20:11:49 +09:00
ekrctb
50f9e5f362 Replace usage of CatcherArea.MovableCatcher with Catcher 2021-07-19 19:52:40 +09:00
ekrctb
97059a9f50 Create Catcher in CatchPlayfield 2021-07-19 19:44:40 +09:00
ekrctb
87c39909c6 Simplify DependencyProvidingContainer 
Using an array of tuple for dependencies instead of using children.
 2021-07-19 14:37:19 +09:00
ekrctb
fffe0d2e57 Add tests of JuiceStreamPath. 
"Property testing" is heavily used, tests that generates random cases and asserting properties.
That gives high confidence of round-trip correctness of `SliderPath` conversion, for example.
 2021-07-19 13:59:10 +09:00
ekrctb
25b94061fd Fix assert step not waiting for transformation 2021-07-08 16:40:18 +09:00
ekrctb
8ac3015f14 Add tests of banana shower placement blueprint 2021-07-08 16:36:44 +09:00
ekrctb
68116aa042 Fix placement blueprint animation is not running in test scene 2021-07-08 16:17:09 +09:00
ekrctb
ae67409f41 Add a test of fruit placement blueprint 2021-07-08 16:12:08 +09:00
ekrctb
8da1335e5f Add catch placement blueprint visual test scenes (without tests) 2021-07-08 15:51:46 +09:00
ekrctb
bd4b3f5268 Add catch selection blueprint visual test scene (without tests) 2021-07-08 15:42:29 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Dean Herbert
01961fe4f9
Merge pull request #13747 from ekrctb/catcher-flip 
Don't flip catcher plate contents when catcher changes direction
 2021-07-06 00:02:23 +09:00
ekrctb
5a0a223b1b Use DependencyProvidingContainer in TestSceneCatcher 2021-07-05 19:07:48 +09:00
ekrctb
623ba15919 Relax caught object stacking test 
The stacking code currently uses an unseeded RNG and there is a non-zero chance the stack will be very flat (small Y position difference).
Technically, `RNG.NextSingle(0, 5)` can return `0`, but extremely unlikely that the all RNG calls return 0.
 2021-07-04 10:23:49 +09:00
ekrctb
333caca386 Add test for catcher plate flipping configuration 2021-07-02 23:23:23 +09:00
ekrctb
170513568b Move caught object stack vertical offset logic 2021-07-02 20:43:47 +09: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
ae09c23e4e Resolve DroppedObjectContainer via DI 2021-06-24 16:09:13 +09:00
ekrctb
16d5893535 Add DroppedObjectContainer class 2021-06-24 15:51:54 +09:00
ekrctb
fbe44dac34 Add empty catch hit object composer 2021-06-22 17:20:13 +09:00
ekrctb
67d8e0059f Use singular IApplicableToDrawableHitObject for consumers 2021-06-16 18:47:04 +09:00
Dean Herbert
33aec57238 Replace 1.0 version in old skin test assets with none 2021-06-11 15:45:34 +09:00
ekrctb
8d0840020b Specify legacy skin version of old-skin testing skin 
Old-style catcher sprite is not supported for all versions
 2021-06-11 15:33:13 +09:00
Dean Herbert
e388a896e8 Don't apply visibility increase to first object in osu!catch 
The goal of the visibility increase is to help in cases where timing is
an issue (by showing the approach circle etc.). This doesn't need to
apply to catch.

@smoogipoo interested as to whether you agree with this one. Visually it
looks better to me but it does change the behaviour for only osu!catch,
so I'm not 100% confident on it.

Closes #13367.
 2021-06-08 16:02:26 +09:00
ekrctb
181f1da3d3 Maintain catch hit explosion by lifetime entries 
- Fix hit explosion not showing when a replay is rewound to a time after a hit object is caught
 2021-06-04 19:46:50 +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
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
Salman Ahmed
e20c25b0d9 Fix miswritten test assertion 2021-05-19 23:32:16 +03:00
Salman Ahmed
a730349629 Remove the ignore attribute once again 2021-05-19 23:18:54 +03:00
Salman Ahmed
076fcec3df Revert "Remove ignore attribute from now fixed test scene" 
This reverts commit 4e12a2734c.
 2021-05-18 17:45:15 +03:00
Salman Ahmed
4e12a2734c Remove ignore attribute from now fixed test scene 2021-05-18 09:51:58 +03:00
Salman Ahmed
ff419af512 Hide the combo counter content rather than full death 2021-05-18 09:10:15 +03: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
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
Dean Herbert
bdf07ad59a Limit catching towards the centre of the plate (to emulate actual gameplay) 2021-04-22 17:47:03 +09:00
Dean Herbert
2203552e9e Add stacking test logic to TestSceneCatcherArea for skinned testing 2021-04-22 17:34:53 +09:00
Dean Herbert
84a7138223 Update tests to better support stack regeneration cases 2021-04-22 17:13:19 +09:00
ekrctb
b10ee7482d Add a failing test to check catch replay accuracy 2021-04-09 15:58:23 +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
8438fce764 Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-03-26 11:47:38 +09: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
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09: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
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
Dean Herbert
1e99357a97 Update build configurations to net5.0 paths 2021-01-19 12:13:27 +09:00
Dean Herbert
1364de1166
Merge branch 'master' into beatmap-colour-setting 2021-01-18 16:07:46 +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
Mysfit
0c01a3a685 Found a better solution than TValue type checking for additional beatmap colour settings. Added unit tests for Catch Beatmap Skin settings. 2021-01-14 23:30:24 -05: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
ekrctb
5b5e883904 Remove EffectiveXBindable (setting Value was not handled) 
And use orthogonal `OriginalXBindable` and `XOffsetBindable`.
 2020-12-14 13:39:07 +09:00
ekrctb
d96399ea42 Revert "Remove X setter from CatchHitObject" 
This reverts commit 7cbbd74d
 2020-12-14 13:18:14 +09:00
ekrctb
7cbbd74df2 Remove X setter from CatchHitObject 2020-12-14 11:38:07 +09:00
ekrctb
96f3e0dad8 Replace CatchHitObject.X usage to EffectiveX and OriginalX 2020-12-14 11:03:14 +09:00
ekrctb
2634c6b8d9 Combine DisplayRadius and Scale to DisplaySize 2020-12-10 20:43:01 +09:00
Dean Herbert
53da137425
Merge branch 'master' into net5.0 2020-12-10 17:14:21 +09:00
ekrctb
ccca7e0b25 more specific type droppedObjectContainer 2020-12-09 10:35:01 +09:00
ekrctb
749d5380ca Pool caught objects and dropped objects 2020-12-08 22:38:10 +09:00
ekrctb
c301223d8c Make object on the catcher plate separate CaughtObject class 2020-12-08 21:11:40 +09:00
ekrctb
ed50fd445e Fix hit lighting colour not applied in TestSceneCatcher 2020-12-08 21:07:12 +09:00
ekrctb
004c705aa9 Remove ScaleContainer and flatten the Drawable tree of catch DHO 2020-12-08 20:37:08 +09:00
smoogipoo
9d926de944 Fix test failure 2020-12-08 17:04:30 +09:00
ekrctb
100b365c98 Restore hyper dash state on revert judgement result 2020-12-08 15:21:47 +09:00
ekrctb
cb76a2d7b5 Restore catcher state on revert judgement result 2020-12-08 15:03:03 +09:00
ekrctb
0213f77b4b Move catcher state changing logic to OnNewResult method 2020-12-08 14:28:30 +09:00
ekrctb
d18397acad Adjust namespace 2020-12-07 12:35:24 +09:00
Dean Herbert
aa24890aff
Merge branch 'master' into caught-object-refactor 2020-12-04 14:12:33 +09:00
ekrctb
e82ca66d3e Fix depth of dropped objects 2020-12-04 10:21:54 +09:00
ekrctb
3de46d0a3b Fix & clarify catcher tests 2020-12-04 10:14:00 +09:00
ekrctb
1d669cf65e Add more TestSceneCatcher tests 
Some tests are moved from TestSceneCatcherArea
 2020-12-03 16:44:36 +09:00
ekrctb
2eb2c934cc Refactor fruit dropping code 
- The repeated `Remove` call was quadratic complexity.
  Now it is linear time.
 2020-12-03 16:44:36 +09:00
ekrctb
fdcfa81e46 Make RandomSeed a property, not a bindable 2020-12-02 20:53:47 +09:00
ekrctb
5936a8ffb4 Fix drawables are added multiple times in a test scene 2020-12-02 18:06:14 +09:00
ekrctb
1a6b8e022c Fix formatting 2020-12-02 17:20:52 +09:00
ekrctb
ef741a1471 Test banana colour change based on random seed 2020-12-02 17:16:36 +09:00
ekrctb
beda6961e4 Add a test for fruit randomness 2020-12-02 16:55:58 +09:00
ekrctb
8a78c495f2 Refactor DHO testing logic to the "specimen" class 2020-12-02 16:55:37 +09:00
Dean Herbert
71a121389b
Merge pull request #11033 from smoogipoo/immutable-hit-samples 
Make HitSampleInfo immutable
 2020-12-02 14:44:26 +09:00
Dan Balasescu
2e0fdf9bca
Merge pull request #11011 from ekrctb/catch-pooling-initial 
Initial implementation of hit object pooling in osu!catch ruleset
 2020-12-02 13:02:22 +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
smoogipoo
2840405112 Volume should be 0 by default 2020-12-01 18:14:14 +09:00
smoogipoo
5760e1c1fc Make HitSampleInfo immutable 2020-12-01 15:37:51 +09:00
ekrctb
604619ba47 Generalize legacy skin player test. 2020-12-01 09:49:04 +09:00
ekrctb
4f17e3520e Use Cached attribute 2020-12-01 09:38:19 +09:00
ekrctb
b5e43144a9 Add a Player test scene that uses a legacy skin 2020-11-30 19:56:50 +09:00
ekrctb
9611aaf09e Use hit object pooling for JuiceStream. 
- Use `Clear(false)` to not dispose pooled children.
- Don't set nested DHO `Origin`.
- Simplify the layout (remove custom `Origin`).
 2020-11-30 19:19:14 +09:00
ekrctb
b76ae525b2 Use hit object pooling for Fruit and Banana. 2020-11-30 19:07:50 +09:00
ekrctb
05aaa377e7 Don't use CreateDrawableRepresentation in CatcherArea 2020-11-30 19:02:49 +09:00
ekrctb
7986d7802d Use ApplyDefaults in TestSceneFruitObjects. 2020-11-30 12:58:14 +09:00
ekrctb
7ce752391d Make TestSceneFruitObjects show correct color 2020-11-27 12:02:07 +09:00
ekrctb
de471a7e84 Add test for dynamically changing catch fruits 2020-11-27 11:42:14 +09:00
ekrctb
5e36fb322a Move fruit visual logic from CHO to DrawableFruit 2020-11-27 11:08:32 +09:00
ekrctb
047a02b863
Merge branch 'master' into palpable-catch-hit-object 2020-11-26 14:35:27 +09:00
ekrctb
9131546876 Workaround TestSceneCatchModRelax failure 2020-11-26 13:04:19 +09:00
ekrctb
ab7251d742 Move members to PalpableCatchHitObject 2020-11-24 19:57:37 +09:00
Roman Kapustin
3b600f0a7b Target net5.0 instead of netcoreapp3 2020-11-20 10:45:19 +03:00
ekrctb
c360533e4c Simplify code of TestSceneFruitObjects 2020-11-17 23:40:30 +09:00
ekrctb
eebce1f914 Fix TestSceneFruitObjects 2020-11-17 18:13:32 +09:00
ekrctb
a53b5ef8b9 Remove --no-restore from VSCode build tasks 2020-11-16 19:22:08 +09:00
Bartłomiej Dach
f9fa7c86ea Cover mapping fully for catch mods 2020-11-15 14:53:25 +01:00
Bartłomiej Dach
9899687bfe Rename existing method to allow for new one 2020-11-15 14:17:41 +01:00
kamp
ceb17764b1 Also replace / with - for args in other task.jsons 2020-11-07 01:09:21 +01:00
Dean Herbert
a50ca0a1ed Fix osu!catch test failures due to trying to retrieve container too early 2020-10-19 20:00:17 +09:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
smoogipoo
4ef7ab2872 Fix tests 2020-09-29 16:33:38 +09:00
Salman Ahmed
bfe332909c Remove "hide combo counter on break time" feature for being too complex 
The combo counter will be hidden at most one second after the break has started anyways, so why not just remove this feature if the way of implementing it is complicated to be merged within the legacy counter implementation.
 2020-09-21 14:32:14 +03:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter 2020-09-15 17:20:31 +09:00
Bartłomiej Dach
fcf3a1d13c Encapsulate combo display better 2020-09-12 22:40:34 +02:00
smoogipoo
679dc34aa4 Add test timeouts 2020-09-07 17:18:54 +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
Salman Ahmed
a0a4501008 Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-09-01 20:17:25 +03:00
Dean Herbert
997ea2f27e
Merge pull request #9932 from smoogipoo/hyperdash-full-catch-width 
Use full catcher width for hyperdash calculation
 2020-08-24 16:44:35 +09:00
Dean Herbert
c03cc754e3 Move event attaching to ensure reporting is done at a high enough rate 2020-08-24 11:38:03 +09:00
Bartłomiej Dach
3d68f30467 Fix code style issues 2020-08-23 21:52:50 +02:00
Orosfai I. Zsolt
a8a7d9af29 Add testcase to osu!catch relax mod 2020-08-23 21:35:15 +02:00
Bartłomiej Dach
68a043a070 Add test case covering regression 2020-08-23 18:04:57 +02:00
Dean Herbert
d274652b3a Fix failures if test ran too fast 2020-08-24 00:13:26 +09:00
Dean Herbert
2dce850f5b Rewrite hyperdash test to not rely on timing 2020-08-23 23:11:56 +09:00
Salman Ahmed
cf6b34db1e Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-08-22 13:07:28 +03:00
smoogipoo
855b5ba4ed Merge branch 'master' into add-droplet-hypers 2020-08-21 13:09:16 +09:00
Dean Herbert
f0ba587515
Merge branch 'master' into fix-catch-double-sample 2020-08-21 12:38:29 +09:00
smoogipoo
dd1f2db175 Use startTime in test 2020-08-21 12:30:33 +09:00
smoogipoo
f956c9fe37 Clobber in a gameplay test 2020-08-21 02:01:29 +09:00
Bartłomiej Dach
35ff25940b Add sample playback to juice stream test scene 2020-08-20 18:16:32 +02:00
smoogipoo
725caa9382 Add visual test for hyperdash droplets 2020-08-20 23:33:32 +09:00
smoogipoo
a193fb7907 Fix test not working for droplets/tinydroplets 2020-08-20 23:15:30 +09:00
smoogipoo
c89509aca0 Fix right bound not being applied correctly 2020-08-20 20:25:40 +09:00
Salman Ahmed
deb5cc752b Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-08-19 08:39:58 +03:00
Salman Ahmed
dde0bc6070 Add step to randomize judged object's combo colour 2020-08-19 08:29:42 +03:00
Salman Ahmed
a59dabca7e Use existing hit objects instead of defining own 2020-08-19 08:28:11 +03: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
Salman Ahmed
5cd2841080 Add test scene showing off the skinnable catch-specific combo counter 2020-08-03 22:17:42 +03:00
Salman Ahmed
f5af81d775 Add legacy combo font glyphs to legacy skins of test purposes 2020-08-03 21:41:22 +03:00
Dean Herbert
c1442568b9 Make perfect mod ignore all non-combo-affecting hitobjects 2020-07-21 17:04:45 +09:00
Dean Herbert
02678c04d5
Merge pull request #9556 from gagahpangeran/toggle-hit-lighting-catch 2020-07-17 17:06:40 +09:00