295 Commits

Author	SHA1	Message	Date
Dean Herbert	cfac47413c	Disable failing tests temporarily	2019-03-08 10:42:25 +09:00
smoogipoo	a08086cc8a	Fix volume not being considered for file samples	2019-03-05 18:21:29 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	628b3e1119	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
Dean Herbert	c45c34d400	Make beatmap importing possible elsewhere in tests	2018-12-25 19:17:21 +09:00
smoogipoo	eb88768bd0	Fix incorrect controlpoint being applied to samples	2018-12-03 17:21:27 +09:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
Dean Herbert	10095d09c3	Fix test namespace	2018-11-30 17:02:01 +09:00
Dean Herbert	3727955911	Refactors/renames	2018-11-30 16:35:45 +09:00
Dean Herbert	831cd3ed59	ScoreInfo scoreInfo -> ScoreInfo score	2018-11-30 15:18:52 +09:00
smoogipoo	2bedffc00f	Add tests	2018-11-30 14:27:34 +09:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	ace1dce281	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs	2018-11-05 18:10:22 +09:00
smoogipoo	92d570342c	Fix sample additions not falling back to non-addition bank	2018-11-05 17:35:24 +09:00
smoogipoo	a4caaf56ef	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs	2018-11-05 16:38:28 +09:00
smoogipoo	8a2a6a3ecb	Preserve the beatmap's version	2018-10-23 14:59:21 +09:00
smoogipoo	47be95ce0b	Fix slider nodes using the wrong samples	2018-10-16 17:10:24 +09:00
smoogipoo	cb1703c6e2	Fix colours with alpha components not being parsed	2018-10-05 11:19:01 +09:00
smoogipoo	557a2ee39d	Add more comprehensive tests	2018-08-17 10:04:00 +09:00
smoogipoo	05b5144dac	Add parsing test	2018-08-15 13:36:22 +09:00
smoogipoo	e360985d73	Replace variables into the entire line	2018-08-14 18:15:09 +09:00
smoogipoo	c087a73f40	Implement per-hitobject custom sample banks	2018-07-20 15:12:44 +09:00
smoogipoo	967d0c3c72	Adjust testcase	2018-07-20 15:12:04 +09:00
smoogipoo	65d351c31a	Fix failing test cases	2018-07-10 16:26:04 +09:00
smoogipoo	c1b8799253	Add simple testcase	2018-07-02 14:40:43 +09:00
smoogipoo	c78bfbfa55	Fix failing json conversion testcases	2018-07-02 13:34:19 +09:00
smoogipoo	9fd9af22f0	Remove unused using	2018-06-28 18:40:12 +09:00
smoogipoo	94f1b2eeb8	Only custom sample banks > 1 modify the filename	2018-06-28 18:29:17 +09:00
smoogipoo	3a9a82c80c	Add back legacy custom sample banks	2018-06-28 18:29:12 +09:00
smoogipoo	6c100caba7	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00
Dean Herbert	955a78e76d	Remove OnlineBeatmapSetID from BeatmapInfo ... It should now be retrieved via the linked BeatmapSetInfo	2018-06-08 15:26:27 +09:00
Dean Herbert	8220e0c79a	Remove OnlineBeatmapSetID from BeatmapMetadata	2018-06-08 12:46:34 +09:00
smoogipoo	3745f9000b	Merge remote-tracking branch 'origin/master' into remove-decoder-offset	2018-06-07 13:37:19 +09:00
ekrctb	aeeb03ff9c	simpler temporary path generation	2018-06-06 18:36:43 +09:00
ekrctb	b84441ab87	Fix TestImportOverIPC	2018-06-04 22:25:18 +09:00
Dean Herbert	203691b1c7	Add import rollback test	2018-05-29 16:23:38 +09:00
Dean Herbert	cc081cad5a	Simplify test osz instantiation	2018-05-29 16:23:38 +09:00
Dean Herbert	015fd9d0e7	Fix loading test method returning oldest import rather than newest	2018-05-29 16:23:38 +09:00
smoogipoo	b267ec3178	Fix failing test	2018-05-28 03:48:09 +09:00
smoogipoo	3e7fa45ad1	Fix tests	2018-05-11 16:13:00 +09:00
smoogipoo	1aefd71b65	Merge remote-tracking branch 'origin/master' into i-beatmap	2018-05-07 09:58:53 +09:00
Dean Herbert	de424648d2	Update to .NET 4.7.1 ... Resolves #2368.	2018-04-20 14:46:52 +09:00
smoogipoo	66b3b295e7	Use IBeatmap wherever possible	2018-04-19 20:44:38 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
smoogipoo	c21e820a45	One more level of nesting (we can do this better in the future)	2018-03-25 02:43:45 +09:00
Dean Herbert	9a0fc9e29a	Move combo colours completely out of beatmap	2018-03-20 16:24:06 +09:00
Dean Herbert	e43de68ad3	Move colour parsing to LegacyDecoder	2018-03-13 19:13:50 +09:00
Dean Herbert	217dd2ecdc	Initial push for better decoders	2018-03-09 21:24:15 +09:00
Dean Herbert	7b18e8a5ca	Merge branch 'master' into fix-taiko-conversion	2018-03-06 01:16:47 +09:00
smoogipoo	a6b6c016d6	Fix beatmap decoder tests	2018-03-05 16:14:36 +09:00
Dean Herbert	e46f363fdc	Fix failing unit test	2018-03-04 22:46:50 +09:00
Dean Herbert	d340509b1d	Move ArchiveReaders to a more global namespace ... Also moves delete and action logic to a shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	e0d28564d0	Move import logic to shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	9ed05543d7	Fix post-test conditionals from being inverse of what we want to test	2018-02-12 15:39:00 +09:00
Dean Herbert	264a0f59e2	Fix duplicate test name	2018-02-12 12:22:13 +09:00
Dean Herbert	721bb7e4dd	Add proper handling for OnlineBeatmapSetID conflicts ... Not yet working	2018-02-09 21:31:33 +09:00
Dean Herbert	541068235d	Test import twice in a row	2018-02-09 18:23:06 +09:00
Dean Herbert	623ba652ed	Share more code between tests	2018-02-09 18:20:18 +09:00
Dean Herbert	981fa379b7	Count() -> Count	2018-02-09 18:02:28 +09:00
Dean Herbert	a771ca4077	Add try-finally to ensure host is exited	2018-02-09 18:02:06 +09:00
Dean Herbert	8140ffea15	Add test for deleting then reimporting	2018-02-09 17:59:27 +09:00
Dean Herbert	a166932468	Add deletion test	2018-02-09 17:51:29 +09:00
Dean Herbert	d8da68c55f	Disable test again (accidentally re-enabled)	2018-02-08 17:22:23 +09:00
Dean Herbert	789e25069f	Fix non-visual tests not cleaning up previous executions	2018-02-08 17:07:59 +09:00
smoogipoo	4f5bfdb888	Remove explicit .Exit on IPC test	2018-02-08 14:03:37 +09:00
smoogipoo	74016a1482	Make sure the import tests exit their hosts	2018-02-07 15:57:16 +09:00
james58899	fa800f0977	fix storyboard path	2018-01-23 18:18:54 +08:00
TocoToucan	3c11978cfa	Use local functions	2018-01-15 21:42:17 +03:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	823a430d30	Nothing to see here, move along	2018-01-03 22:02:54 +09:00
smoogipoo	da5bc959ad	Fix testcase	2018-01-03 21:46:39 +09:00
Dean Herbert	5026c7a95e	SoundControlPoint -> SampleControlPoint	2017-12-23 16:34:34 +09:00
smoogipoo	a3fcc0b60c	Back to using SortedLists	2017-12-21 19:40:41 +09:00
smoogipoo	e8e5e8270b	Rename decoder	2017-12-21 14:19:37 +09:00
smoogipoo	bfa4f1a2c3	Apply changes in line with master changes	2017-12-21 13:59:03 +09:00
smoogipoo	c99ea32574	Merge branch 'master' into beatmap-serialization	2017-12-21 13:39:39 +09:00
smoogipoo	b0684cb194	Add storyboard test case but disable for now	2017-12-07 12:02:34 +09:00
smoogipoo	499ecb4edd	Add parity checking OsuJsonDecoder test cases	2017-12-07 11:11:38 +09:00
smoogipoo	b584178e85	Make Beatmap ISerializable and add more JsonIgnores	2017-12-06 00:37:37 +09:00
Aergwyn	cc76c58f5f	fall back to .osu file for storyboard if no .osb file is present ... + CI fixes	2017-12-02 16:05:39 +01:00
Aergwyn	2bbfe0dda1	expanded BeatmapDecoder tests, added StoryboardDecoder tests	2017-12-02 15:28:00 +01:00
Aergwyn	c466296b14	reverted split at Decoder, moved logic down ... I'm done experimenting, sorry - `Decoder` only returns a "Beatmap"`Decoder` now - "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder` - moved parse methods down in the hierarchy where I forgot to do that - renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`	2017-12-01 22:05:01 +01:00
Aergwyn	a49f3479a2	Split retrieving of beatmap and storyboard decoder ... Storyboard works again. Not satisfied with the solution though.	2017-12-01 19:11:52 +01:00
Aergwyn	806c0e3b26	restructured OsuLegacyDecoder into LegacyDecoder ... Beatmap works, Storyboard not...	2017-12-01 17:43:33 +01:00
Aergwyn	c16925059c	split parsing a beatmap and parsing a storyboard	2017-11-30 19:16:13 +01:00
Dean Herbert	0316ec3098	Remove no-longer-necessary Thread.Sleep	2017-10-24 10:08:00 +09:00
Dean Herbert	c704c0349a	Disable IPC test for now	2017-10-24 06:50:33 +09:00
Dean Herbert	7dadb7e21e	Mark IPC non-parallelizable	2017-10-24 06:13:39 +09:00
Dean Herbert	aff30db89d	Add thread sleep as a temporary workaround for failing tests	2017-10-22 16:21:41 +09:00
Dean Herbert	5d5ea5fb2e	Fix all remaining db structure issues	2017-10-19 14:05:11 +09:00
Dean Herbert	71d614b813	FIx missing columns yet again	2017-10-18 21:57:54 +09:00
Dean Herbert	00be98dba7	Query test assert conditions less often	2017-10-18 20:37:53 +09:00
Dean Herbert	799f510217	FileStore logic fixes	2017-10-17 10:25:18 +09:00
Dean Herbert	d73c0c0c98	Fix test regression	2017-10-16 13:09:01 +09:00
TocoToucan	56e8c7303c	Revert "Fix inconsistent lock usage in BeatmapManager" ... This reverts commit 4a064da30f.	2017-10-16 12:59:59 +09:00
TocoToucan	4a064da30f	Fix inconsistent lock usage in BeatmapManager	2017-10-15 21:56:33 +03:00
smoogipoo	9924f518b7	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game/Beatmaps/BeatmapMetadata.cs # osu.Game/osu.Game.csproj # osu.Game/packages.config	2017-10-14 16:36:37 +09:00
smoogipoo	b178be21d1	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
smoogipoo	674ad4a30c	Fix compile errors	2017-10-14 12:49:03 +09:00
smoogipoo	b83d7cd4df	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs # osu.Game/Beatmaps/BeatmapInfo.cs # osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs	2017-10-14 12:38:59 +09:00
Dean Herbert	ed152c08ac	Fix regressions	2017-10-14 12:27:32 +09:00
Dean Herbert	bf6ab77b0e	Always use live queries to ensure waiting asserts actually get dynamic data	2017-10-11 13:37:24 +09:00
Dean Herbert	b6cfc49b06	Improve resilience of beatmap import test ... Fixes this happening https://ci.appveyor.com/project/peppy/osu/build/master-4694/tests	2017-10-11 12:41:43 +09:00
TocoToucan	887aa7496b	Rework EF Core usage in model classes	2017-10-06 00:23:26 +03:00
TocoToucan	6a4198d0d6	Initial EF Core commit	2017-10-04 22:52:12 +03:00
Dean Herbert	990ef3ca56	Make import tests more resilient to race condition failures ... Also centralises wait-or-assert logic.	2017-09-27 14:51:01 +08:00
Dean Herbert	bbc990a6fd	Assign a name to individual import tests to avoid file contention	2017-09-27 11:26:56 +08:00
Dean Herbert	1e6c480791	Add back missing tests	2017-09-25 11:58:37 +08:00
Dean Herbert	393aa12eec	Remove old files	2017-09-19 16:06:59 +09:00
Dean Herbert	e777ccc339	Avoid threading conflicts when resetting the database in unit tests	2017-08-23 14:42:46 +09:00
Dean Herbert	5f53426a9a	*Database -> *Store ... Welcome back BeatmapManager	2017-07-27 16:56:41 +09:00
Dean Herbert	cbe7b08642	Make BeatmapStore's BeatmapDatabase private	2017-07-27 15:34:13 +09:00
Dean Herbert	96b08b8777	Simplify and document DatabaseStore API	2017-07-27 15:06:10 +09:00
Dean Herbert	898a601098	Introduce a reference counting file store	2017-07-26 20:22:02 +09:00
Dean Herbert	9e20a02c0a	Split out BeatmapDatabase into BeatmapStore ... Hide database functionality at a lower level in preparation from eventually making it private.	2017-07-26 16:31:34 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Thomas Müller	96675965d8	Fix broken test case	2017-07-22 12:16:46 +02:00
Dean Herbert	55d999e4a1	Fix comment	2017-07-11 10:45:43 +09:00
Dean Herbert	e9b397f06f	Remove assert which is not always true on some operating systems	2017-07-11 10:41:18 +09:00
Thomas Müller	4134f84559	Increase test timeout to 1 minute	2017-07-10 12:54:11 +03:00
John Neijzen	d9a9616125	EOF remove blank spaces	2017-06-08 14:56:03 +08:00
Dean Herbert	0f59645e17	Increase timeout in TestImportOverIPC ... Has been failing CI randomly, so let's increase the timeout a bit.	2017-05-31 15:51:52 +09:00
Dean Herbert	a2f6d8a3e6	Fix broken test cases, remove some recursive lookup methods.	2017-05-11 19:38:28 +09:00
Huo Yaoyuan	f37c857af8	CI fixes.	2017-05-06 16:06:38 +08:00
Huo Yaoyuan	767cfaaac3	Access database recursively.	2017-05-06 15:37:53 +08:00
Dean Herbert	d06b3c898f	Update framework with new DI changes.	2017-05-02 15:32:47 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
smoogipooo	1be1683a4f	Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion	2017-04-18 09:58:39 +09:00
Dean Herbert	4393c2cb25	Add unit tests to ensure all rulesets' beatmaps are added successfully.	2017-04-18 09:46:14 +09:00
smoogipooo	786446354e	Fix post-rebase errors.	2017-04-18 09:00:53 +09:00
smoogipooo	09208adf81	Re-implement legacy hit object conversion.	2017-04-18 08:58:21 +09:00
Dean Herbert	4b6ba565f8	Fix forgotten revert.	2017-04-17 20:10:51 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	a89af273be	Make BeatmapInfo expose Ruleset instead of PlayMode.	2017-04-15 05:01:36 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
smoogipooo	4cc309e5a7	Make hit sounds into consts.	2017-04-06 12:14:06 +09:00
smoogipooo	2a16eafe8f	Fix assertions.	2017-04-06 11:54:05 +09:00
smoogipooo	eb82a4c090	Back to using SampleInfo + fix taiko beatmap conversion.	2017-04-06 11:41:16 +09:00
smoogipooo	d607207b69	Ability to contain multiple sample banks. Get default bank name from control point.	2017-04-05 21:59:07 +09:00
smoogipooo	2d8239a3f7	Re-implement the SampleBank/Sample structure. No parsing support yet.	2017-04-05 21:34:28 +09:00
smoogipooo	4b424263ce	Fully parse control points.	2017-04-04 13:13:27 +09:00
smoogipooo	15db37d9e0	Cleanup.	2017-04-03 20:27:25 +09:00
smoogipooo	19b5555ef2	Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.	2017-04-03 20:26:46 +09:00
Dean Herbert	a61cb078e3	Increase timeout on IPC wait.	2017-03-23 17:32:57 +09:00