update test engine

driver/groupdriver.go

@@ -13,13 +13,12 @@ type Step struct {
 }
 
 func (s *Step) MatchesExpectedContent(content []byte) (bool, error) {
-	pattern := `.*\?.*|.*`
+	pattern := regexp.QuoteMeta(s.ExpectedContent)
 	re, err := regexp.Compile(pattern)
 	if err != nil {
 		return false, err
 	}
-	// Check if the content matches the regex pattern
-	if re.Match(content) {
+	if re.Match([]byte(content)) {
 		return true, nil
 	}
 	return false, nil
@@ -38,7 +37,8 @@ type TestCase struct {
 }
 
 func (s *TestCase) MatchesExpectedContent(content []byte) (bool, error) {
-	re, err := regexp.Compile(s.ExpectedContent)
+	pattern := regexp.QuoteMeta(s.ExpectedContent)
+	re, err := regexp.Compile(pattern)
 	if err != nil {
 		return false, err
 	}

engine/engine.go

@@ -1,111 +0,0 @@
-package engine
-
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	"git.grassecon.net/urdt/ussd/internal/storage"
-	testdataloader "github.com/peteole/testdata-loader"
-)
-
-var (
-	baseDir   = testdataloader.GetBasePath()
-	logg      = logging.NewVanilla()
-	scriptDir = path.Join(baseDir, "services", "registration")
-)
-
-func TestEngine(sessionId string) (engine.Engine, func()) {
-	var accountService server.AccountServiceInterface
-	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	pfp := path.Join(scriptDir, "pp.csv")
-
-	cfg := engine.Config{
-		Root:       "root",
-		SessionId:  sessionId,
-		OutputSize: uint32(160),
-		FlagCount:  uint32(16),
-	}
-
-	dbDir := ".test_state"
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-
-	err := menuStorageService.EnsureDbDir()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	rs, err := menuStorageService.GetResource(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	pe, err := menuStorageService.GetPersister(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	userDataStore, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	dbResource, ok := rs.(*resource.DbResource)
-	if !ok {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-	lhs.SetDataStore(&userDataStore)
-	lhs.SetPersister(pe)
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	if OnlineTestEnabled {
-		accountService = &server.AccountService{}
-	} else {
-		accountService = &server.MockAccountService{}
-	}
-	hl, err := lhs.GetHandler(accountService)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	en := lhs.GetEngine()
-	en = en.WithFirst(hl.Init)
-
-	cleanFn := func() {
-		err := en.Finish()
-		if err != nil {
-			logg.Errorf(err.Error())
-		}
-
-		err = menuStorageService.Close()
-		if err != nil {
-			logg.Errorf(err.Error())
-		}
-		logg.Infof("testengine storage closed")
-	}
-
-	//en = en.WithDebug(nil)
-	return en, cleanFn
-}
-

engine/tag_offline.go

@@ -1,5 +0,0 @@
-// +build !online
-
-package engine
-
-const OnlineTestEnabled = false

engine/tag_online.go

@@ -1,5 +0,0 @@
-// +build online
-
-package engine
-
-const OnlineTestEnabled = true

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 (mas *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
+func (tas *TestAccountService) 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

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

internal/testutil/tag_online.go

@@ -0,0 +1,10 @@
+//go:build online
+// +build online
+
+package testutil
+
+import "git.grassecon.net/urdt/ussd/internal/handlers/server"
+
+var (
+	AccountService server.AccountServiceInterface
+)

services/registration/edit_profile.vis

@@ -19,4 +19,3 @@ INCMP enter_yob 4
 INCMP enter_location 5
 INCMP enter_offerings 6
 INCMP view_profile 7
-

test_engine/menu_traversal_test.go

@@ -160,6 +160,7 @@ func TestSendWithInvalidInputs(t *testing.T) {
 
 				// Replace placeholder {public_key} with the actual dynamic public key
 				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -1)
+				step.ExpectedContent = string(expectedContent)
 				match, err := step.MatchesExpectedContent(b)
 				if err != nil {
 					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
@@ -338,6 +339,7 @@ func TestMyAccount_MyAddress(t *testing.T) {
 
 				publicKey := extractPublicKey(b)
 				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -1)
+				step.ExpectedContent = string(expectedContent)
 				match, err := step.MatchesExpectedContent(b)
 				if err != nil {
 					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)