reorder to previous

Author: pawbana

internal/integrationtest/bridge_test.go

@@ -1119,7 +1119,6 @@ func TestErrorHandling(t *testing.T) {
 
 				resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, fix.Request())
 				t.Cleanup(func() { _ = resp.Body.Close() })
-				bridgeServer.Close()
 
 				tc.responseHandlerFn(resp)
 				bridgeServer.Recorder.VerifyAllInterceptionsEnded(t)

internal/integrationtest/mockmcp.go

@@ -31,13 +31,6 @@ type mockMCP struct {
 	calls *callAccumulator
 }
 
-// callAccumulator tracks all tool invocations by name and each instance's arguments.
-type callAccumulator struct {
-	calls      map[string][]any
-	callsMu    sync.Mutex
-	toolErrors map[string]string
-}
-
 // getCallsByTool returns recorded arguments for a given tool name.
 func (m *mockMCP) getCallsByTool(name string) []any {
 	return m.calls.getCallsByTool(name)
@@ -91,6 +84,13 @@ func newNoopMCPManager() mcp.ServerProxier {
 	return mcp.NewServerProxyManager(nil, noop.NewTracerProvider().Tracer(""))
 }
 
+// callAccumulator tracks all tool invocations by name and each instance's arguments.
+type callAccumulator struct {
+	calls      map[string][]any
+	callsMu    sync.Mutex
+	toolErrors map[string]string
+}
+
 func newCallAccumulator() *callAccumulator {
 	return &callAccumulator{
 		calls:      make(map[string][]any),

internal/integrationtest/mockupstream.go

@@ -35,6 +35,34 @@ type upstreamResponse struct {
 	OnRequest func(r *http.Request, body []byte)
 }
 
+// newFixtureResponse creates an upstreamResponse from a parsed fixture archive.
+// It reads whichever of 'streaming' and 'non-streaming' sections exist;
+// not every fixture has both (e.g. error fixtures may only define one).
+func newFixtureResponse(fix fixtures.Fixture) upstreamResponse {
+	var resp upstreamResponse
+	if fix.Has(fixtures.SectionStreaming) {
+		resp.Streaming = fix.Streaming()
+	}
+	if fix.Has(fixtures.SectionNonStreaming) {
+		resp.Blocking = fix.NonStreaming()
+	}
+	return resp
+}
+
+// newFixtureToolResponse creates an upstreamResponse from the tool-call fixture files.
+// It reads whichever of 'streaming/tool-call' and 'non-streaming/tool-call'
+// sections exist.
+func newFixtureToolResponse(fix fixtures.Fixture) upstreamResponse {
+	var resp upstreamResponse
+	if fix.Has(fixtures.SectionStreamingToolCall) {
+		resp.Streaming = fix.StreamingToolCall()
+	}
+	if fix.Has(fixtures.SectionNonStreamToolCall) {
+		resp.Blocking = fix.NonStreamingToolCall()
+	}
+	return resp
+}
+
 // receivedRequest captures the details of a single request handled by mockUpstream.
 type receivedRequest struct {
 	Method string
@@ -70,34 +98,6 @@ type mockUpstream struct {
 	responses []upstreamResponse
 }
 
-// newFixtureResponse creates an upstreamResponse from a parsed fixture archive.
-// It reads whichever of 'streaming' and 'non-streaming' sections exist;
-// not every fixture has both (e.g. error fixtures may only define one).
-func newFixtureResponse(fix fixtures.Fixture) upstreamResponse {
-	var resp upstreamResponse
-	if fix.Has(fixtures.SectionStreaming) {
-		resp.Streaming = fix.Streaming()
-	}
-	if fix.Has(fixtures.SectionNonStreaming) {
-		resp.Blocking = fix.NonStreaming()
-	}
-	return resp
-}
-
-// newFixtureToolResponse creates an upstreamResponse from the tool-call fixture files.
-// It reads whichever of 'streaming/tool-call' and 'non-streaming/tool-call'
-// sections exist.
-func newFixtureToolResponse(fix fixtures.Fixture) upstreamResponse {
-	var resp upstreamResponse
-	if fix.Has(fixtures.SectionStreamingToolCall) {
-		resp.Streaming = fix.StreamingToolCall()
-	}
-	if fix.Has(fixtures.SectionNonStreamToolCall) {
-		resp.Blocking = fix.NonStreamingToolCall()
-	}
-	return resp
-}
-
 // receivedRequests returns a copy of all requests received so far.
 func (ms *mockUpstream) receivedRequests() []receivedRequest {
 	ms.mu.Lock()