From 2f777ebe4cd8eba41f9392bdd7eb17afb2f8879e Mon Sep 17 00:00:00 2001
From: huangdan <wang_yi20081014@163.com>
Date: Sun, 21 Aug 2016 13:14:00 +0800
Subject: [PATCH] test ct

---
 test/emqttd_SUITE.erl          | 24 ++----------------------
 test/emqttd_mock_client.erl    |  2 +-
 test/emqttd_protocol_SUITE.erl |  4 +---
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/test/emqttd_SUITE.erl b/test/emqttd_SUITE.erl
index 93b1b380b..aa2a4ea34 100644
--- a/test/emqttd_SUITE.erl
+++ b/test/emqttd_SUITE.erl
@@ -58,9 +58,7 @@ groups() ->
       [add_delete_hook,
        run_hooks]},
      {retainer, [sequence],
-      [retain_messages,
-       dispatch_retained_messages,
-       expire_retained_messages]},
+      [dispatch_retained_messages]},
      {backend, [sequence],
       []},
      {cli, [sequence],
@@ -302,14 +300,6 @@ hook_fun5(arg1, arg2, Acc, init)  -> {stop, [r3 | Acc]}.
 %% Retainer Test
 %%--------------------------------------------------------------------
 
-retain_messages(_) ->
-    Msg = emqttd_message:make(<<"clientId">>, <<"topic">>, <<"payload">>),
-    emqttd_backend:retain_message(Msg),
-    [Msg] = emqttd_backend:read_messages(<<"topic">>),
-    [Msg] = emqttd_backend:match_messages(<<"topic/#">>),
-    emqttd_backend:delete_message(<<"topic">>),
-    0 = emqttd_backend:retained_count().
-
 dispatch_retained_messages(_) ->
     Msg = #mqtt_message{retain = true, topic = <<"a/b/c">>,
                         payload = <<"payload">>},
@@ -317,19 +307,9 @@ dispatch_retained_messages(_) ->
     emqttd_retainer:dispatch(<<"a/b/+">>, self()),
     ?assert(receive {dispatch, <<"a/b/+">>, Msg} -> true after 10 -> false end),
     emqttd_retainer:retain(#mqtt_message{retain = true, topic = <<"a/b/c">>, payload = <<>>}),
-    [] = emqttd_backend:read_messages(<<"a/b/c">>).
-
-expire_retained_messages(_) ->
-    Msg1 = emqttd_message:make(<<"clientId1">>, qos1, <<"topic/1">>, <<"payload1">>),
-    Msg2 = emqttd_message:make(<<"clientId2">>, qos2, <<"topic/2">>, <<"payload2">>),
-    emqttd_backend:retain_message(Msg1),
-    emqttd_backend:retain_message(Msg2),
-    timer:sleep(2000),
-    emqttd_backend:expire_messages(emqttd_time:now_to_secs()),
-    0 = emqttd_backend:retained_count().
+    [] = emqttd_retainer:read_messages(<<"a/b/c">>).
 
 
-%%--------------------------------------------------------------------
 %% CLI Group
 %%--------------------------------------------------------------------
 
diff --git a/test/emqttd_mock_client.erl b/test/emqttd_mock_client.erl
index 7a9f90010..f4d26fa30 100644
--- a/test/emqttd_mock_client.erl
+++ b/test/emqttd_mock_client.erl
@@ -39,7 +39,7 @@ init([ClientId]) ->
     {ok, #state{clientid = ClientId}}.
 
 handle_call(start_session, _From, State = #state{clientid = ClientId}) ->
-    {ok, SessPid, _} = emqttd_sm:start_session(true, ClientId),
+    {ok, SessPid, _} = emqttd_sm:start_session(true, {ClientId, undefined}),
     {reply, {ok, SessPid}, State#state{session = SessPid}};
 
 handle_call(stop, _From, State) ->
diff --git a/test/emqttd_protocol_SUITE.erl b/test/emqttd_protocol_SUITE.erl
index 2d8490a57..96b969278 100644
--- a/test/emqttd_protocol_SUITE.erl
+++ b/test/emqttd_protocol_SUITE.erl
@@ -337,7 +337,6 @@ packet_format(_) ->
 message_make(_) ->
     Msg = emqttd_message:make(<<"clientid">>, <<"topic">>, <<"payload">>),
     0 = Msg#mqtt_message.qos,
-    undefined = Msg#mqtt_message.id,
     Msg1 = emqttd_message:make(<<"clientid">>, qos2, <<"topic">>, <<"payload">>),
     true = is_binary(Msg1#mqtt_message.id),
     2 = Msg1#mqtt_message.qos.
@@ -356,8 +355,7 @@ message_from_packet(_) ->
 
     Msg2 = emqttd_message:from_packet(<<"username">>, <<"clientid">>,
                                       ?PUBLISH_PACKET(1, <<"topic">>, 20, <<"payload">>)),
-    <<"clientid">> = Msg2#mqtt_message.from,
-    <<"username">> = Msg2#mqtt_message.sender,
+    {<<"clientid">>, <<"username">>} = Msg2#mqtt_message.from,
     io:format("~s", [emqttd_message:format(Msg2)]).
 
 message_flag(_) ->