konstantinmds/ussd
1
0
Fork 0
forked from urdt/ussd
Code Pull Requests Activity

Add dynamic send_amount and session_id

Browse Source
This commit is contained in:
Alfred Kamanda 2024-10-24 20:21:28 +03:00
parent a92c640cb7
commit d113ea82fd
Signed by untrusted user: Alfred-mk
GPG Key ID: 7EA3D01708908703
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
menutraversal_test/menu_traversal_test.go
View File

@ -56,11 +56,22 @@ func extractBalance(response []byte) string {
// Extracts the Maximum amount value from the engine response. // Extracts the Maximum amount value from the engine response.
func extractMaxAmount(response []byte) string { func extractMaxAmount(response []byte) string {
// Regex to match "Maximum amount: <amount> <symbol>" followed by a newline // Regex to match "Maximum amount: <amount>" followed by a newline
re := regexp.MustCompile(`(?m)^Maximum amount:\s+(\d+(\.\d+)?)\s+([A-Z]+)`) re := regexp.MustCompile(`(?m)^Maximum amount:\s+(\d+(\.\d+)?)`)
match := re.FindSubmatch(response) match := re.FindSubmatch(response)
if match != nil { if match != nil {
return string(match[1]) + " " + string(match[3]) // "<amount> <symbol>" return string(match[1]) // "<amount>"
}
return ""
}
// Extracts the send amount value from the engine response.
func extractSendAmount(response []byte) string {
// Regex to match the pattern "will receive X.XX SYM from"
re := regexp.MustCompile(`will receive (\d+\.\d{2}\s+[A-Z]+) from`)
match := re.FindSubmatch(response)
if match != nil {
return string(match[1]) // Returns "X.XX SYM"
} }
return "" return ""
} }
@ -304,12 +315,13 @@ func TestMainMenuSend(t *testing.T) {
b := w.Bytes() b := w.Bytes()
balance := extractBalance(b) balance := extractBalance(b)
max_amount := extractMaxAmount(b) max_amount := extractMaxAmount(b)
publicKey := extractPublicKey(b) send_amount := extractSendAmount(b)
expectedContent := []byte(step.ExpectedContent) expectedContent := []byte(step.ExpectedContent)
expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1) expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
expectedContent = bytes.Replace(expectedContent, []byte("{max_amount}"), []byte(max_amount), -1) expectedContent = bytes.Replace(expectedContent, []byte("{max_amount}"), []byte(max_amount), -1)
expectedContent = bytes.Replace(expectedContent, []byte("{public_key}"), []byte(publicKey), -1) expectedContent = bytes.Replace(expectedContent, []byte("{send_amount}"), []byte(send_amount), -1)
expectedContent = bytes.Replace(expectedContent, []byte("{session_id}"), []byte(sessionID), -1)
step.ExpectedContent = string(expectedContent) step.ExpectedContent = string(expectedContent)
match, err := step.MatchesExpectedContent(b) match, err := step.MatchesExpectedContent(b)

8
menutraversal_test/test_setup.json
View File

@ -84,8 +84,8 @@
"expectedContent": "{max_amount}\nEnter amount:\n0:Back" "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
}, },
{ {
"input": "0.001", "input": "1.00",
"expectedContent": "065656 will receive 0.001 from {public_key}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit" "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
}, },
{ {
"input": "1222", "input": "1222",
@ -93,11 +93,11 @@
}, },
{ {
"input": "1", "input": "1",
"expectedContent": "065656 will receive 0.001 from {public_key}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit" "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Your request has been sent. 065656 will receive 0.001 from {public_key}." "expectedContent": "Your request has been sent. 065656 will receive {send_amount} from {session_id}."
} }
] ]
}, },