Name and order the model client code

[onechat] / auth_test.go

diff --git a/auth_test.go b/auth_test.go
index ccc7e66ade870b970a13eaf5b9c4f4775c174693..06216057cd64a3e9e8dd3ff2195c63738a3bbf93 100644 (file)
--- a/auth_test.go
+++ b/auth_test.go
@@ -169,9 +169,9 @@ func TestForcedRefreshLetsTheNextCallWork(t *testing.T) {
        auth := newTestAuth(t, server)
        writeTestTokens(t, auth, server.token(-time.Hour), "refresh-0")
 
        auth := newTestAuth(t, server)
        writeTestTokens(t, auth, server.token(-time.Hour), "refresh-0")
 

-       responses := newFakeResponses(t)
-       client := newClient(responses.URL, auth, "agent-key", filepath.Join(t.TempDir(), "usage.jsonl"))
-       _, err := client.Create(t.Context(), testRequest())
+       responses := newModelFake(t)
+       client := newModelClient(responses.URL, auth, "agent-key", filepath.Join(t.TempDir(), "usage.jsonl"))
+       _, err := client.Create(t.Context(), modelTestRequest())

        require.NoError(t, err)
 
        require.Equal(t, 1, server.refreshes)
        require.NoError(t, err)
 
        require.Equal(t, 1, server.refreshes)


@@ -185,18 +185,18 @@ func TestModelEndpointFollowsTheConfig(t *testing.T) {
        dir := t.TempDir()
        config := defaultConfig()
 
        dir := t.TempDir()
        config := defaultConfig()
 

-       t.Setenv("OPENAI_API_KEY", testKey)
+       t.Setenv("OPENAI_API_KEY", modelTestKey)

        address, auth, err := modelEndpoint(config, dir)
        require.NoError(t, err)
        address, auth, err := modelEndpoint(config, dir)
        require.NoError(t, err)

-       require.Equal(t, chatgptURL, address)
+       require.Equal(t, modelChatGPTURL, address)

        require.IsType(t, &chatgptAuth{}, auth)
        require.Equal(t, filepath.Join(dir, tokenFileName), auth.(*chatgptAuth).path)
 
        config.Endpoint = endpointAPI
        address, auth, err = modelEndpoint(config, dir)
        require.NoError(t, err)
        require.IsType(t, &chatgptAuth{}, auth)
        require.Equal(t, filepath.Join(dir, tokenFileName), auth.(*chatgptAuth).path)
 
        config.Endpoint = endpointAPI
        address, auth, err = modelEndpoint(config, dir)
        require.NoError(t, err)

-       require.Equal(t, apiURL, address)
-       require.Equal(t, apiKey(testKey), auth)
+       require.Equal(t, modelAPIURL, address)
+       require.Equal(t, ModelAPIKey(modelTestKey), auth)

 
        t.Setenv("OPENAI_API_KEY", "")
        _, _, err = modelEndpoint(config, dir)
 
        t.Setenv("OPENAI_API_KEY", "")
        _, _, err = modelEndpoint(config, dir)