[Asterisk-code-review] LISTFILTER: Remove outdated ERROR message. (asterisk[master])

[Richard Mudgett]

Richard Mudgett has uploaded a new change for review. ( https://gerrit.asterisk.org/4758 )

Change subject: LISTFILTER: Remove outdated ERROR message.
......................................................................

LISTFILTER: Remove outdated ERROR message.

Feeding LISTFILTER an empty variable results in an invalid ERROR message.
Earlier changes made the message useless because we can no longer tell if
the variable is empty or does not exist.  It is valid to try to remove a
value from an empty list just as it is valid to try to remove a value that
is not in a non-empty list.

* Removed the outdated ERROR message.

* Added more test cases to the LISTFILTER unit test.

Change-Id: Ided9040e6359c44a335ef54e02ef5950a1863134
---
M funcs/func_strings.c
M tests/test_substitution.c
2 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/58/4758/1

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 885de61..2d03c15 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -617,7 +617,6 @@
 	}
 	ast_str_substitute_variables(&orig_list, 0, chan, varsubst);
 	if (!ast_str_strlen(orig_list)) {
-		ast_log(LOG_ERROR, "List variable '%s' not found\n", args.listname);
 		if (chan) {
 			ast_channel_unlock(chan);
 		}
diff --git a/tests/test_substitution.c b/tests/test_substitution.c
index ca84d00..3a1dc1f 100644
--- a/tests/test_substitution.c
+++ b/tests/test_substitution.c
@@ -285,7 +285,16 @@
 	TEST(test_expected_result(test, c, "A${${baz}o:-2:1}A", "A2A"));
 	TEST(test_expected_result(test, c, "A${${baz}o:-2:-1}A", "A2A"));
 	pbx_builtin_setvar_helper(c, "list1", "ab&cd&ef");
+	TEST(test_expected_result(test, c, "${LISTFILTER(list1,&,ab)}", "cd&ef"));
 	TEST(test_expected_result(test, c, "${LISTFILTER(list1,&,cd)}", "ab&ef"));
+	TEST(test_expected_result(test, c, "${LISTFILTER(list1,&,ef)}", "ab&cd"));
+	TEST(test_expected_result(test, c, "${LISTFILTER(list1,&,gh)}", "ab&cd&ef"));
+	TEST(test_expected_result(test, c, "${LISTFILTER(list1,&,c)}", "ab&cd&ef"));
+	TEST(test_expected_result(test, c, "${LISTFILTER(list1,&,d)}", "ab&cd&ef"));
+	pbx_builtin_setvar_helper(c, "list2", "ab");
+	TEST(test_expected_result(test, c, "${LISTFILTER(list2,&,ab)}", ""));
+	pbx_builtin_setvar_helper(c, "list_empty", "");
+	TEST(test_expected_result(test, c, "${LISTFILTER(list_empty,&,ab)}", ""));
 	TEST(test_expected_result(test, c, "${SHELL(printf '%d' 123)},${SHELL(printf '%d' 456)}", "123,456"));
 	TEST(test_expected_result(test, c, "${foo},${CDR(answer)},${SHELL(printf '%d' 456)}", "123,,456"));
 	TEST(test_expected_result(test, c, "${foo},${CDR(answer,u)},${SHELL(printf '%d' 456)}", "123,0.000000,456"));

-- 
To view, visit https://gerrit.asterisk.org/4758
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ided9040e6359c44a335ef54e02ef5950a1863134
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>