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

test: fix data in calls to look like real world

This commit is contained in:
Stefan Strigler 2023-05-29 14:21:53 +02:00
parent 1381b54a8d
commit bd92116cee
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb_impl.erl
View File

@ -154,21 +154,9 @@ on_query_async(InstanceId, {send_message, Message}, ReplyFunAndArgs0, State) ->
%%--------------------------------------------------------------------
make_parsed_payload(PayloadUnparsed) when is_binary(PayloadUnparsed) ->
emqx_utils_json:decode(PayloadUnparsed, [return_maps]);
emqx_utils_json:decode(PayloadUnparsed);
make_parsed_payload(PayloadUnparsed) when is_list(PayloadUnparsed) ->
lists:map(fun make_parsed_payload/1, PayloadUnparsed);
make_parsed_payload(
#{
measurement := Measurement,
data_type := DataType,
value := Value
} = Data
) ->
Data#{
<<"measurement">> => Measurement,
<<"data_type">> => DataType,
<<"value">> => Value
}.
lists:map(fun make_parsed_payload/1, PayloadUnparsed).
preproc_data_list(DataList) ->
lists:foldl(
@ -270,6 +258,7 @@ replace_var(Val, _Data) ->
Val.
convert_bool(B) when is_boolean(B) -> B;
convert_bool(null) -> null;
convert_bool(1) -> true;
convert_bool(0) -> false;
convert_bool(<<"1">>) -> true;
@ -279,8 +268,7 @@ convert_bool(<<"True">>) -> true;
convert_bool(<<"TRUE">>) -> true;
convert_bool(<<"false">>) -> false;
convert_bool(<<"False">>) -> false;
convert_bool(<<"FALSE">>) -> false;
convert_bool(undefined) -> null.
convert_bool(<<"FALSE">>) -> false.
convert_int(Int) when is_integer(Int) -> Int;
convert_int(Float) when is_float(Float) -> floor(Float);

4
apps/emqx_bridge_iotdb/test/emqx_bridge_iotdb_impl_SUITE.erl
View File

@ -156,7 +156,7 @@ make_message_fun(Topic, Payload) ->
#{
topic => Topic,
id => MsgId,
payload => Payload,
payload => emqx_utils_json:encode(Payload),
retain => true
}
end.
@ -223,7 +223,7 @@ t_sync_query_aggregated(Config) ->
make_iotdb_payload(DeviceId, "dazzled", "BOOLEAN", "false"),
make_iotdb_payload(DeviceId, "unplugged", "BOOLEAN", "FALSE"),
make_iotdb_payload(DeviceId, "unraveled", "BOOLEAN", "False"),
make_iotdb_payload(DeviceId, "undecided", "BOOLEAN", undefined),
make_iotdb_payload(DeviceId, "undecided", "BOOLEAN", null),
make_iotdb_payload(DeviceId, "weight", "FLOAT", "87.3"),
make_iotdb_payload(DeviceId, "weight", "FLOAT", 87.3),
make_iotdb_payload(DeviceId, "weight", "FLOAT", 87),