update test engine

driver/groupdriver.go

@@ -14,7 +14,10 @@ type Step struct {
 
 func (s *Step) MatchesExpectedContent(content []byte) (bool, error) {
 	pattern := regexp.QuoteMeta(s.ExpectedContent)
-	re, _ := regexp.Compile(pattern)
+	re, err := regexp.Compile(pattern)
+	if err != nil {
+		return false, err
+	}
 	if re.Match([]byte(content)) {
 		return true, nil
 	}

internal/handlers/server/accountservice.go

@@ -18,12 +18,9 @@ type AccountServiceInterface interface {
 type AccountService struct {
 }
 
-type MockAccountService struct {
+type TestAccountService struct {
 }
 
-
-
-
 // CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
 //
 // Parameters:
@@ -31,12 +28,10 @@ type MockAccountService struct {
 //     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
 //     AccountResponse struct can be used here to check the account status during a transaction.
 //
-//
 // Returns:
 //   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil.
-//
 func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
 	resp, err := http.Get(config.TrackStatusURL + trackingId)
 	if err != nil {
@@ -54,13 +49,10 @@ func (as *AccountService) CheckAccountStatus(trackingId string) (string, error)
 	if err != nil {
 		return "", err
 	}
-
 	status := trackResp.Result.Transaction.Status
-
 	return status, nil
 }
 
-
 // CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
 // Parameters:
 //   - publicKey: The public key associated with the account whose balance needs to be checked.
@@ -87,8 +79,7 @@ func (as *AccountService) CheckBalance(publicKey string) (string, error) {
 	return balance, nil
 }
 
-
+// CreateAccount creates a new account in the custodial system.
-//CreateAccount creates a new account in the custodial system.
 // Returns:
 //   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
 //     If there is an error during the request or processing, this will be nil.
@@ -115,9 +106,7 @@ func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
 	return &accountResp, nil
 }
 
-
+func (tas *TestAccountService) CreateAccount() (*models.AccountResponse, error) {
-
-func (mas *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
 	return &models.AccountResponse{
 		Ok: true,
 		Result: struct {
@@ -132,7 +121,7 @@ func (mas *MockAccountService) CreateAccount() (*models.AccountResponse, error)
 	}, nil
 }
 
-func (mas *MockAccountService) CheckBalance(publicKey string) (string, error) {
+func (tas *TestAccountService) CheckBalance(publicKey string) (string, error) {
 
 	balanceResponse := &models.BalanceResponse{
 		Ok: true,
@@ -148,6 +137,6 @@ func (mas *MockAccountService) CheckBalance(publicKey string) (string, error) {
 	return balanceResponse.Result.Balance, nil
 }
 
-func (mas *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
+func (tas *TestAccountService) CheckAccountStatus(trackingId string) (string, error) {
 	return "SUCCESS", nil
 }

internal/testutil/TestEngine.go

@@ -79,8 +79,12 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		os.Exit(1)
 	}
 
+	if AccountService == nil {
+		AccountService = &server.AccountService{}
+	}
+
 	switch AccountService.(type) {
-	case *server.MockAccountService:
+	case *server.TestAccountService:
 		go func() {
 			eventChannel <- false
 		}()

internal/testutil/tag_offline.go

@@ -1,3 +1,4 @@
+//go:build !online
 // +build !online
 
 package testutil
@@ -6,8 +7,6 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 )
 
-var AccountService server.AccountServiceInterface
+var (
-
+	AccountService server.AccountServiceInterface = &server.TestAccountService{}
-func init() {
+)
-	AccountService = &server.MockAccountService{}
-}

internal/testutil/tag_online.go

@@ -1,11 +1,10 @@
+//go:build online
 // +build online
 
 package testutil
 
 import "git.grassecon.net/urdt/ussd/internal/handlers/server"
 
-var AccountService server.AccountServiceInterface
+var (
-
+	AccountService server.AccountServiceInterface
-func init() {
+)
-	AccountService = &server.AccountService{}
-}