run TestSetLanguage with execPath instead of input

added missing functions to the other getHandlers
use dedicated nodes to set the language
2024-09-17 18:54:07 +03:00 · 2024-09-17 15:31:44 +03:00 · 2024-09-17 15:29:21 +03:00 · 2024-09-17 15:26:50 +03:00 · 2024-09-16 17:29:27 +03:00 · 2024-09-16 17:29:27 +03:00
58 changed files with 107 additions and 77 deletions
@@ -84,7 +84,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	if err != nil {
 		return nil, err
 	}
-	rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
 	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
 	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
@@ -116,6 +116,10 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)

 	return ussdHandlers, nil
 }
@@ -54,7 +54,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	if err != nil {
 		return nil, err
 	}
-	rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
 	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
 	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
@@ -86,6 +86,10 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)

 	return ussdHandlers, nil
 }
@@ -44,7 +44,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	if err != nil {
 		return nil, err
 	}
-	rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
 	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
 	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
@@ -76,6 +76,10 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)

 	return ussdHandlers, nil
 }
@@ -39,7 +39,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, pe *persist.P
 		return nil, err
 	}
 	ussdHandlers = ussdHandlers.WithPersister(pe)
-	rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
 	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
 	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
@@ -121,15 +121,15 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
 // SetLanguage sets the language across the menu
 func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	var err error

-	inputStr := string(input)
-	switch inputStr {
-	case "0":
-		res.FlagSet = []uint32{state.FLAG_LANG}
+	sym, _ = h.st.Where()
+
+	switch sym {
+	case "set_default":
+		res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
 		res.Content = "eng"
-	case "1":
-		res.FlagSet = []uint32{state.FLAG_LANG}
+	case "set_swa":
+		res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
 		res.Content = "swa"
 	default:
 	}
@@ -539,63 +539,55 @@ func TestSetLanguage(t *testing.T) {
 	// Define test cases
 	tests := []struct {
 		name                string
-		input               []byte
-		expectedFlags       []uint32
+		execPath            []string
 		expectedResult      resource.Result
-		flagManagerResponse uint32
-		flagManagerError    error
 	}{
 		{
-			name:          "English language",
-			input:         []byte("0"),
-			expectedFlags: []uint32{state.FLAG_LANG, 123},
+			name:     "Set Default Language (English)",
+			execPath: []string{"set_default"},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "eng",
 			},
-			flagManagerResponse: 123,
-			flagManagerError:    nil,
 		},
 		{
-			name:          "Swahili language",
-			input:         []byte("1"),
-			expectedFlags: []uint32{state.FLAG_LANG, 123},
+			name:     "Set Swahili Language",
+			execPath: []string{"set_swa"},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "swa",
 			},
-			flagManagerResponse: 123,
-			flagManagerError:    nil,
 		},
 		{
-			name:          "Unhandled Input",
-			input:         []byte("3"),
-			expectedFlags: []uint32{123},
+			name:     "Unhandled path",
+			execPath: []string{""},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{8},
 			},
-			flagManagerResponse: 123,
-			flagManagerError:    nil,
 		},
 	}

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			mockState := state.NewState(16)
+			// Set the ExecPath
+			mockState.ExecPath = tt.execPath

 			// Create the Handlers instance with the mock flag manager
 			h := &Handlers{
 				flagManager: fm.parser,
+				st:          mockState,
 			}

 			// Call the method
-			res, err := h.SetLanguage(context.Background(), "set_language", tt.input)
+			res, err := h.SetLanguage(context.Background(), "set_language", nil)

 			if err != nil {
 				t.Error(err)
 			}

 			// Assert that the Result FlagSet has the required flags after language switch
-			assert.Equal(t, res, tt.expectedResult, "Flags should be equal to account created")
+			assert.Equal(t, res, tt.expectedResult, "Result should match expected result")

 		})
 	}
@@ -1 +1 @@
-Rudi
+Rudi
@@ -1 +1 @@
-Balances:
+Balances:
@@ -1 +1 @@
-Salio
+Salio:
@@ -0,0 +1 @@
+Select language:
@@ -0,0 +1,10 @@
+LOAD reset_account_authorized 0
+LOAD reset_incorrect 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH pin_entry flag_account_authorized 0
+MOUT english 0
+MOUT kiswahili 1
+HALT
+INCMP set_default 0
+INCMP set_swa 1
+INCMP . *
@@ -1 +1 @@
-Badili lugha
+Badili lugha
@@ -0,0 +1 @@
+Chagua lugha:
@@ -1 +1 @@
-Change PIN
+Change PIN
@@ -1 +1 @@
-Badili PIN
+Badili PIN
@@ -1 +1 @@
-Check statement
+Check statement
@@ -1,2 +1 @@
-Your community balance is: 0.00SRF
-
+Your community balance is: 0.00SRF
@@ -1 +1 @@
-Community  balance
+Community balance
@@ -1 +1 @@
-Edit name
+Edit name
@@ -1 +1 @@
-Weka jina
+Weka jina
@@ -1 +1 @@
-Edit offerings
+Edit offerings
@@ -1 +1 @@
-Enter family name:
+Enter family name:
@@ -1 +1 @@
-Enter your location:
+Enter your location:
@@ -1 +1 @@
-Weka majina yako ya kwanza:
+Weka majina yako ya kwanza:
@@ -1 +1 @@
-Female
+Female
@@ -1 +1 @@
-Guard my PIN
+Guard my PIN
@@ -1 +1 @@
-Linda PIN yangu
+Linda PIN yangu
@@ -1,2 +1,2 @@
 The year of birth you entered is invalid.
-Please try again.
+Please try again.
@@ -1 +1 @@
-Incorrect  pin
+Incorrect pin
@@ -0,0 +1 @@
+Your language change request was successful.
@@ -0,0 +1,5 @@
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9
@@ -0,0 +1 @@
+Ombi lako la kubadilisha lugha limefanikiwa.
@@ -9,6 +9,7 @@ MOUT back 0
 HALT
 INCMP _ 0
 INCMP edit_profile 1
+INCMP change_language 2
 INCMP balances 3
 INCMP pin_management 5
 INCMP address 6
@@ -1 +1 @@
-Anwani yangu
+Anwani yangu
@@ -1 +1 @@
-Salio lako ni: 0.00 SRF
+Salio lako ni: 0.00 SRF
@@ -1 +1 @@
-no
+no
@@ -1 +1 @@
-la
+la
@@ -1 +1 @@
-Tafadhali weka PIN yako
+Tafadhali weka PIN yako
@@ -1 +1 @@
-PIN Management
+PIN Management
@@ -1 +1 @@
-Profile
+Profile
@@ -1 +1 @@
-Wasifu  wangu
+Wasifu wangu
@@ -0,0 +1 @@
+Quit
@@ -0,0 +1 @@
+Ondoka
@@ -1 +1 @@
-Badili PIN ya mwenzio
+Badili PIN ya mwenzio
@@ -1,6 +1,6 @@
 MOUT english 0
 MOUT kiswahili 1
 HALT
-INCMP terms 0
-INCMP terms 1
+INCMP set_default 0
+INCMP set_swa 1
 INCMP . *
@@ -1 +1 @@
-Enter recipient's phone number:
+Enter recipient's phone number:
@@ -0,0 +1,3 @@
+LOAD set_language 6
+CATCH terms flag_account_created 0
+MOVE language_changed
@@ -0,0 +1,3 @@
+LOAD set_language 6
+CATCH terms flag_account_created 0
+MOVE language_changed
@@ -1,5 +1,3 @@
-LOAD select_language 0
-RELOAD select_language
 MOUT yes 0
 MOUT no 1
 HALT
@@ -1,2 +1,2 @@
 {{.get_recipient}} will receive {{.validate_amount}} from {{.get_sender}}
-Please enter your PIN to confirm:
+Please enter your PIN to confirm:
@@ -1 +1 @@
-Unspecified
+Unspecified
@@ -1 +1 @@
-Profile updated successfully
+Profile updated successfully
@@ -1 +1 @@
-Akaunti  imeupdatiwa
+Akaunti imeupdatiwa
@@ -1,2 +1,2 @@
-My profile: 
-{{.get_profile_info}} 
+My profile:
+{{.get_profile_info}}
@@ -1 +1,2 @@
-Wasifu wangu
+Wasifu wangu:
+{{.get_profile_info}}
@@ -1 +1 @@
-Angalia Wasifu
+Angalia Wasifu
@@ -1 +1 @@
-yes
+yes
@@ -1 +1 @@
-ndio
+ndio
Author	SHA1	Message	Date
alfred-mk	75ab9c66a3	run TestSetLanguage with execPath instead of input	2024-09-17 18:54:07 +03:00
alfred-mk	2e7c07e6f4	added missing functions to the other getHandlers	2024-09-17 15:31:44 +03:00
alfred-mk	01f7571185	use dedicated nodes to set the language	2024-09-17 15:29:21 +03:00
alfred-mk	065c8e5c1d	use a single set_language function for setting and changing language	2024-09-17 15:26:50 +03:00
alfred-mk	dc14480519	remove extra space	2024-09-16 17:29:27 +03:00
alfred-mk	aaf4923f64	ensure a PIN is set before changing the language	2024-09-16 17:29:27 +03:00
alfred-mk	e9c645bd87	added the profile info on the swa menu template	2024-09-16 17:29:27 +03:00
alfred-mk	1be6da9139	remove new lines on templates and menus to clean up the empty spaces on the menu	2024-09-16 17:29:27 +03:00
alfred-mk	fa2930d93a	added quit menu to handle eng and swa	2024-09-16 17:29:27 +03:00
alfred-mk	a409e292ab	add the change_language functionality to the account menu	2024-09-16 17:29:27 +03:00
alfred-mk	00c86a2850	change language	2024-09-16 17:29:27 +03:00
alfred-mk	4daac7e90b	added change_language node and templates	2024-09-16 17:29:27 +03:00
alfred-mk	06e23565df	added the SetNewLanguage function	2024-09-16 17:29:27 +03:00
				`@@ -0,0 +1 @@`
				`Your language change request was successful.`
				`@@ -0,0 +1 @@`
				`Ombi lako la kubadilisha lugha limefanikiwa.`