internal/testutil/TestEngine.go

@@ -10,6 +10,7 @@ import (
 	"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"
 )
@@ -21,7 +22,7 @@ var (
 )
 
 func TestEngine(sessionId string) (engine.Engine, func()) {
-	//var accountService server.AccountServiceInterface
+	var accountService server.AccountServiceInterface
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 	pfp := path.Join(scriptDir, "pp.csv")
@@ -75,7 +76,13 @@ func TestEngine(sessionId string) (engine.Engine, func()) {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	hl, err := lhs.GetHandler(AccountService)
+
+	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)

internal/testutil/tag_offline.go

@@ -2,12 +2,4 @@
 
 package testutil
 
-import (
+const OnlineTestEnabled = false
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-)
-
-var AccountService server.AccountServiceInterface
-
-func init() {
-	AccountService = &server.MockAccountService{}
-}

internal/testutil/tag_online.go

@@ -3,13 +3,3 @@
 package testutil
 
 const OnlineTestEnabled = true
-
-
-
-
-var AccountService server.AccountServiceInterface
-
-
-func init() {
-    AccountService = &server.AccountService{}
-}