GODT-1205: "RCPT TO" does not contain all addressed from "CC"

test/liveapi/calls.go

@@ -17,62 +17,25 @@
 
 package liveapi
 
-import (
-	"fmt"
-
-	"github.com/nsf/jsondiff"
-)
-
-type fakeCall struct {
-	method  string
-	path    string
-	request []byte
-}
-
 func (ctl *Controller) recordCall(method, path string, request []byte) {
 	ctl.lock.Lock()
 	defer ctl.lock.Unlock()
 
-	ctl.calls = append(ctl.calls, &fakeCall{
-		method:  method,
-		path:    path,
-		request: request,
-	})
+	ctl.calls.Register(method, path, request)
 }
 
 func (ctl *Controller) PrintCalls() {
-	fmt.Println("API calls:")
-	for idx, call := range ctl.calls {
-		fmt.Printf("%02d: [%s] %s\n", idx+1, call.method, call.path)
-		if call.request != nil && string(call.request) != "null" {
-			fmt.Printf("\t%s\n", call.request)
-		}
-	}
+	ctl.calls.PrintCalls()
 }
 
 func (ctl *Controller) WasCalled(method, path string, expectedRequest []byte) bool {
-	for _, call := range ctl.calls {
-		if call.method != method || call.path != path {
-			continue
-		}
-		if string(expectedRequest) == "" {
-			return true
-		}
-		diff, _ := jsondiff.Compare(call.request, expectedRequest, &jsondiff.Options{})
-		isSuperset := diff == jsondiff.FullMatch || diff == jsondiff.SupersetMatch
-		if isSuperset {
-			return true
-		}
-	}
-	return false
+	return ctl.calls.WasCalled(method, path, expectedRequest)
+}
+
+func (ctl *Controller) WasCalledRegex(methodRegex, pathRegex string, expectedRequest []byte) (bool, error) {
+	return ctl.calls.WasCalledRegex(methodRegex, pathRegex, expectedRequest)
 }
 
 func (ctl *Controller) GetCalls(method, path string) [][]byte {
-	requests := [][]byte{}
-	for _, call := range ctl.calls {
-		if call.method == method && call.path == path {
-			requests = append(requests, call.request)
-		}
-	}
-	return requests
+	return ctl.calls.GetCalls(method, path)
 }