diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs index 779fbff6ba..8de6a39e84 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 = File.OpenRead(Resource.GetPath("241526 Soleily - Renatus.osz"))) + using (var osz = Resource.OpenResource("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 = File.OpenRead(Resource.GetPath("241526 Soleily - Renatus.osz"))) + using (var osz = Resource.OpenResource("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 = File.OpenRead(Resource.GetPath("241526 Soleily - Renatus.osz"))) + using (var osz = Resource.OpenResource("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 ccc136f2b3..72858e449e 100644 --- a/osu.Game.Tests/Resources/Resource.cs +++ b/osu.Game.Tests/Resources/Resource.cs @@ -6,10 +6,10 @@ namespace osu.Game.Tests.Resources { public static class Resource { - public static string GetPath(string path) + public static Stream OpenResource(string name) { - var assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(assemblyDir, "Resources", path); + return Assembly.GetExecutingAssembly().GetManifestResourceStream( + $@"osu.Game.Tests.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 82f06ad84d..d61d98434a 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -34,9 +34,6 @@ - - PreserveNewest - @@ -48,10 +45,16 @@ + + + + + + \ No newline at end of file