Added option to filter tests by test mode as it is defined in the resource

CoderGamester · CoderGamester · commit 129d7e321310 · 2025-04-27T21:32:07.000+03:00
diff --git a/Editor/Resources/GetTestsResource.cs b/Editor/Resources/GetTestsResource.cs
@@ -14,12 +14,12 @@ namespace McpUnity.Resources
     /// </summary>
     public class GetTestsResource : McpResourceBase
     {
-        private readonly TestRunnerService _testRunnerService;
+        private readonly ITestRunnerService _testRunnerService;
         
         /// <summary>
         /// Constructor
         /// </summary>
-        public GetTestsResource(TestRunnerService testRunnerService)
+        public GetTestsResource(ITestRunnerService testRunnerService)
         {
             Name = "get_tests";
             Description = "Gets available tests from Unity Test Runner";
@@ -38,15 +38,7 @@ public override JObject Fetch(JObject parameters)
             string testModeFilter = parameters["testMode"]?.ToObject<string>();
             
             // Get all tests from the service
-            var allTests = _testRunnerService.GetAllTests();
-            
-            // Apply test mode filter if provided
-            if (!string.IsNullOrEmpty(testModeFilter))
-            {
-                allTests = allTests.Where(t => 
-                    t.TestMode.Equals(testModeFilter, StringComparison.OrdinalIgnoreCase)
-                ).ToList();
-            }
+            var allTests = _testRunnerService.GetAllTests(testModeFilter);
             
             // Create the results array
             var results = new JArray();
@@ -67,9 +59,7 @@ public override JObject Fetch(JObject parameters)
             {
                 ["success"] = true,
                 ["message"] = $"Retrieved {allTests.Count} tests",
-                ["tests"] = results,
-                ["editModeCount"] = allTests.Count(t => t.TestMode.Equals("EditMode", StringComparison.OrdinalIgnoreCase)),
-                ["playModeCount"] = allTests.Count(t => t.TestMode.Equals("PlayMode", StringComparison.OrdinalIgnoreCase))
+                ["tests"] = results
             };
         }
     }
diff --git a/Editor/Services/ConsoleLogsService.cs b/Editor/Services/ConsoleLogsService.cs
@@ -70,15 +70,18 @@ public void StopListening()
         /// Get all logs as a JSON array
         /// </summary>
         /// <returns>JArray containing all logs</returns>
-        public JArray GetAllLogsAsJson()
+        public JArray GetAllLogsAsJson(string logType = "")
         {
-            // Convert log entries to a JSON array
+            // Convert log entries to a JSON array, filtering by logType if provided
             JArray logsArray = new JArray();
+            bool filter = !string.IsNullOrEmpty(logType);
             
             lock (_logEntries)
             {
                 foreach (var entry in _logEntries)
                 {
+                    if (filter && !entry.Type.ToString().Equals(logType, System.StringComparison.OrdinalIgnoreCase))
+                        continue;
                     logsArray.Add(new JObject
                     {
                         ["message"] = entry.Message,
diff --git a/Editor/Services/IConsoleLogsService.cs b/Editor/Services/IConsoleLogsService.cs
@@ -11,10 +11,11 @@ namespace McpUnity.Services
     public interface IConsoleLogsService
     {
         /// <summary>
-        /// Get all logs as a JSON array
+        /// Get all logs as a JSON array, optionally filtered by log type
         /// </summary>
-        /// <returns>JArray containing all logs</returns>
-        JArray GetAllLogsAsJson();
+        /// <param name="logType">UnityEngine.LogType as string (e.g. "Error", "Warning", "Log"). Empty string for all logs.</param>
+        /// <returns>JArray containing filtered logs</returns>
+        JArray GetAllLogsAsJson(string logType = "");
         
         /// <summary>
         /// Start listening for logs
diff --git a/Editor/Services/ITestRunnerService.cs b/Editor/Services/ITestRunnerService.cs
@@ -16,9 +16,11 @@ public interface ITestRunnerService
         TestRunnerApi TestRunnerApi { get; }
         
         /// <summary>
-        /// Get a list of all available tests
+        /// Get a list of available tests, optionally filtered by test mode
         /// </summary>
-        List<TestItemInfo> GetAllTests();
+        /// <param name="testMode">Optional test mode filter (EditMode, PlayMode, or empty for all)</param>
+        /// <returns>List of test items matching the specified test mode, or all tests if no mode specified</returns>
+        List<TestItemInfo> GetAllTests(string testMode = "");
 
         /// <summary>
         /// Execute tests with the provided parameters
diff --git a/Editor/Services/TestRunnerService.cs b/Editor/Services/TestRunnerService.cs
@@ -30,15 +30,25 @@ public TestRunnerService()
         }
         
         /// <summary>
-        /// Get a list of all available tests
+        /// Get a list of available tests, optionally filtered by test mode
         /// </summary>
-        public List<TestItemInfo> GetAllTests()
+        /// <param name="testMode">Optional test mode filter (EditMode, PlayMode, or empty for all)</param>
+        /// <returns>List of test items matching the specified test mode, or all tests if no mode specified</returns>
+        public List<TestItemInfo> GetAllTests(string testMode = "")
         {
             var tests = new List<TestItemInfo>();
             
-            // Get tests for both edit mode and play mode
-            _testRunnerApi.RetrieveTestList(TestMode.EditMode, adaptor => CollectTestItems(adaptor, tests));
-            _testRunnerApi.RetrieveTestList(TestMode.PlayMode, adaptor => CollectTestItems(adaptor, tests));
+            // Check if we need to retrieve EditMode tests
+            if (string.IsNullOrEmpty(testMode) || testMode.Equals("EditMode", StringComparison.OrdinalIgnoreCase))
+            {
+                _testRunnerApi.RetrieveTestList(TestMode.EditMode, adaptor => CollectTestItems(adaptor, tests));
+            }
+            
+            // Check if we need to retrieve PlayMode tests
+            if (string.IsNullOrEmpty(testMode) || testMode.Equals("PlayMode", StringComparison.OrdinalIgnoreCase))
+            {
+                _testRunnerApi.RetrieveTestList(TestMode.PlayMode, adaptor => CollectTestItems(adaptor, tests));
+            }
             
             return tests;
         }
diff --git a/Server/build/resources/getTestsResource.js b/Server/build/resources/getTestsResource.js
@@ -17,14 +17,20 @@ function listTestModes(resourceMimeType) {
         resources: [
             {
                 uri: `unity://tests/EditMode`,
-                name: "EditMode tests",
-                description: "List of all EditMode tests in Unity's test runner",
+                name: "List only 'EditMode' tests",
+                description: "List only 'EditMode' tests from Unity's test runner",
                 mimeType: resourceMimeType
             },
             {
                 uri: `unity://tests/PlayMode`,
-                name: "PlayMode tests",
-                description: "List of all PlayMode tests in Unity's test runner",
+                name: "List only 'PlayMode' tests",
+                description: "List only 'PlayMode' tests from Unity's test runner",
+                mimeType: resourceMimeType
+            },
+            {
+                uri: `unity://tests/`,
+                name: "List all tests",
+                description: "List of all tests in Unity's test runner, this includes PlayMode and EditMode tests",
                 mimeType: resourceMimeType
             }
         ]
@@ -66,7 +72,7 @@ export function createGetTestsResource(server, mcpUnity, logger) {
  */
 async function resourceHandler(mcpUnity, uri, variables) {
     // Convert the new handler signature to work with our existing code
-    const testMode = variables["testMode"] || 'EditMode';
+    const testMode = variables["testMode"];
     const response = await mcpUnity.sendRequest({
         method: resourceName,
         params: {
diff --git a/Server/src/resources/getTestsResource.ts b/Server/src/resources/getTestsResource.ts
@@ -31,14 +31,20 @@ function listTestModes(resourceMimeType: string) {
     resources: [
       { 
         uri: `unity://tests/EditMode`, 
-        name: "EditMode tests",
-        description: "List of all EditMode tests in Unity's test runner",
+        name: "List only 'EditMode' tests",
+        description: "List only 'EditMode' tests from Unity's test runner",
         mimeType: resourceMimeType
       },
       { 
         uri: `unity://tests/PlayMode`, 
-        name: "PlayMode tests",
-        description: "List of all PlayMode tests in Unity's test runner",
+        name: "List only 'PlayMode' tests",
+        description: "List only 'PlayMode' tests from Unity's test runner",
+        mimeType: resourceMimeType
+      },
+      { 
+        uri: `unity://tests/`, 
+        name: "List all tests",
+        description: "List of all tests in Unity's test runner, this includes PlayMode and EditMode tests",
         mimeType: resourceMimeType
       }
     ]
@@ -75,7 +81,6 @@ export function createGetTestsResource(server: McpServer, mcpUnity: McpUnity, lo
   );
 }
 
-
 /**
  * Handles requests for test information from Unity's Test Runner
  * Retrieves tests filtered by test mode (EditMode or PlayMode)
@@ -88,7 +93,7 @@ export function createGetTestsResource(server: McpServer, mcpUnity: McpUnity, lo
  */
 async function resourceHandler(mcpUnity: McpUnity, uri: URL, variables: Variables): Promise<ReadResourceResult> {
   // Convert the new handler signature to work with our existing code
-  const testMode = variables["testMode"] || 'EditMode';
+  const testMode = variables["testMode"];
   
   const response = await mcpUnity.sendRequest({
     method: resourceName,

Original file line number	Diff line number	Diff line change
`@@ -70,15 +70,18 @@ public void StopListening()`
`70`	`70`	`/// Get all logs as a JSON array`
`71`	`71`	`/// </summary>`
`72`	`72`	`/// <returns>JArray containing all logs</returns>`
`73`		`- public JArray GetAllLogsAsJson()`
	`73`	`+ public JArray GetAllLogsAsJson(string logType = "")`
`74`	`74`	`{`
`75`		`- // Convert log entries to a JSON array`
	`75`	`+ // Convert log entries to a JSON array, filtering by logType if provided`
`76`	`76`	`JArray logsArray = new JArray();`
	`77`	`+ bool filter = !string.IsNullOrEmpty(logType);`
`77`	`78`
`78`	`79`	`lock (_logEntries)`
`79`	`80`	`{`
`80`	`81`	`foreach (var entry in _logEntries)`
`81`	`82`	`{`
	`83`	`+ if (filter && !entry.Type.ToString().Equals(logType, System.StringComparison.OrdinalIgnoreCase))`
	`84`	`+ continue;`
`82`	`85`	`logsArray.Add(new JObject`
`83`	`86`	`{`
`84`	`87`	`["message"] = entry.Message,`