From 85c33ce81fefaea0645220990a359b19dd109283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=AD=90=E5=8D=9A?= <349832309@qq.com>
Date: Fri, 9 Aug 2019 14:24:05 +0800
Subject: [PATCH] Fix test cases

---
 test/emqx_channel_SUITE.erl   |  4 ++--
 test/emqx_client_SUITE.erl    |  4 ++--
 test/emqx_mqtt_caps_SUITE.erl | 23 -----------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/test/emqx_channel_SUITE.erl b/test/emqx_channel_SUITE.erl
index 489a36a35..580b7a0fa 100644
--- a/test/emqx_channel_SUITE.erl
+++ b/test/emqx_channel_SUITE.erl
@@ -32,8 +32,8 @@ end_per_suite(_Config) ->
 
 t_basic(_) ->
     Topic = <<"TopicA">>,
-    {ok, C} = emqtt:start_link([{port, 1883}]),
-    {ok, _} = emqtt:ws_connect(C),
+    {ok, C} = emqtt:start_link([{port, 1883}, {client_id, <<"hello">>}]),
+    {ok, _} = emqtt:connect(C),
     {ok, _, [1]} = emqtt:subscribe(C, Topic, qos1),
     {ok, _, [2]} = emqtt:subscribe(C, Topic, qos2),
     {ok, _} = emqtt:publish(C, Topic, <<"qos 2">>, 2),
diff --git a/test/emqx_client_SUITE.erl b/test/emqx_client_SUITE.erl
index 96724877b..3ed8a5dff 100644
--- a/test/emqx_client_SUITE.erl
+++ b/test/emqx_client_SUITE.erl
@@ -56,11 +56,11 @@ groups() ->
       [t_basic_v4,
        %% t_will_message,
        %% t_offline_message_queueing,
-       t_overlapping_subscriptions
+       t_overlapping_subscriptions,
        %% t_keepalive,
        %% t_redelivery_on_reconnect,
        %% subscribe_failure_test,
-       %% t_dollar_topics_test
+       t_dollar_topics
       ]},
      {mqttv5, [non_parallel_tests],
       [t_basic_with_props_v5
diff --git a/test/emqx_mqtt_caps_SUITE.erl b/test/emqx_mqtt_caps_SUITE.erl
index 14b1e955f..c9cc0b073 100644
--- a/test/emqx_mqtt_caps_SUITE.erl
+++ b/test/emqx_mqtt_caps_SUITE.erl
@@ -65,26 +65,3 @@ t_check_sub(_) ->
     ?assertEqual({error, ?RC_SHARED_SUBSCRIPTIONS_NOT_SUPPORTED},
                  emqx_mqtt_caps:check_sub(zone, <<"topic">>, SubOpts#{share => true})),
     true = emqx_zone:unset_env(zone, '$mqtt_sub_caps').
-
-t_get_set_caps(_) ->
-    Caps = emqx_mqtt_caps:default(),
-    ?assertEqual(Caps, emqx_mqtt_caps:get_caps(zone)),
-    PubCaps = #{max_qos_allowed => ?QOS_2,
-                retain_available => true,
-                max_topic_alias => 0
-               },
-    ?assertEqual(PubCaps, emqx_mqtt_caps:get_caps(zone, publish)),
-    NewPubCaps = PubCaps#{max_qos_allowed => ?QOS_1,
-                          retain_available => true
-                         },
-    emqx_zone:set_env(zone, '$mqtt_pub_caps', NewPubCaps),
-    ?assertEqual(NewPubCaps, emqx_mqtt_caps:get_caps(zone, publish)),
-
-    SubCaps = #{max_topic_levels => 0,
-                max_qos_allowed => ?QOS_2,
-                shared_subscription => true,
-                wildcard_subscription => true
-               },
-    ?assertEqual(SubCaps, emqx_mqtt_caps:get_caps(zone, subscribe)),
-    true = emqx_zone:unset_env(zone, '$mqtt_pub_caps').
-