yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serilize

This commit is contained in:
Feng 2015-12-10 14:09:05 +08:00
parent e1e09599ef
commit 26893c764c
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqttd_protocol.erl
View File

@ -260,7 +260,7 @@ send(Packet, State = #proto_state{sendfun = SendFun})
when is_record(Packet, mqtt_packet) -> when is_record(Packet, mqtt_packet) ->
trace(send, Packet, State), trace(send, Packet, State),
emqttd_metrics:sent(Packet), emqttd_metrics:sent(Packet),
Data = emqttd_serialiser:serialize(Packet), Data = emqttd_serializer:serialize(Packet),
?LOG(debug, "SEND ~p", [Data], State), ?LOG(debug, "SEND ~p", [Data], State),
emqttd_metrics:inc('bytes/sent', size(Data)), emqttd_metrics:inc('bytes/sent', size(Data)),
SendFun(Data), SendFun(Data),

56
test/emqttd_serialiser_tests.erl → test/emqttd_serializer_tests.erl
View File

@ -20,11 +20,11 @@
%%% SOFTWARE. %%% SOFTWARE.
%%%----------------------------------------------------------------------------- %%%-----------------------------------------------------------------------------
%%% @doc %%% @doc
%%% emqttd_serialiser tests. %%% emqttd_serializer tests.
%%% %%%
%%% @end %%% @end
%%%----------------------------------------------------------------------------- %%%-----------------------------------------------------------------------------
-module(emqttd_serialiser_tests). -module(emqttd_serializer_tests).
-ifdef(TEST). -ifdef(TEST).
@ -32,47 +32,47 @@
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-import(emqttd_serialiser, [serialise/1]). -import(emqttd_serializer, [serialize/1]).
serialise_connect_test() -> serilize_connect_test() ->
serialise(?CONNECT_PACKET(#mqtt_packet_connect{})). serilize(?CONNECT_PACKET(#mqtt_packet_connect{})).
serialise_connack_test() -> serilize_connack_test() ->
ConnAck = #mqtt_packet{header = #mqtt_packet_header{type = ?CONNACK}, ConnAck = #mqtt_packet{header = #mqtt_packet_header{type = ?CONNACK},
variable = #mqtt_packet_connack{ack_flags = 0, return_code = 0}}, variable = #mqtt_packet_connack{ack_flags = 0, return_code = 0}},
?assertEqual(<<32,2,0,0>>, serialise(ConnAck)). ?assertEqual(<<32,2,0,0>>, serilize(ConnAck)).
serialise_publish_test() -> serilize_publish_test() ->
serialise(?PUBLISH_PACKET(?QOS_0, <<"Topic">>, undefined, <<"Payload">>)), serilize(?PUBLISH_PACKET(?QOS_0, <<"Topic">>, undefined, <<"Payload">>)),
serialise(?PUBLISH_PACKET(?QOS_1, <<"Topic">>, 938, <<"Payload">>)). serilize(?PUBLISH_PACKET(?QOS_1, <<"Topic">>, 938, <<"Payload">>)).
serialise_puback_test() -> serilize_puback_test() ->
serialise(?PUBACK_PACKET(?PUBACK, 10384)). serilize(?PUBACK_PACKET(?PUBACK, 10384)).
serialise_pubrel_test() -> serilize_pubrel_test() ->
serialise(?PUBREL_PACKET(10384)). serilize(?PUBREL_PACKET(10384)).
serialise_subscribe_test() -> serilize_subscribe_test() ->
TopicTable = [{<<"TopicQos0">>, ?QOS_0}, {<<"TopicQos1">>, ?QOS_1}, {<<"TopicQos2">>, ?QOS_2}], TopicTable = [{<<"TopicQos0">>, ?QOS_0}, {<<"TopicQos1">>, ?QOS_1}, {<<"TopicQos2">>, ?QOS_2}],
serialise(?SUBSCRIBE_PACKET(10, TopicTable)). serilize(?SUBSCRIBE_PACKET(10, TopicTable)).
serialise_suback_test() -> serilize_suback_test() ->
serialise(?SUBACK_PACKET(10, [?QOS_0, ?QOS_1, 128])). serilize(?SUBACK_PACKET(10, [?QOS_0, ?QOS_1, 128])).
serialise_unsubscribe_test() -> serilize_unsubscribe_test() ->
serialise(?UNSUBSCRIBE_PACKET(10, [<<"Topic1">>, <<"Topic2">>])). serilize(?UNSUBSCRIBE_PACKET(10, [<<"Topic1">>, <<"Topic2">>])).
serialise_unsuback_test() -> serilize_unsuback_test() ->
serialise(?UNSUBACK_PACKET(10)). serilize(?UNSUBACK_PACKET(10)).
serialise_pingreq_test() -> serilize_pingreq_test() ->
serialise(?PACKET(?PINGREQ)). serilize(?PACKET(?PINGREQ)).
serialise_pingresp_test() -> serilize_pingresp_test() ->
serialise(?PACKET(?PINGRESP)). serilize(?PACKET(?PINGRESP)).
serialise_disconnect_test() -> serilize_disconnect_test() ->
serialise(?PACKET(?DISCONNECT)). serilize(?PACKET(?DISCONNECT)).
-endif. -endif.