From ee2847dcd916c56135bf5c1c996a6f77102d402f Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Mon, 13 Mar 2023 14:33:51 +0800
Subject: [PATCH] test: make schema test happy

---
 apps/emqx/src/emqx_schema.erl         | 2 +-
 apps/emqx/test/emqx_channel_SUITE.erl | 4 ++--
 apps/emqx/test/emqx_schema_tests.erl  | 5 +++--
 apps/emqx/test/emqx_session_SUITE.erl | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 914ad40a1..1894d7fb5 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -2664,7 +2664,7 @@ servers_validator(Opts, Required) ->
         case str(Str0) of
             "" ->
                 %% Empty string is not allowed even if the field is not required
-                %% remove field from config if it's empty
+                %% we should remove field from config if it's empty
                 throw("cannot_be_empty");
             "undefined" when Required ->
                 %% when the filed is not set in config file
diff --git a/apps/emqx/test/emqx_channel_SUITE.erl b/apps/emqx/test/emqx_channel_SUITE.erl
index c3f27269b..6dd389350 100644
--- a/apps/emqx/test/emqx_channel_SUITE.erl
+++ b/apps/emqx/test/emqx_channel_SUITE.erl
@@ -1243,8 +1243,8 @@ session(InitFields) when is_map(InitFields) ->
     ),
     Session = emqx_session:init(Conf),
     maps:fold(
-        fun(Field, Value, Session) ->
-            emqx_session:set_field(Field, Value, Session)
+        fun(Field, Value, SessionAcc) ->
+            emqx_session:set_field(Field, Value, SessionAcc)
         end,
         Session,
         InitFields
diff --git a/apps/emqx/test/emqx_schema_tests.erl b/apps/emqx/test/emqx_schema_tests.erl
index e1ac1874f..a0d264662 100644
--- a/apps/emqx/test/emqx_schema_tests.erl
+++ b/apps/emqx/test/emqx_schema_tests.erl
@@ -455,10 +455,11 @@ servers_validator_test() ->
     NotRequired = emqx_schema:servers_validator(#{}, false),
     ?assertThrow("cannot_be_empty", Required("")),
     ?assertThrow("cannot_be_empty", Required(<<>>)),
+    ?assertThrow("cannot_be_empty", NotRequired("")),
+    ?assertThrow("cannot_be_empty", NotRequired(<<>>)),
     ?assertThrow("cannot_be_empty", Required(undefined)),
-    ?assertEqual(ok, NotRequired("")),
-    ?assertEqual(ok, NotRequired(<<>>)),
     ?assertEqual(ok, NotRequired(undefined)),
+    ?assertEqual(ok, NotRequired("undefined")),
     ok.
 
 converter_invalid_input_test() ->
diff --git a/apps/emqx/test/emqx_session_SUITE.erl b/apps/emqx/test/emqx_session_SUITE.erl
index 95d94707c..21d8f0a2a 100644
--- a/apps/emqx/test/emqx_session_SUITE.erl
+++ b/apps/emqx/test/emqx_session_SUITE.erl
@@ -471,8 +471,8 @@ session(InitFields) when is_map(InitFields) ->
     ),
     Session = emqx_session:init(Conf),
     maps:fold(
-        fun(Field, Value, Session) ->
-            emqx_session:set_field(Field, Value, Session)
+        fun(Field, Value, SessionAcc) ->
+            emqx_session:set_field(Field, Value, SessionAcc)
         end,
         Session,
         InitFields