From 2f63b7a487cb83e841c5c66c0ddb890bf6999d3a Mon Sep 17 00:00:00 2001
From: Gilbert Wong <gilbertwong96@icloud.com>
Date: Fri, 31 Aug 2018 20:21:28 +0800
Subject: [PATCH] update broker suite for latest code

---
 test/emqx_broker_SUITE.erl  | 24 ++++++++++++------------
 test/emqx_session_SUITE.erl |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/emqx_broker_SUITE.erl b/test/emqx_broker_SUITE.erl
index 93f795d1d..e23330f7b 100644
--- a/test/emqx_broker_SUITE.erl
+++ b/test/emqx_broker_SUITE.erl
@@ -62,12 +62,12 @@ end_per_suite(_Config) ->
 %%--------------------------------------------------------------------
 
 subscribe_unsubscribe(_) ->
-    ok = emqx:subscribe(<<"topic">>, "clientId"),
-    ok = emqx:subscribe(<<"topic/1">>, "clientId", #{ qos => 1 }),
-    ok = emqx:subscribe(<<"topic/2">>, "clientId", #{ qos => 2 }),
-    ok = emqx:unsubscribe(<<"topic">>, "clientId"),
-    ok = emqx:unsubscribe(<<"topic/1">>, "clientId"),
-    ok = emqx:unsubscribe(<<"topic/2">>, "clientId").
+    ok = emqx:subscribe(<<"topic">>, <<"clientId">>),
+    ok = emqx:subscribe(<<"topic/1">>, <<"clientId">>, #{ qos => 1 }),
+    ok = emqx:subscribe(<<"topic/2">>, <<"clientId">>, #{ qos => 2 }),
+    ok = emqx:unsubscribe(<<"topic">>, <<"clientId">>),
+    ok = emqx:unsubscribe(<<"topic/1">>, <<"clientId">>),
+    ok = emqx:unsubscribe(<<"topic/2">>, <<"clientId">>).
 
 publish(_) ->
     Msg = emqx_message:make(ct, <<"test/pubsub">>, <<"hello">>),
@@ -79,9 +79,9 @@ publish(_) ->
 pubsub(_) ->
     Self = self(),
     Subscriber = {Self, <<"clientId">>},
-    ok = emqx:subscribe(<<"a/b/c">>, Subscriber, #{ qos => 1 }),
+    ok = emqx:subscribe(<<"a/b/c">>, <<"clientId">>, #{ qos => 1 }),
     #{ qos := 1} = ets:lookup_element(emqx_suboption, {<<"a/b/c">>, Subscriber}, 2),
-    ok = emqx:subscribe(<<"a/b/c">>, Subscriber, #{ qos => 2 }),
+    ok = emqx:subscribe(<<"a/b/c">>, <<"clientId">>, #{ qos => 2 }),
     #{ qos := 2} = ets:lookup_element(emqx_suboption, {<<"a/b/c">>, Subscriber}, 2),
     %% ct:log("Emq Sub: ~p.~n", [ets:lookup(emqx_suboption, {<<"a/b/c">>, Subscriber})]),
     timer:sleep(10),
@@ -100,8 +100,8 @@ pubsub(_) ->
 
 t_local_subscribe(_) ->
     ok = emqx:subscribe(<<"$local/topic0">>),
-    ok = emqx:subscribe(<<"$local/topic1">>, "clientId"),
-    ok = emqx:subscribe(<<"$local/topic2">>, "clientId", #{ qos => 2 }),
+    ok = emqx:subscribe(<<"$local/topic1">>, <<"clientId">>),
+    ok = emqx:subscribe(<<"$local/topic2">>, <<"clientId">>, #{ qos => 2 }),
     timer:sleep(10),
     ?assertEqual([{self(), undefined}], emqx:subscribers("$local/topic0")),
     ?assertEqual([{self(), <<"clientId">>}], emqx:subscribers("$local/topic1")),
@@ -110,8 +110,8 @@ t_local_subscribe(_) ->
                  emqx:subscriptions({self(), <<"clientId">>})),
     ?assertEqual(ok, emqx:unsubscribe("$local/topic0")),
     ?assertEqual(ok, emqx:unsubscribe("$local/topic0")),
-    ?assertEqual(ok, emqx:unsubscribe("$local/topic1", "clientId")),
-    ?assertEqual(ok, emqx:unsubscribe("$local/topic2", "clientId")),
+    ?assertEqual(ok, emqx:unsubscribe("$local/topic1", <<"clientId">>)),
+    ?assertEqual(ok, emqx:unsubscribe("$local/topic2", <<"clientId">>)),
     ?assertEqual([], emqx:subscribers("topic1")),
     ?assertEqual([], emqx:subscriptions({self(), <<"clientId">>})).
 
diff --git a/test/emqx_session_SUITE.erl b/test/emqx_session_SUITE.erl
index 526f8b729..29a6edc61 100644
--- a/test/emqx_session_SUITE.erl
+++ b/test/emqx_session_SUITE.erl
@@ -1,3 +1,4 @@
+
 %% Copyright (c) 2018 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");