Skip to content

Commit a84b369

Browse files
SteveSandersonMSCopilot
SteveSandersonMS
and
Copilot
committed
fix: revert .Content.String back to .Content in Go E2E tests
The DataContent union type from session events codegen was reverted, so these tests need to use *string Content again. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 0606475 commit a84b369

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

‎go/internal/e2e/permissions_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func TestPermissions(t *testing.T) {
266266
t.Fatalf("Failed to get final message: %v", err)
267267
}
268268

269-
if message.Data.Content == nil || !strings.Contains(*message.Data.Content.String, "4") {
269+
if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "4") {
270270
t.Errorf("Expected message to contain '4', got: %v", message.Data.Content)
271271
}
272272
})

‎go/internal/e2e/session_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestSession(t *testing.T) {
7373
t.Fatalf("Failed to send message: %v", err)
7474
}
7575

76-
if assistantMessage.Data.Content == nil || !strings.Contains(*assistantMessage.Data.Content.String, "2") {
76+
if assistantMessage.Data.Content == nil || !strings.Contains(*assistantMessage.Data.Content, "2") {
7777
t.Errorf("Expected assistant message to contain '2', got %v", assistantMessage.Data.Content)
7878
}
7979

@@ -82,7 +82,7 @@ func TestSession(t *testing.T) {
8282
t.Fatalf("Failed to send second message: %v", err)
8383
}
8484

85-
if secondMessage.Data.Content == nil || !strings.Contains(*secondMessage.Data.Content.String, "4") {
85+
if secondMessage.Data.Content == nil || !strings.Contains(*secondMessage.Data.Content, "4") {
8686
t.Errorf("Expected second message to contain '4', got %v", secondMessage.Data.Content)
8787
}
8888
})
@@ -109,7 +109,7 @@ func TestSession(t *testing.T) {
109109

110110
content := ""
111111
if assistantMessage != nil && assistantMessage.Data.Content != nil {
112-
content = *assistantMessage.Data.Content.String
112+
content = *assistantMessage.Data.Content
113113
}
114114

115115
if !strings.Contains(content, "GitHub") {
@@ -163,7 +163,7 @@ func TestSession(t *testing.T) {
163163

164164
content := ""
165165
if assistantMessage.Data.Content != nil {
166-
content = *assistantMessage.Data.Content.String
166+
content = *assistantMessage.Data.Content
167167
}
168168

169169
if strings.Contains(content, "GitHub") {
@@ -362,7 +362,7 @@ func TestSession(t *testing.T) {
362362

363363
content := ""
364364
if assistantMessage.Data.Content != nil {
365-
content = *assistantMessage.Data.Content.String
365+
content = *assistantMessage.Data.Content
366366
}
367367

368368
if !strings.Contains(content, "54321") {
@@ -394,7 +394,7 @@ func TestSession(t *testing.T) {
394394
t.Fatalf("Failed to get assistant message: %v", err)
395395
}
396396

397-
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "2") {
397+
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "2") {
398398
t.Errorf("Expected answer to contain '2', got %v", answer.Data.Content)
399399
}
400400

@@ -415,7 +415,7 @@ func TestSession(t *testing.T) {
415415
t.Fatalf("Failed to get assistant message from resumed session: %v", err)
416416
}
417417

418-
if answer2.Data.Content == nil || !strings.Contains(*answer2.Data.Content.String, "2") {
418+
if answer2.Data.Content == nil || !strings.Contains(*answer2.Data.Content, "2") {
419419
t.Errorf("Expected resumed session answer to contain '2', got %v", answer2.Data.Content)
420420
}
421421

@@ -424,7 +424,7 @@ func TestSession(t *testing.T) {
424424
if err != nil {
425425
t.Fatalf("Failed to send follow-up message: %v", err)
426426
}
427-
if answer3 == nil || answer3.Data.Content == nil || !strings.Contains(*answer3.Data.Content.String, "4") {
427+
if answer3 == nil || answer3.Data.Content == nil || !strings.Contains(*answer3.Data.Content, "4") {
428428
t.Errorf("Expected follow-up answer to contain '4', got %v", answer3)
429429
}
430430
})
@@ -449,7 +449,7 @@ func TestSession(t *testing.T) {
449449
t.Fatalf("Failed to get assistant message: %v", err)
450450
}
451451

452-
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "2") {
452+
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "2") {
453453
t.Errorf("Expected answer to contain '2', got %v", answer.Data.Content)
454454
}
455455

@@ -497,7 +497,7 @@ func TestSession(t *testing.T) {
497497
if err != nil {
498498
t.Fatalf("Failed to send follow-up message: %v", err)
499499
}
500-
if answer3 == nil || answer3.Data.Content == nil || !strings.Contains(*answer3.Data.Content.String, "4") {
500+
if answer3 == nil || answer3.Data.Content == nil || !strings.Contains(*answer3.Data.Content, "4") {
501501
t.Errorf("Expected follow-up answer to contain '4', got %v", answer3)
502502
}
503503
})
@@ -628,7 +628,7 @@ func TestSession(t *testing.T) {
628628
t.Fatalf("Failed to send message after abort: %v", err)
629629
}
630630

631-
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "4") {
631+
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "4") {
632632
t.Errorf("Expected answer to contain '4', got %v", answer.Data.Content)
633633
}
634634
})
@@ -723,7 +723,7 @@ func TestSession(t *testing.T) {
723723
if err != nil {
724724
t.Fatalf("Failed to get assistant message: %v", err)
725725
}
726-
if assistantMessage.Data.Content == nil || !strings.Contains(*assistantMessage.Data.Content.String, "300") {
726+
if assistantMessage.Data.Content == nil || !strings.Contains(*assistantMessage.Data.Content, "300") {
727727
t.Errorf("Expected assistant message to contain '300', got %v", assistantMessage.Data.Content)
728728
}
729729
})
@@ -756,7 +756,7 @@ func TestSession(t *testing.T) {
756756
t.Fatalf("Failed to get assistant message: %v", err)
757757
}
758758

759-
if assistantMessage.Data.Content == nil || !strings.Contains(*assistantMessage.Data.Content.String, "2") {
759+
if assistantMessage.Data.Content == nil || !strings.Contains(*assistantMessage.Data.Content, "2") {
760760
t.Errorf("Expected assistant message to contain '2', got %v", assistantMessage.Data.Content)
761761
}
762762
})

‎go/internal/e2e/skills_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func TestSkills(t *testing.T) {
7272
t.Fatalf("Failed to send message: %v", err)
7373
}
7474

75-
if message.Data.Content == nil || !strings.Contains(*message.Data.Content.String, skillMarker) {
75+
if message.Data.Content == nil || !strings.Contains(*message.Data.Content, skillMarker) {
7676
t.Errorf("Expected message to contain skill marker '%s', got: %v", skillMarker, message.Data.Content)
7777
}
7878

@@ -101,8 +101,8 @@ func TestSkills(t *testing.T) {
101101
t.Fatalf("Failed to send message: %v", err)
102102
}
103103

104-
if message.Data.Content != nil && strings.Contains(*message.Data.Content.String, skillMarker) {
105-
t.Errorf("Expected message to NOT contain skill marker '%s' when disabled, got: %v", skillMarker, *message.Data.Content.String)
104+
if message.Data.Content != nil && strings.Contains(*message.Data.Content, skillMarker) {
105+
t.Errorf("Expected message to NOT contain skill marker '%s' when disabled, got: %v", skillMarker, *message.Data.Content)
106106
}
107107

108108
session.Disconnect()
@@ -127,8 +127,8 @@ func TestSkills(t *testing.T) {
127127
t.Fatalf("Failed to send message: %v", err)
128128
}
129129

130-
if message1.Data.Content != nil && strings.Contains(*message1.Data.Content.String, skillMarker) {
131-
t.Errorf("Expected message to NOT contain skill marker before skill was added, got: %v", *message1.Data.Content.String)
130+
if message1.Data.Content != nil && strings.Contains(*message1.Data.Content, skillMarker) {
131+
t.Errorf("Expected message to NOT contain skill marker before skill was added, got: %v", *message1.Data.Content)
132132
}
133133

134134
// Resume with skillDirectories - skill should now be active
@@ -150,7 +150,7 @@ func TestSkills(t *testing.T) {
150150
t.Fatalf("Failed to send message: %v", err)
151151
}
152152

153-
if message2.Data.Content == nil || !strings.Contains(*message2.Data.Content.String, skillMarker) {
153+
if message2.Data.Content == nil || !strings.Contains(*message2.Data.Content, skillMarker) {
154154
t.Errorf("Expected message to contain skill marker '%s' after resume, got: %v", skillMarker, message2.Data.Content)
155155
}
156156

‎go/internal/e2e/streaming_fidelity_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func TestStreamingFidelity(t *testing.T) {
161161
if err != nil {
162162
t.Fatalf("Failed to send follow-up message: %v", err)
163163
}
164-
if answer == nil || answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "18") {
164+
if answer == nil || answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "18") {
165165
t.Errorf("Expected answer to contain '18', got %v", answer)
166166
}
167167

‎go/internal/e2e/tool_results_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestToolResults(t *testing.T) {
4848

4949
content := ""
5050
if answer.Data.Content != nil {
51-
content = *answer.Data.Content.String
51+
content = *answer.Data.Content
5252
}
5353
if !strings.Contains(strings.ToLower(content), "sunny") && !strings.Contains(content, "72") {
5454
t.Errorf("Expected answer to mention sunny or 72, got %q", content)
@@ -96,7 +96,7 @@ func TestToolResults(t *testing.T) {
9696

9797
content := ""
9898
if answer.Data.Content != nil {
99-
content = *answer.Data.Content.String
99+
content = *answer.Data.Content
100100
}
101101
if !strings.Contains(strings.ToLower(content), "service is down") {
102102
t.Errorf("Expected 'service is down', got %q", content)
@@ -146,7 +146,7 @@ func TestToolResults(t *testing.T) {
146146

147147
content := ""
148148
if answer.Data.Content != nil {
149-
content = *answer.Data.Content.String
149+
content = *answer.Data.Content
150150
}
151151
if !strings.Contains(strings.ToLower(content), "no issues") {
152152
t.Errorf("Expected 'no issues', got %q", content)

‎go/internal/e2e/tools_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestTools(t *testing.T) {
4343
t.Fatalf("Failed to get assistant message: %v", err)
4444
}
4545

46-
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "ELIZA") {
46+
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "ELIZA") {
4747
t.Errorf("Expected answer to contain 'ELIZA', got %v", answer.Data.Content)
4848
}
4949
})
@@ -78,7 +78,7 @@ func TestTools(t *testing.T) {
7878
t.Fatalf("Failed to get assistant message: %v", err)
7979
}
8080

81-
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "HELLO") {
81+
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "HELLO") {
8282
t.Errorf("Expected answer to contain 'HELLO', got %v", answer.Data.Content)
8383
}
8484
})
@@ -162,10 +162,10 @@ func TestTools(t *testing.T) {
162162
}
163163

164164
// The assistant should not see the exception information
165-
if answer.Data.Content != nil && strings.Contains(*answer.Data.Content.String, "Melbourne") {
166-
t.Errorf("Assistant should not see error details 'Melbourne', got '%s'", *answer.Data.Content.String)
165+
if answer.Data.Content != nil && strings.Contains(*answer.Data.Content, "Melbourne") {
166+
t.Errorf("Assistant should not see error details 'Melbourne', got '%s'", *answer.Data.Content)
167167
}
168-
if answer.Data.Content == nil || !strings.Contains(strings.ToLower(*answer.Data.Content.String), "unknown") {
168+
if answer.Data.Content == nil || !strings.Contains(strings.ToLower(*answer.Data.Content), "unknown") {
169169
t.Errorf("Expected answer to contain 'unknown', got %v", answer.Data.Content)
170170
}
171171
})
@@ -236,7 +236,7 @@ func TestTools(t *testing.T) {
236236
t.Fatalf("Expected assistant message with content")
237237
}
238238

239-
responseContent := *answer.Data.Content.String
239+
responseContent := *answer.Data.Content
240240
if responseContent == "" {
241241
t.Errorf("Expected non-empty response")
242242
}
@@ -301,7 +301,7 @@ func TestTools(t *testing.T) {
301301
t.Fatalf("Failed to get assistant message: %v", err)
302302
}
303303

304-
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "RESULT: test123") {
304+
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "RESULT: test123") {
305305
t.Errorf("Expected answer to contain 'RESULT: test123', got %v", answer.Data.Content)
306306
}
307307

@@ -343,7 +343,7 @@ func TestTools(t *testing.T) {
343343
t.Fatalf("Failed to get assistant message: %v", err)
344344
}
345345

346-
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "CUSTOM_GREP_RESULT") {
346+
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "CUSTOM_GREP_RESULT") {
347347
t.Errorf("Expected answer to contain 'CUSTOM_GREP_RESULT', got %v", answer.Data.Content)
348348
}
349349
})
@@ -386,7 +386,7 @@ func TestTools(t *testing.T) {
386386
t.Fatalf("Failed to get assistant message: %v", err)
387387
}
388388

389-
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content.String, "HELLO") {
389+
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "HELLO") {
390390
t.Errorf("Expected answer to contain 'HELLO', got %v", answer.Data.Content)
391391
}
392392

0 commit comments

Comments
 (0)