Skip to content

Commit 90c8e9d

Browse files
committed
fix nil access
1 parent cf2ce07 commit 90c8e9d

File tree

5 files changed

+52
-2
lines changed

5 files changed

+52
-2
lines changed

go/internal/e2e/compaction_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ func TestCompaction(t *testing.T) {
8383
if err != nil {
8484
t.Fatalf("Failed to send verification message: %v", err)
8585
}
86+
if answer == nil {
87+
t.Fatalf("Expected an answer, got nil")
88+
}
8689
if answer.Data.Content == nil || !strings.Contains(strings.ToLower(*answer.Data.Content), "dragon") {
8790
t.Errorf("Expected answer to contain 'dragon', got %v", answer.Data.Content)
8891
}

go/internal/e2e/mcp_and_agents_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ func TestMCPServers(t *testing.T) {
4444
t.Fatalf("Failed to send message: %v", err)
4545
}
4646

47+
if message == nil {
48+
t.Fatal("Expected a message, got nil")
49+
}
50+
4751
if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "4") {
4852
t.Errorf("Expected message to contain '4', got: %v", message.Data.Content)
4953
}
@@ -170,6 +174,10 @@ func TestCustomAgents(t *testing.T) {
170174
t.Fatalf("Failed to send message: %v", err)
171175
}
172176

177+
if message == nil {
178+
t.Fatal("Expected a message, got nil")
179+
}
180+
173181
if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "10") {
174182
t.Errorf("Expected message to contain '10', got: %v", message.Data.Content)
175183
}

go/internal/e2e/session_test.go

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,10 @@ func TestSession(t *testing.T) {
533533
t.Fatalf("Failed to send message after abort: %v", err)
534534
}
535535

536+
if answer == nil {
537+
t.Fatalf("Expected an answer after abort, got nil")
538+
}
539+
536540
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "4") {
537541
t.Errorf("Expected answer to contain '4', got %v", answer.Data.Content)
538542
}
@@ -550,7 +554,7 @@ func TestSession(t *testing.T) {
550554

551555
var deltaContents []string
552556

553-
unsubscribe := session.On(func(event copilot.SessionEvent) {
557+
session.On(func(event copilot.SessionEvent) {
554558
switch event.Type {
555559
case "assistant.message_delta":
556560
if event.Data.DeltaContent != nil {
@@ -561,11 +565,14 @@ func TestSession(t *testing.T) {
561565
})
562566

563567
assistantMessage, err := session.SendAndWait(t.Context(), copilot.MessageOptions{Prompt: "What is 2+2?"})
564-
unsubscribe()
565568
if err != nil {
566569
t.Fatalf("Failed to send message: %v", err)
567570
}
568571

572+
if assistantMessage == nil {
573+
t.Fatal("Expected assistant message, got nil")
574+
}
575+
569576
// Should have received delta events
570577
if len(deltaContents) == 0 {
571578
t.Error("Expected to receive delta events, got none")
@@ -605,6 +612,10 @@ func TestSession(t *testing.T) {
605612
t.Fatalf("Failed to send message: %v", err)
606613
}
607614

615+
if assistantMessage == nil {
616+
t.Fatal("Expected assistant message, got nil")
617+
}
618+
608619
if assistantMessage.Data.Content == nil || !strings.Contains(*assistantMessage.Data.Content, "2") {
609620
t.Errorf("Expected assistant message to contain '2', got %v", assistantMessage.Data.Content)
610621
}
@@ -629,6 +640,10 @@ func TestSession(t *testing.T) {
629640
t.Fatalf("Failed to send message: %v", err)
630641
}
631642

643+
if assistantMessage == nil {
644+
t.Fatal("Expected assistant message, got nil")
645+
}
646+
632647
// Should have received multiple events
633648
if len(receivedEvents) == 0 {
634649
t.Error("Expected to receive events, got none")
@@ -685,6 +700,10 @@ func TestSession(t *testing.T) {
685700
t.Fatalf("Failed to send message: %v", err)
686701
}
687702

703+
if assistantMessage == nil {
704+
t.Fatal("Expected assistant message, got nil")
705+
}
706+
688707
if assistantMessage.Data.Content == nil || !strings.Contains(*assistantMessage.Data.Content, "2") {
689708
t.Errorf("Expected assistant message to contain '2', got %v", assistantMessage.Data.Content)
690709
}

go/internal/e2e/skills_test.go

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

74+
if message == nil {
75+
t.Fatalf("Expected a message, got nil")
76+
}
77+
7478
if message.Data.Content == nil || !strings.Contains(*message.Data.Content, skillMarker) {
7579
t.Errorf("Expected message to contain skill marker '%s', got: %v", skillMarker, message.Data.Content)
7680
}
@@ -99,6 +103,10 @@ func TestSkills(t *testing.T) {
99103
t.Fatalf("Failed to send message: %v", err)
100104
}
101105

106+
if message == nil {
107+
t.Fatalf("Expected a message, got nil")
108+
}
109+
102110
if message.Data.Content != nil && strings.Contains(*message.Data.Content, skillMarker) {
103111
t.Errorf("Expected message to NOT contain skill marker '%s' when disabled, got: %v", skillMarker, *message.Data.Content)
104112
}

go/internal/e2e/tools_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ func TestTools(t *testing.T) {
3535
t.Fatalf("Failed to send message: %v", err)
3636
}
3737

38+
if answer == nil {
39+
t.Fatalf("Expected an answer, got nil")
40+
}
41+
3842
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "ELIZA") {
3943
t.Errorf("Expected answer to contain 'ELIZA', got %v", answer.Data.Content)
4044
}
@@ -64,6 +68,10 @@ func TestTools(t *testing.T) {
6468
t.Fatalf("Failed to send message: %v", err)
6569
}
6670

71+
if answer == nil {
72+
t.Fatalf("Expected an answer, got nil")
73+
}
74+
6775
if answer.Data.Content == nil || !strings.Contains(*answer.Data.Content, "HELLO") {
6876
t.Errorf("Expected answer to contain 'HELLO', got %v", answer.Data.Content)
6977
}
@@ -93,6 +101,10 @@ func TestTools(t *testing.T) {
93101
t.Fatalf("Failed to send message: %v", err)
94102
}
95103

104+
if answer == nil {
105+
t.Fatalf("Expected an answer, got nil")
106+
}
107+
96108
// Check the underlying traffic
97109
traffic, err := ctx.GetExchanges()
98110
if err != nil {

0 commit comments

Comments
 (0)