Renamed assert_file_matches() to assert_file_matches_regex()

Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>

Author: larsewi

tests/shell/011_update.sh

@@ -11,31 +11,31 @@ cfbs --non-interactive update
 # Also, it should not break on new commits(!)
 # TODO: Use jq, a python script, cfbs validate or something similar
 
-assert_file_matches cfbs.json '"name".*"Example'
-assert_file_matches cfbs.json '"type".*"policy-set"'
-assert_file_matches cfbs.json '"description".*"Example description"'
+assert_file_matches_regex cfbs.json '"name".*"Example'
+assert_file_matches_regex cfbs.json '"type".*"policy-set"'
+assert_file_matches_regex cfbs.json '"description".*"Example description"'
 
-assert_file_matches cfbs.json '"name".*"promise-type-ansible"'
-assert_file_matches cfbs.json '"version":.*[0-9]+\.[0-9]+'
+assert_file_matches_regex cfbs.json '"name".*"promise-type-ansible"'
+assert_file_matches_regex cfbs.json '"version":.*[0-9]+\.[0-9]+'
 assert_file_contains cfbs.json '"commit"'
-assert_file_matches cfbs.json '"added_by".*"cfbs add"'
+assert_file_matches_regex cfbs.json '"added_by".*"cfbs add"'
 assert_file_contains cfbs.json '"steps"'
 assert_file_contains cfbs.json 'copy ansible_promise.py modules/promises/'
 assert_file_contains cfbs.json 'append enable.cf services/init.cf'
-assert_file_matches cfbs.json '"tags".*"supported"'
-assert_file_matches cfbs.json '"by".*"https://github.com/tranchitella"'
-assert_file_matches cfbs.json '"repo".*"https://github.com/cfengine/modules"'
-assert_file_matches cfbs.json '"subdirectory".*"promise-types/ansible"'
-assert_file_matches cfbs.json '"dependencies".*"library-for-promise-types-in-python"'
-assert_file_matches cfbs.json '"description".*"Promise type to run ansible playbooks'
-
-assert_file_matches cfbs.json '"name".*"library-for-promise-types-in-python"'
-assert_file_matches cfbs.json '"description".*"Library enabling promise types implemented in python'
-assert_file_matches cfbs.json '"tags".*"library"'
-assert_file_matches cfbs.json '"repo".*"https://github.com/cfengine/modules"'
-assert_file_matches cfbs.json '"by".*"https://github.com/cfengine"'
-assert_file_matches cfbs.json '"subdirectory".*"libraries/python"'
-assert_file_matches cfbs.json '"added_by".*"promise-type-ansible"'
+assert_file_matches_regex cfbs.json '"tags".*"supported"'
+assert_file_matches_regex cfbs.json '"by".*"https://github.com/tranchitella"'
+assert_file_matches_regex cfbs.json '"repo".*"https://github.com/cfengine/modules"'
+assert_file_matches_regex cfbs.json '"subdirectory".*"promise-types/ansible"'
+assert_file_matches_regex cfbs.json '"dependencies".*"library-for-promise-types-in-python"'
+assert_file_matches_regex cfbs.json '"description".*"Promise type to run ansible playbooks'
+
+assert_file_matches_regex cfbs.json '"name".*"library-for-promise-types-in-python"'
+assert_file_matches_regex cfbs.json '"description".*"Library enabling promise types implemented in python'
+assert_file_matches_regex cfbs.json '"tags".*"library"'
+assert_file_matches_regex cfbs.json '"repo".*"https://github.com/cfengine/modules"'
+assert_file_matches_regex cfbs.json '"by".*"https://github.com/cfengine"'
+assert_file_matches_regex cfbs.json '"subdirectory".*"libraries/python"'
+assert_file_matches_regex cfbs.json '"added_by".*"promise-type-ansible"'
 assert_file_contains cfbs.json 'copy cfengine_module_library.py modules/promises/cfengine_module_library.py'
 
 cfbs status

tests/shell/039_add_added_by_field_update_1.sh

@@ -4,13 +4,13 @@ test_init
 cfbs --non-interactive init
 
 # Ensure adding a module during initialization is treated as adding manually
-assert_file_matches cfbs.json '"added_by".*"cfbs init"'
+assert_file_matches_regex cfbs.json '"added_by".*"cfbs init"'
 # TODO: the case of custom non-masterfiles module(s) should also be tested
 
 # Manually adding a module then manually adding its dependency should update the latter's `"added_by"` field in `cfbs.json`
 
 cfbs --non-interactive add package-method-winget
-assert_file_matches cfbs.json '"added_by".*"package-method-winget"'
+assert_file_matches_regex cfbs.json '"added_by".*"package-method-winget"'
 assert_count 1 cfbs.json '"cfbs add"'
 
 cfbs --non-interactive add powershell-execution-policy

tests/shell/040_add_added_by_field_update_2.sh

@@ -6,7 +6,7 @@ cfbs --non-interactive init
 # Manually adding a dependency of a module then manually adding that module should not update the latter's `"added_by"` field in `cfbs.json`
 
 cfbs --non-interactive add powershell-execution-policy
-assert_file_matches cfbs.json '"added_by".*"cfbs add"'
+assert_file_matches_regex cfbs.json '"added_by".*"cfbs add"'
 
 cfbs --non-interactive add package-method-winget
 assert_file_not_contains cfbs.json '"added_by": "package-method-winget"'

tests/shell/testlib.sh

@@ -93,7 +93,7 @@ assert_file_not_contains() {
     ! grep -qF "$2" "$1" || _test_fail "Expected file '$1' to NOT contain: $2"
 }
 
-assert_file_matches() {
+assert_file_matches_regex() {
     grep -qE "$2" "$1" || _test_fail "Expected file '$1' to match regex: $2"
 }