From 5c014f4c299d2c34fd5b5dbd66565f78e93319a0 Mon Sep 17 00:00:00 2001
From: zmstone <zmstone@gmail.com>
Date: Wed, 17 Apr 2024 15:04:03 +0200
Subject: [PATCH] test: fix test cases

---
 apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl            | 4 ++--
 apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl | 2 +-
 apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl    | 4 ++--
 apps/emqx_s3/test/emqx_s3_schema_SUITE.erl                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl
index b0b0c3a03..cf96ce6cb 100644
--- a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl
@@ -756,8 +756,8 @@ producer_strategy_key_validator(
     producer_strategy_key_validator(emqx_utils_maps:binary_key_map(Conf));
 producer_strategy_key_validator(#{
     <<"partition_strategy">> := key_dispatch,
-    <<"message">> := #{<<"key">> := ""}
-}) ->
+    <<"message">> := #{<<"key">> := Key}
+}) when Key =:= "" orelse Key =:= <<>> ->
     {error, "Message key cannot be empty when `key_dispatch` strategy is used"};
 producer_strategy_key_validator(_) ->
     ok.
diff --git a/apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl b/apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl
index 917c24ffa..0f2448480 100644
--- a/apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl
@@ -359,7 +359,7 @@ t_bad_ref(_Config) ->
     Refs = [{?MODULE, bad_ref}],
     Fields = fields(bad_ref),
     ?assertThrow(
-        {error, #{msg := <<"Object only supports not empty proplists">>, args := Fields}},
+        {error, #{msg := <<"Object only supports non-empty fields list">>, args := Fields}},
         validate(Path, Spec, Refs)
     ),
     ok.
diff --git a/apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl b/apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl
index 6fa3dbd3d..e9397f643 100644
--- a/apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl
@@ -189,7 +189,7 @@ t_nest_object(_Config) ->
 t_empty(_Config) ->
     ?assertThrow(
         {error, #{
-            msg := <<"Object only supports not empty proplists">>,
+            msg := <<"Object only supports non-empty fields list">>,
             args := [],
             module := ?MODULE
         }},
@@ -273,7 +273,7 @@ t_bad_ref(_Config) ->
     ?assertThrow(
         {error, #{
             module := ?MODULE,
-            msg := <<"Object only supports not empty proplists">>
+            msg := <<"Object only supports non-empty fields list">>
         }},
         validate(Path, Object, ExpectRefs)
     ),
diff --git a/apps/emqx_s3/test/emqx_s3_schema_SUITE.erl b/apps/emqx_s3/test/emqx_s3_schema_SUITE.erl
index ec02aeac4..170f8a065 100644
--- a/apps/emqx_s3/test/emqx_s3_schema_SUITE.erl
+++ b/apps/emqx_s3/test/emqx_s3_schema_SUITE.erl
@@ -20,7 +20,7 @@ all() ->
 t_minimal_config(_Config) ->
     ?assertMatch(
         #{
-            bucket := "bucket",
+            bucket := <<"bucket">>,
             host := "s3.us-east-1.endpoint.com",
             port := 443,
             min_part_size := 5242880,
@@ -45,7 +45,7 @@ t_full_config(_Config) ->
         #{
             access_key_id := "access_key_id",
             acl := public_read,
-            bucket := "bucket",
+            bucket := <<"bucket">>,
             host := "s3.us-east-1.endpoint.com",
             min_part_size := 10485760,
             port := 443,