@@ -96,7 +96,7 @@ merge_meta(Msg, Meta0, Config) ->
9696 maps :merge (Msg , Meta2 ).
9797
9898encode (Data , Config ) ->
99- Json = jsx :encode (Data ),
99+ Json = json :encode (Data ),
100100 case new_line (Config ) of
101101 true -> [Json , new_line_type (Config )];
102102 false -> Json
@@ -174,17 +174,19 @@ meta_with(Meta, _ConfigNotPresent) ->
174174- include_lib (" eunit/include/eunit.hrl" ).
175175
176176- define (assertJSONEqual (Expected , Actual ),
177- ? assertEqual (jsx :decode (Expected , [ return_maps ] ), jsx :decode (Actual , [ return_maps ] ))
177+ ? assertEqual (json :decode (Expected ), json :decode (Actual ))
178178).
179179
180180format_test () ->
181181 ? assertJSONEqual (
182182 <<" {\" level\" :\" alert\" ,\" text\" :\" derp\" }" >>,
183- format (#{level => alert , msg => {string , " derp" }, meta => #{}}, #{})
183+ iolist_to_binary ( format (#{level => alert , msg => {string , " derp" }, meta => #{}}, #{}) )
184184 ),
185185 ? assertJSONEqual (
186186 <<" {\" herp\" :\" derp\" ,\" level\" :\" alert\" }" >>,
187- format (#{level => alert , msg => {report , #{herp => derp }}, meta => #{}}, #{})
187+ iolist_to_binary (
188+ format (#{level => alert , msg => {report , #{herp => derp }}, meta => #{}}, #{})
189+ )
188190 ).
189191
190192format_funs_test () ->
@@ -196,7 +198,9 @@ format_funs_test() ->
196198 },
197199 ? assertJSONEqual (
198200 <<" {\" level\" :\" info\" ,\" text\" :\" derp\" ,\" time\" :2}" >>,
199- format (#{level => alert , msg => {string , " derp" }, meta => #{time => 1 }}, Config1 )
201+ iolist_to_binary (
202+ format (#{level => alert , msg => {string , " derp" }, meta => #{time => 1 }}, Config1 )
203+ )
200204 ),
201205
202206 Config2 = #{
@@ -207,7 +211,9 @@ format_funs_test() ->
207211 },
208212 ? assertJSONEqual (
209213 <<" {\" level\" :\" alert\" ,\" text\" :\" derp\" ,\" time\" :2}" >>,
210- format (#{level => alert , msg => {string , " derp" }, meta => #{time => 1 }}, Config2 )
214+ iolist_to_binary (
215+ format (#{level => alert , msg => {string , " derp" }, meta => #{time => 1 }}, Config2 )
216+ )
211217 ).
212218
213219key_mapping_test () ->
@@ -219,7 +225,7 @@ key_mapping_test() ->
219225 },
220226 ? assertJSONEqual (
221227 <<" {\" lvl\" :\" alert\" ,\" message\" :\" derp\" }" >>,
222- format (#{level => alert , msg => {string , " derp" }, meta => #{}}, Config1 )
228+ iolist_to_binary ( format (#{level => alert , msg => {string , " derp" }, meta => #{}}, Config1 ) )
223229 ),
224230
225231 Config2 = #{
@@ -230,7 +236,7 @@ key_mapping_test() ->
230236 },
231237 ? assertJSONEqual (
232238 <<" {\" level\" :\" derp\" ,\" lvl\" :\" alert\" }" >>,
233- format (#{level => alert , msg => {string , " derp" }, meta => #{}}, Config2 )
239+ iolist_to_binary ( format (#{level => alert , msg => {string , " derp" }, meta => #{}}, Config2 ) )
234240 ),
235241
236242 Config3 = #{
@@ -241,7 +247,7 @@ key_mapping_test() ->
241247 },
242248 ? assertJSONEqual (
243249 <<" {\" lvl\" :\" alert\" ,\" text\" :\" derp\" }" >>,
244- format (#{level => alert , msg => {string , " derp" }, meta => #{}}, Config3 )
250+ iolist_to_binary ( format (#{level => alert , msg => {string , " derp" }, meta => #{}}, Config3 ) )
245251 ),
246252
247253 Config4 = #{
@@ -250,7 +256,9 @@ key_mapping_test() ->
250256 },
251257 ? assertJSONEqual (
252258 <<" {\" level\" :\" alert\" ,\" text\" :\" derp\" ,\" timestamp\" :2}" >>,
253- format (#{level => alert , msg => {string , " derp" }, meta => #{time => 1 }}, Config4 )
259+ iolist_to_binary (
260+ format (#{level => alert , msg => {string , " derp" }, meta => #{time => 1 }}, Config4 )
261+ )
254262 ).
255263
256264list_format_test () ->
@@ -262,7 +270,7 @@ list_format_test() ->
262270 },
263271 ? assertJSONEqual (
264272 <<" {\" level\" :\" error\" ,\" report\" :\" [{hej,\\\" hopp\\\" }]\" ,\" time\" :1}" >>,
265- format (ErrorReport , #{})
273+ iolist_to_binary ( format (ErrorReport , #{}) )
266274 ).
267275
268276meta_without_test () ->
@@ -277,15 +285,15 @@ meta_without_test() ->
277285 <<" level" >> => <<" info" >>,
278286 <<" secret" >> => <<" xyz" >>
279287 },
280- jsx :decode (format (Error , #{}), [ return_maps ] )
288+ json :decode (iolist_to_binary ( format (Error , #{})) )
281289 ),
282290 Config2 = #{meta_without => [secret ]},
283291 ? assertEqual (
284292 #{
285293 <<" answer" >> => 42 ,
286294 <<" level" >> => <<" info" >>
287295 },
288- jsx :decode (format (Error , Config2 ), [ return_maps ] )
296+ json :decode (iolist_to_binary ( format (Error , Config2 )) )
289297 ),
290298 ok .
291299
@@ -301,31 +309,35 @@ meta_with_test() ->
301309 <<" level" >> => <<" info" >>,
302310 <<" secret" >> => <<" xyz" >>
303311 },
304- jsx :decode (format (Error , #{}), [ return_maps ] )
312+ json :decode (iolist_to_binary ( format (Error , #{})) )
305313 ),
306314 Config2 = #{meta_with => [level ]},
307315 ? assertEqual (
308316 #{
309317 <<" answer" >> => 42 ,
310318 <<" level" >> => <<" info" >>
311319 },
312- jsx :decode (format (Error , Config2 ), [ return_maps ] )
320+ json :decode (iolist_to_binary ( format (Error , Config2 )) )
313321 ),
314322 ok .
315323
316324newline_test () ->
317325 ConfigDefault = #{new_line => true },
318326 ? assertEqual (
319- [<<" {\" level\" :\" alert\" ,\" text\" :\" derp\" }" >>, <<" \n " >>],
320- format (#{level => alert , msg => {string , " derp" }, meta => #{}}, ConfigDefault )
327+ <<" {\" level\" :\" alert\" ,\" text\" :\" derp\" }\n " >>,
328+ iolist_to_binary (
329+ format (#{level => alert , msg => {string , " derp" }, meta => #{}}, ConfigDefault )
330+ )
321331 ),
322332 ConfigCRLF = #{
323333 new_line_type => crlf ,
324334 new_line => true
325335 },
326336 ? assertEqual (
327- [<<" {\" level\" :\" alert\" ,\" text\" :\" derp\" }" >>, <<" \r\n " >>],
328- format (#{level => alert , msg => {string , " derp" }, meta => #{}}, ConfigCRLF )
337+ <<" {\" level\" :\" alert\" ,\" text\" :\" derp\" }\r\n " >>,
338+ iolist_to_binary (
339+ format (#{level => alert , msg => {string , " derp" }, meta => #{}}, ConfigCRLF )
340+ )
329341 ).
330342
331343- endif .
0 commit comments