Merge pull request #309 from OpsLevel/db/update-table-tested-checks

finish moving last of json testdata to use BestTestClient

clientGQL_test.go

@@ -75,12 +75,6 @@ func ABetterTestClient(t *testing.T, endpoint string, request string, response s
 		GraphQLQueryTemplatedValidation(t, request))))
 }
 
-func ATestClient(t *testing.T, endpoint string) *ol.Client {
-	return ol.NewGQLClient(ol.SetAPIToken("x"), ol.SetMaxRetries(0), ol.SetURL(autopilot.RegisterEndpoint(fmt.Sprintf("/LOCAL_TESTING/%s", endpoint),
-		autopilot.FixtureResponse(fmt.Sprintf("%s_response.json", endpoint)),
-		autopilot.GraphQLQueryFixtureValidation(t, fmt.Sprintf("%s_request.json", endpoint)))))
-}
-
 func NewTestRequest(request string, variables string, response string) TestRequest {
 	testRequest := TestRequest{
 		Request:   Templated(request),
@@ -184,18 +178,6 @@ func BestTestClient(t *testing.T, endpoint string, requests ...TestRequest) *ol.
 	return ol.NewGQLClient(ol.SetAPIToken("x"), ol.SetMaxRetries(0), ol.SetURL(url))
 }
 
-func ATestClientAlt(t *testing.T, response string, request string) *ol.Client {
-	return ol.NewGQLClient(ol.SetAPIToken("x"), ol.SetMaxRetries(0), ol.SetURL(autopilot.RegisterEndpoint(fmt.Sprintf("/LOCAL_TESTING/%s__%s", response, request),
-		autopilot.FixtureResponse(fmt.Sprintf("%s_response.json", response)),
-		autopilot.GraphQLQueryFixtureValidation(t, fmt.Sprintf("%s_request.json", request)))))
-}
-
-func ATestClientSkipRequest(t *testing.T, endpoint string) *ol.Client {
-	return ol.NewGQLClient(ol.SetAPIToken("x"), ol.SetMaxRetries(0), ol.SetURL(autopilot.RegisterEndpoint(fmt.Sprintf("/LOCAL_TESTING/%s", endpoint),
-		autopilot.FixtureResponse(fmt.Sprintf("%s_response.json", endpoint)),
-		autopilot.SkipRequestValidation())))
-}
-
 func TestClientQuery(t *testing.T) {
 	// Arrange
 	headers := map[string]string{"x": "x"}

clientRest_test.go

@@ -2,18 +2,29 @@ package opslevel_test
 
 import (
 	"fmt"
+	"net/http"
 	"testing"
 
 	"github.com/go-resty/resty/v2"
 	ol "github.com/opslevel/opslevel-go/v2023"
 	"github.com/rocktavious/autopilot/v2023"
 )
 
+const testRestClientResponse = `{ "result": "Hello World!" }`
+
+func testRestClientResponseWriter() autopilot.ResponseWriter {
+	return func(w http.ResponseWriter) {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		fmt.Fprint(w, testRestClientResponse)
+	}
+}
+
 func ATestRestClient(t *testing.T, endpoint string) *resty.Client {
 	return ol.NewRestClient(ol.SetURL(
 		autopilot.RegisterEndpoint(
 			fmt.Sprintf("/%s", endpoint),
-			autopilot.FixtureResponse(fmt.Sprintf("%s_response.json", endpoint)),
+			testRestClientResponseWriter(),
 			autopilot.SkipRequestValidation(),
 		),
 	),