Merge remote-tracking branch 'refs/remotes/origin/menu-traversals' into menu-traversals

test_engine/menu_traversal_test.go

@@ -3,8 +3,6 @@ package main
 import (
 	"bytes"
 	"context"
-	"crypto/rand"
-	"encoding/hex"
 	"fmt"
 	"regexp"
 	"testing"
@@ -12,7 +10,7 @@ import (
 
 	"git.grassecon.net/urdt/ussd/driver"
 	enginetest "git.grassecon.net/urdt/ussd/engine"
-	"git.grassecon.net/urdt/ussd/internal/utils"
+	"github.com/gofrs/uuid"
 )
 
 var (
@@ -20,14 +18,13 @@ var (
 	sessionID string
 )
 
-// GenerateRandomSessionID generates a random session ID of 10 characters
-func GenerateRandomSessionID() string {
-	bytes := make([]byte, 5)
-	_, err := rand.Read(bytes)
+// GenerateRandomSessionID generates a random UUID for the sessionID
+func GenerateUUID() string {
+	u, err := uuid.NewV4()
 	if err != nil {
-		return "default_session"
+		return "default_uuid"
 	}
-	return hex.EncodeToString(bytes)
+	return u.String()
 }
 
 // Extract the public key from the engine response
@@ -42,7 +39,7 @@ func extractPublicKey(response []byte) string {
 }
 
 func TestMain(m *testing.M) {
-	sessionID = GenerateRandomSessionID()
+	sessionID = GenerateUUID()
 	m.Run()
 }
 
@@ -79,7 +76,9 @@ func TestAccountCreationSuccessful(t *testing.T) {
 }
 
 func TestAccountRegistrationRejectTerms(t *testing.T) {
-	en, fn, _ := enginetest.TestEngine(sessionID + "_b")
+	// Generate a new UUID for this edge case test
+	edgeCaseSessionID := GenerateUUID()
+	en, fn, _ := enginetest.TestEngine(edgeCaseSessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData