Fix test assets and clean up test code as requested

Copilot · ilonatommy · Copilot · commit 0712e4c3423d · 2025-07-15T08:20:32.000Z
Co-authored-by: ilonatommy &lt;32700855+ilonatommy@users.noreply.github.com&gt;
diff --git a/src/Components/Components/test/Routing/RouterTest.cs b/src/Components/Components/test/Routing/RouterTest.cs
@@ -346,47 +346,4 @@ public class MultiSegmentRouteComponent : ComponentBase { }
     [Route("not-found")]
     public class NotFoundTestComponent : ComponentBase { }
 
-    public class TestLogger<T> : ILogger<T>
-    {
-        public List<LogEntry> LogEntries { get; } = new List<LogEntry>();
-
-        public IDisposable BeginScope<TState>(TState state) => null;
-
-        public bool IsEnabled(LogLevel logLevel) => true;
-
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-        {
-            LogEntries.Add(new LogEntry
-            {
-                LogLevel = logLevel,
-                EventId = eventId,
-                Message = formatter(state, exception),
-                Exception = exception
-            });
-        }
-    }
-
-    public class LogEntry
-    {
-        public LogLevel LogLevel { get; set; }
-        public EventId EventId { get; set; }
-        public string Message { get; set; }
-        public Exception Exception { get; set; }
-    }
-
-    public class TestLoggerFactory : ILoggerFactory
-    {
-        private readonly ILogger _logger;
-
-        public TestLoggerFactory(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        public void AddProvider(ILoggerProvider provider) { }
-
-        public ILogger CreateLogger(string categoryName) => _logger;
-
-        public void Dispose() { }
-    }
 }
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
@@ -30,13 +30,25 @@
     <HeadOutlet />
 </head>
 <body>
-    <Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
-        <Found Context="routeData">
-            <RouteView RouteData="@routeData" />
-            <FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />
-        </Found>
-        <NotFound><p id="not-found-fragment">There's nothing here</p></NotFound>
-    </Router>
+    @if (NotFoundPageType != null)
+    {
+        <Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
+            <Found Context="routeData">
+                <RouteView RouteData="@routeData" />
+                <FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />
+            </Found>
+        </Router>
+    }
+    else
+    {
+        <Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }">
+            <Found Context="routeData">
+                <RouteView RouteData="@routeData" />
+                <FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />
+            </Found>
+            <NotFound><p id="not-found-fragment">There's nothing here</p></NotFound>
+        </Router>
+    }
     <script>
         // This script must come before blazor.web.js to test that
         // the framework does the right thing when an element is already focused.
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Routes.razor b/src/Components/test/testassets/Components.WasmMinimal/Routes.razor
@@ -23,10 +23,22 @@
     }
 }
 
-<Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" />
-        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-    </Found>
-    <NotFound><p id="not-found-fragment">There's nothing here</p></NotFound>
-</Router>
+@if (NotFoundPageType != null)
+{
+    <Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
+        <Found Context="routeData">
+            <RouteView RouteData="@routeData" />
+            <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+        </Found>
+    </Router>
+}
+else
+{
+    <Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }">
+        <Found Context="routeData">
+            <RouteView RouteData="@routeData" />
+            <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+        </Found>
+        <NotFound><p id="not-found-fragment">There's nothing here</p></NotFound>
+    </Router>
+}
