Add Framework which provides a test runner with resources from the te…

…st project.
karaoke-dev · Mar 19, 2023 · 7e607bb · 7e607bb
1 parent 365587b
commit 7e607bb
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 15 deletions.
diff --git a/osu.Framework.Font.Tests/AutomatedVisualTestGame.cs b/osu.Framework.Font.Tests/AutomatedVisualTestGame.cs
@@ -5,7 +5,7 @@
 
 namespace osu.Framework.Font.Tests;
 
-internal partial class AutomatedVisualTestGame : TestGame
+internal partial class AutomatedVisualTestGame : Game
 {
     public AutomatedVisualTestGame()
     {

diff --git a/osu.Framework.Font.Tests/Visual/BackgroundGridTestScene.cs b/osu.Framework.Font.Tests/Visual/BackgroundGridTestScene.cs
@@ -11,13 +11,12 @@
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.Testing;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Framework.Font.Tests.Visual;
 
-public abstract partial class BackgroundGridTestScene : TestScene
+public abstract partial class BackgroundGridTestScene : FrameworkTestScene
 {
     protected const int GRID_SIZE = 30;
 

diff --git a/osu.Framework.Font.Tests/Visual/FrameworkTestScene.cs b/osu.Framework.Font.Tests/Visual/FrameworkTestScene.cs
@@ -0,0 +1,23 @@
+// Copyright (c) karaoke.dev <[email protected]>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
+
+namespace osu.Framework.Font.Tests.Visual;
+
+/// <summary>
+/// All the test scene with resource should inherit this class.
+/// </summary>
+public abstract partial class FrameworkTestScene : TestScene
+{
+    protected override ITestSceneTestRunner CreateRunner() => new FrameworkTestSceneTestRunner();
+
+    [BackgroundDependencyLoader]
+    private void load(Game game)
+    {
+        // add store from main project
+        game.Resources.AddStore(new NamespacedResourceStore<byte[]>(new ShaderResourceStore(), "Resources"));
+    }
+}
diff --git a/osu.Framework.Font.Tests/TestGame.cs → ...ts/Visual/FrameworkTestSceneTestRunner.cs b/osu.Framework.Font.Tests/TestGame.cs → ...ts/Visual/FrameworkTestSceneTestRunner.cs
@@ -1,25 +1,22 @@
 // Copyright (c) karaoke.dev <[email protected]>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Reflection;
 using osu.Framework.Allocation;
 using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
 
-namespace osu.Framework.Font.Tests;
+namespace osu.Framework.Font.Tests.Visual;
 
-internal partial class TestGame : Game
+public partial class FrameworkTestSceneTestRunner : TestSceneTestRunner
 {
     [BackgroundDependencyLoader]
     private void load()
     {
         // add store from osu.game.resources
         Resources.AddStore(new DllResourceStore(@"osu.Game.Resources.dll"));
 
-        // add store from main project
-        Resources.AddStore(new NamespacedResourceStore<byte[]>(new ShaderResourceStore(), "Resources"));
-
         // add store from test project
-        Resources.AddStore(new NamespacedResourceStore<byte[]>(new DllResourceStore(Assembly.GetExecutingAssembly().Location), "Resources"));
+        Resources.AddStore(new NamespacedResourceStore<byte[]>(new DllResourceStore(typeof(FrameworkTestScene).Assembly), "Resources"));
 
         // Add font resource
         AddFont(Resources, @"Fonts/osuFont");

diff --git a/osu.Framework.Font.Tests/Visual/Sprites/TestSceneKaraokeSpriteText.cs b/osu.Framework.Font.Tests/Visual/Sprites/TestSceneKaraokeSpriteText.cs
@@ -13,13 +13,12 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Testing;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Framework.Font.Tests.Visual.Sprites;
 
-public partial class TestSceneKaraokeSpriteText : TestScene
+public partial class TestSceneKaraokeSpriteText : FrameworkTestScene
 {
     private readonly TestKaraokeSpriteText karaokeSpriteText;
     private readonly SpriteText transformAmountSpriteText;

diff --git a/osu.Framework.Font.Tests/Visual/Sprites/TestSceneLyricSpriteText.cs b/osu.Framework.Font.Tests/Visual/Sprites/TestSceneLyricSpriteText.cs
@@ -6,12 +6,11 @@
 using osu.Framework.Font.Tests.Helper;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Testing;
 using osuTK;
 
 namespace osu.Framework.Font.Tests.Visual.Sprites;
 
-public partial class TestSceneLyricSpriteText : TestScene
+public partial class TestSceneLyricSpriteText : FrameworkTestScene
 {
     [TestCase("karaoke", null, null)]
     [TestCase("カラオケ", new[] { "[0,1]:か", "[1,2]:ら", "[2,3]:お", "[3,4]:け" }, null)]
@@ -235,6 +234,7 @@ internal partial class DefaultLyricSpriteText : LyricSpriteText
         public DefaultLyricSpriteText(bool ruby = true, bool romaji = true)
         {
             Text = "カラオケ";
+            Font = FontUsage.Default;
 
             if (ruby)
             {

diff --git a/osu.Framework.Font.Tests/VisualTestGame.cs b/osu.Framework.Font.Tests/VisualTestGame.cs
@@ -10,7 +10,7 @@
 
 namespace osu.Framework.Font.Tests;
 
-internal partial class VisualTestGame : TestGame
+internal partial class VisualTestGame : Game
 {
     [BackgroundDependencyLoader]
     private void load()