diff --git a/osu-resources b/osu-resources index 6d9bbe6c83..0505cf0d3b 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 6d9bbe6c838e4b89b69d5ad49b37b434aa62281e +Subproject commit 0505cf0d3b317667dbc95346f57b67fdbcdb4dee diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs index 8de6a39e84..e224bf3db4 100644 --- a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs @@ -19,7 +19,7 @@ namespace osu.Game.Tests.Beatmaps.IO [Test] public void TestReadBeatmaps() { - using (var osz = Resource.OpenResource("241526 Soleily - Renatus.osz")) + using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) { var reader = new OszArchiveReader(osz); string[] expected = @@ -46,7 +46,7 @@ namespace osu.Game.Tests.Beatmaps.IO [Test] public void TestReadMetadata() { - using (var osz = Resource.OpenResource("241526 Soleily - Renatus.osz")) + using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) { var reader = new OszArchiveReader(osz); var meta = reader.ReadMetadata(); @@ -66,7 +66,7 @@ namespace osu.Game.Tests.Beatmaps.IO [Test] public void TestReadFile() { - using (var osz = Resource.OpenResource("241526 Soleily - Renatus.osz")) + using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) { var reader = new OszArchiveReader(osz); using (var stream = new StreamReader( diff --git a/osu.Game.Tests/Resources/Resource.cs b/osu.Game.Tests/Resources/Resource.cs index 72858e449e..46c51da5ef 100644 --- a/osu.Game.Tests/Resources/Resource.cs +++ b/osu.Game.Tests/Resources/Resource.cs @@ -9,7 +9,9 @@ namespace osu.Game.Tests.Resources public static Stream OpenResource(string name) { return Assembly.GetExecutingAssembly().GetManifestResourceStream( - $@"osu.Game.Tests.Resources.{name}"); + $@"osu.Game.Tests.Resources.{name}") ?? + Assembly.LoadFrom("osu.Game.Resources.dll").GetManifestResourceStream( + $@"osu.Game.Resources.{name}"); } } } \ No newline at end of file diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index 36044b4bbf..915f91829b 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -46,6 +46,10 @@ {0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D} osu.Game + + {D9A367C9-4C1A-489F-9B05-A0CEA2B53B58} + osu.Game.Resources + @@ -59,7 +63,6 @@ -