Fixing rest client tests

Signed-off-by: Emmanuel Hugonnet <[email protected]>

Author: ehsavoie

client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JsonStreamingMessages.java

@@ -107,42 +107,47 @@ public class JsonStreamingMessages {
 
     public static final String SEND_MESSAGE_STREAMING_TEST_REQUEST = """
             {
-             "jsonrpc": "2.0",
-             "method": "SendStreamingMessage",
-             "params": {
-              "message": {
-               "role": "user",
-               "parts": [
-                {
-                 "kind": "text",
-                 "text": "tell me some jokes"
+              "jsonrpc":"2.0",
+              "method":"message/stream",
+              "params":{
+                "message":{
+                  "messageId":"message-1234",
+                  "contextId":"context-1234",
+                  "role":"ROLE_USER",
+                  "parts":[
+                    {
+                      "text":"tell me some jokes"
+                    }
+                  ],
+                  "metadata":{
+                    
+                  }
+                },
+                "configuration":{
+                  "acceptedOutputModes":[
+                    "text"
+                  ]
+                },
+                "metadata":{
+                  
                 }
-               ],
-               "messageId": "message-1234",
-               "contextId": "context-1234",
-               "kind": "message"
-              },
-              "configuration": {
-                "acceptedOutputModes": ["text"],
-                "blocking": false
               }
-             }
             }""";
 
     static final String SEND_MESSAGE_STREAMING_TEST_RESPONSE =
             "event: message\n" +
-            "data: {\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{\"id\":\"2\",\"contextId\":\"context-1234\",\"status\":{\"state\":\"completed\"},\"artifacts\":[{\"artifactId\":\"artifact-1\",\"name\":\"joke\",\"parts\":[{\"kind\":\"text\",\"text\":\"Why did the chicken cross the road? To get to the other side!\"}]}],\"metadata\":{},\"kind\":\"task\"}}\n\n";
+            "data: {\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{\"task\":{\"id\":\"2\",\"contextId\":\"context-1234\",\"status\":{\"state\":\"TASK_STATE_COMPLETED\"},\"artifacts\":[{\"artifactId\":\"artifact-1\",\"name\":\"joke\",\"parts\":[{\"text\":\"Why did the chicken cross the road? To get to the other side!\"}]}],\"metadata\":{}}}}\n\n";
 
     static final String TASK_RESUBSCRIPTION_REQUEST_TEST_RESPONSE =
             "event: message\n" +
-                    "data: {\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{\"id\":\"2\",\"contextId\":\"context-1234\",\"status\":{\"state\":\"completed\"},\"artifacts\":[{\"artifactId\":\"artifact-1\",\"name\":\"joke\",\"parts\":[{\"kind\":\"text\",\"text\":\"Why did the chicken cross the road? To get to the other side!\"}]}],\"metadata\":{},\"kind\":\"task\"}}\n\n";
+                    "data: {\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{\"task\":{\"id\":\"2\",\"contextId\":\"context-1234\",\"status\":{\"state\":\"TASK_STATE_COMPLETED\"},\"artifacts\":[{\"artifactId\":\"artifact-1\",\"name\":\"joke\",\"parts\":[{\"text\":\"Why did the chicken cross the road? To get to the other side!\"}]}],\"metadata\":{}}}}\n\n";
 
     public static final String TASK_RESUBSCRIPTION_TEST_REQUEST = """
             {
-             "jsonrpc": "2.0",
-             "method": "SubscribeToTask",
-             "params": {
-                "id": "task-1234"
-             }
+              "jsonrpc":"2.0",
+              "method":"SubscribeToTask",
+              "params":{
+                "name":"tasks/task-1234"
+              }
             }""";
 }

client/transport/rest/src/test/java/io/a2a/client/transport/rest/RestTransportTest.java

@@ -149,7 +149,7 @@ public void testSendMessage() throws Exception {
         assertEquals(1, history.getParts().size());
         assertEquals(Kind.TEXT, history.getParts().get(0).getKind());
         assertEquals("tell me a joke", ((TextPart) history.getParts().get(0)).getText());
-        assertNull(history.getMetadata());
+        assertNull(task.getMetadata());
         assertNull(history.getReferenceTaskIds());
     }
 
@@ -176,7 +176,8 @@ public void testCancelTask() throws Exception {
         assertEquals("de38c76d-d54c-436c-8b9f-4c2703648d64", task.getId());
         assertEquals(TaskState.CANCELED, task.getStatus().state());
         assertNull(task.getStatus().message());
-        assertNull(task.getMetadata());
+        assertNotNull(task.getMetadata());
+        assertTrue(task.getMetadata().isEmpty());
     }
 
     /**
@@ -201,7 +202,8 @@ public void testGetTask() throws Exception {
         assertEquals("de38c76d-d54c-436c-8b9f-4c2703648d64", task.getId());
         assertEquals(TaskState.COMPLETED, task.getStatus().state());
         assertNull(task.getStatus().message());
-        assertNull(task.getMetadata());
+        assertNotNull(task.getMetadata());
+        assertTrue(task.getMetadata().isEmpty());
         assertEquals(false, task.getArtifacts().isEmpty());
         assertEquals(1, task.getArtifacts().size());
         Artifact artifact = task.getArtifacts().get(0);
@@ -225,7 +227,7 @@ public void testGetTask() throws Exception {
         part = (FilePart) history.getParts().get(2);
         assertEquals(Kind.FILE, part.getKind());
         assertEquals("text/plain", part.getFile().mimeType());
-        assertEquals("hello", ((FileWithBytes) part.getFile()).bytes());
+        assertEquals("aGVsbG8=", ((FileWithBytes) part.getFile()).bytes());
         assertNull(history.getMetadata());
         assertNull(history.getReferenceTaskIds());
     }