spring-ai-community#72 follow up. Fix formatting and json testing

Signed-off-by: Christian Tzolov <[email protected]>

Author: tzolov

mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/tool/SyncMcpToolProviderTests.java

@@ -588,9 +588,9 @@ public String defaultAnnotationsTool(String input) {
 	void testToolWithOutputSchemaGeneration() {
 
 		// Define a custom result class
-		record CustomResult(@JsonPropertyDescription("customResultMessage") @JsonProperty(required = false)
-							 String message,
-							@JsonProperty(required = true) int count) {
+		record CustomResult(
+				@JsonPropertyDescription("customResultMessage") @JsonProperty(required = false) String message,
+				@JsonProperty(required = true) int count) {
 		}
 
 		class OutputSchemaTool {

mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/tool/SyncStatelessMcpToolProviderTests.java

@@ -26,7 +26,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springaicommunity.mcp.annotation.McpTool;
-
+import org.springaicommunity.mcp.method.tool.utils.JsonParser;
 import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncToolSpecification;
 import io.modelcontextprotocol.common.McpTransportContext;
 import io.modelcontextprotocol.spec.McpSchema;
@@ -608,12 +608,31 @@ public List<CustomResult> outputSchemaTool(String input) {
 		assertThat(toolSpec.tool().name()).isEqualTo("output-schema-tool");
 		// Output schema should be generated for complex types
 		assertThat(toolSpec.tool().outputSchema()).isNotNull();
-		String outputSchemaString = toolSpec.tool().outputSchema().toString();
+		String outputSchemaString = JsonParser.toJson(toolSpec.tool().outputSchema());
 		assertThat(outputSchemaString).contains("message");
 		assertThat(outputSchemaString).contains("count");
-		assertThat(outputSchemaString).isEqualTo(
-				"{$schema=https://json-schema.org/draft/2020-12/schema, type=array, items={type=object, properties={count={type=integer, format=int32}, message={type=string}}}}");
-
+		assertThatJson(outputSchemaString).when(Option.IGNORING_ARRAY_ORDER).isEqualTo(json("""
+				{
+					"$schema": "https://json-schema.org/draft/2020-12/schema",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"count": {
+								"type": "integer",
+								"format": "int32"
+							},
+							"message": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"count",
+							"message"
+						]
+					}
+				}
+					"""));
 	}
 
 	@Test