revert: restore Go E2E tests that used DataContent.String

These tests were updated for the DataContent breaking change that
we've now reverted. Restore them to match main.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: SteveSandersonMS

go/internal/e2e/compaction_test.go

@@ -84,7 +84,7 @@ func TestCompaction(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Failed to send verification message: %v", err)
 		}
-		if answer.Data.Content == nil || !strings.Contains(strings.ToLower(*answer.Data.Content.String), "dragon") {
+		if answer.Data.Content == nil || !strings.Contains(strings.ToLower(*answer.Data.Content), "dragon") {
 			t.Errorf("Expected answer to contain 'dragon', got %v", answer.Data.Content)
 		}
 	})

go/internal/e2e/mcp_and_agents_test.go

@@ -51,7 +51,7 @@ func TestMCPServers(t *testing.T) {
 			t.Fatalf("Failed to get final message: %v", err)
 		}
 
-		if message.Data.Content == nil || !strings.Contains(*message.Data.Content.String, "4") {
+		if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "4") {
 			t.Errorf("Expected message to contain '4', got: %v", message.Data.Content)
 		}
 
@@ -100,7 +100,7 @@ func TestMCPServers(t *testing.T) {
 			t.Fatalf("Failed to send message: %v", err)
 		}
 
-		if message.Data.Content == nil || !strings.Contains(*message.Data.Content.String, "6") {
+		if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "6") {
 			t.Errorf("Expected message to contain '6', got: %v", message.Data.Content)
 		}
 
@@ -146,7 +146,7 @@ func TestMCPServers(t *testing.T) {
 			t.Fatalf("Failed to send message: %v", err)
 		}
 
-		if message.Data.Content == nil || !strings.Contains(*message.Data.Content.String, "hunter2") {
+		if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "hunter2") {
 			t.Errorf("Expected message to contain 'hunter2', got: %v", message.Data.Content)
 		}
 
@@ -231,7 +231,7 @@ func TestCustomAgents(t *testing.T) {
 			t.Fatalf("Failed to get final message: %v", err)
 		}
 
-		if message.Data.Content == nil || !strings.Contains(*message.Data.Content.String, "10") {
+		if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "10") {
 			t.Errorf("Expected message to contain '10', got: %v", message.Data.Content)
 		}
 
@@ -280,7 +280,7 @@ func TestCustomAgents(t *testing.T) {
 			t.Fatalf("Failed to send message: %v", err)
 		}
 
-		if message.Data.Content == nil || !strings.Contains(*message.Data.Content.String, "12") {
+		if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "12") {
 			t.Errorf("Expected message to contain '12', got: %v", message.Data.Content)
 		}
 
@@ -441,7 +441,7 @@ func TestCombinedConfiguration(t *testing.T) {
 			t.Fatalf("Failed to get final message: %v", err)
 		}
 
-		if message.Data.Content == nil || !strings.Contains(*message.Data.Content.String, "14") {
+		if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "14") {
 			t.Errorf("Expected message to contain '14', got: %v", message.Data.Content)
 		}
 

go/internal/e2e/multi_client_test.go

@@ -112,7 +112,7 @@ func TestMultiClient(t *testing.T) {
 			t.Fatalf("Failed to send message: %v", err)
 		}
 
-		if response == nil || response.Data.Content == nil || !strings.Contains(*response.Data.Content.String, "MAGIC_hello_42") {
+		if response == nil || response.Data.Content == nil || !strings.Contains(*response.Data.Content, "MAGIC_hello_42") {
 			t.Errorf("Expected response to contain 'MAGIC_hello_42', got %v", response)
 		}
 
@@ -180,7 +180,7 @@ func TestMultiClient(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Failed to send message: %v", err)
 		}
-		if response == nil || response.Data.Content == nil || *response.Data.Content.String == "" {
+		if response == nil || response.Data.Content == nil || *response.Data.Content == "" {
 			t.Errorf("Expected non-empty response")
 		}
 
@@ -371,8 +371,8 @@ func TestMultiClient(t *testing.T) {
 		if response1 == nil || response1.Data.Content == nil {
 			t.Fatalf("Expected response with content")
 		}
-		if !strings.Contains(*response1.Data.Content.String, "CITY_FOR_US") {
-			t.Errorf("Expected response to contain 'CITY_FOR_US', got '%s'", *response1.Data.Content.String)
+		if !strings.Contains(*response1.Data.Content, "CITY_FOR_US") {
+			t.Errorf("Expected response to contain 'CITY_FOR_US', got '%s'", *response1.Data.Content)
 		}
 
 		response2, err := session1.SendAndWait(t.Context(), copilot.MessageOptions{
@@ -384,8 +384,8 @@ func TestMultiClient(t *testing.T) {
 		if response2 == nil || response2.Data.Content == nil {
 			t.Fatalf("Expected response with content")
 		}
-		if !strings.Contains(*response2.Data.Content.String, "CURRENCY_FOR_US") {
-			t.Errorf("Expected response to contain 'CURRENCY_FOR_US', got '%s'", *response2.Data.Content.String)
+		if !strings.Contains(*response2.Data.Content, "CURRENCY_FOR_US") {
+			t.Errorf("Expected response to contain 'CURRENCY_FOR_US', got '%s'", *response2.Data.Content)
 		}
 
 		session2.Disconnect()
@@ -436,8 +436,8 @@ func TestMultiClient(t *testing.T) {
 		if stableResponse == nil || stableResponse.Data.Content == nil {
 			t.Fatalf("Expected response with content")
 		}
-		if !strings.Contains(*stableResponse.Data.Content.String, "STABLE_test1") {
-			t.Errorf("Expected response to contain 'STABLE_test1', got '%s'", *stableResponse.Data.Content.String)
+		if !strings.Contains(*stableResponse.Data.Content, "STABLE_test1") {
+			t.Errorf("Expected response to contain 'STABLE_test1', got '%s'", *stableResponse.Data.Content)
 		}
 
 		ephemeralResponse, err := session1.SendAndWait(t.Context(), copilot.MessageOptions{
@@ -449,8 +449,8 @@ func TestMultiClient(t *testing.T) {
 		if ephemeralResponse == nil || ephemeralResponse.Data.Content == nil {
 			t.Fatalf("Expected response with content")
 		}
-		if !strings.Contains(*ephemeralResponse.Data.Content.String, "EPHEMERAL_test2") {
-			t.Errorf("Expected response to contain 'EPHEMERAL_test2', got '%s'", *ephemeralResponse.Data.Content.String)
+		if !strings.Contains(*ephemeralResponse.Data.Content, "EPHEMERAL_test2") {
+			t.Errorf("Expected response to contain 'EPHEMERAL_test2', got '%s'", *ephemeralResponse.Data.Content)
 		}
 
 		// Disconnect client 2 without destroying the shared session
@@ -474,12 +474,12 @@ func TestMultiClient(t *testing.T) {
 		if afterResponse == nil || afterResponse.Data.Content == nil {
 			t.Fatalf("Expected response with content")
 		}
-		if !strings.Contains(*afterResponse.Data.Content.String, "STABLE_still_here") {
-			t.Errorf("Expected response to contain 'STABLE_still_here', got '%s'", *afterResponse.Data.Content.String)
+		if !strings.Contains(*afterResponse.Data.Content, "STABLE_still_here") {
+			t.Errorf("Expected response to contain 'STABLE_still_here', got '%s'", *afterResponse.Data.Content)
 		}
 		// ephemeral_tool should NOT have produced a result
-		if strings.Contains(*afterResponse.Data.Content.String, "EPHEMERAL_") {
-			t.Errorf("Expected response NOT to contain 'EPHEMERAL_', got '%s'", *afterResponse.Data.Content.String)
+		if strings.Contains(*afterResponse.Data.Content, "EPHEMERAL_") {
+			t.Errorf("Expected response NOT to contain 'EPHEMERAL_', got '%s'", *afterResponse.Data.Content)
 		}
 	})
 }