Browse Source

Apply emft v0.1.1

Takeru Ohta 3 years ago
parent
commit
d49e284e84
2 changed files with 20 additions and 20 deletions
  1. 10 10
      test/jsone_decode_tests.erl
  2. 10 10
      test/jsone_encode_tests.erl

+ 10 - 10
test/jsone_decode_tests.erl

@@ -22,14 +22,14 @@
 decode_test_() ->
 decode_test_() ->
     [
     [
      %% Symbols
      %% Symbols
-     {"false", fun () -> ?assertEqual({ok, false, <<"">>}, jsone_decode:decode(<<"false">>))end},
-     {"true", fun () -> ?assertEqual({ok, true, <<"">>}, jsone_decode:decode(<<"true">>))end},
-     {"null", fun () -> ?assertEqual({ok, null, <<"">>}, jsone_decode:decode(<<"null">>))end},
+     {"false", fun () -> ?assertEqual({ok, false, <<"">>}, jsone_decode:decode(<<"false">>)) end},
+     {"true", fun () -> ?assertEqual({ok, true, <<"">>}, jsone_decode:decode(<<"true">>)) end},
+     {"null", fun () -> ?assertEqual({ok, null, <<"">>}, jsone_decode:decode(<<"null">>)) end},
 
 
      %% Numbers: Integer
      %% Numbers: Integer
-     {"positive integer", fun () -> ?assertEqual({ok, 1, <<"">>}, jsone_decode:decode(<<"1">>))end},
-     {"zero", fun () -> ?assertEqual({ok, 0, <<"">>}, jsone_decode:decode(<<"0">>))end},
-     {"negative integer", fun () -> ?assertEqual({ok, -1, <<"">>}, jsone_decode:decode(<<"-1">>))end},
+     {"positive integer", fun () -> ?assertEqual({ok, 1, <<"">>}, jsone_decode:decode(<<"1">>)) end},
+     {"zero", fun () -> ?assertEqual({ok, 0, <<"">>}, jsone_decode:decode(<<"0">>)) end},
+     {"negative integer", fun () -> ?assertEqual({ok, -1, <<"">>}, jsone_decode:decode(<<"-1">>)) end},
      {"large integer (no limit on size)",
      {"large integer (no limit on size)",
       fun () ->
       fun () ->
               ?assertEqual({ok, 111111111111111111111111111111111111111111111111111111111111111111111111111111, <<"">>},
               ?assertEqual({ok, 111111111111111111111111111111111111111111111111111111111111111111111111111111, <<"">>},
@@ -42,10 +42,10 @@ decode_test_() ->
               ?assertEqual({ok, 0, <<"1">>}, jsone_decode:decode(<<"-01">>))
               ?assertEqual({ok, 0, <<"1">>}, jsone_decode:decode(<<"-01">>))
       end},
       end},
      {"integer can't begin with an explicit plus sign",
      {"integer can't begin with an explicit plus sign",
-      fun () -> ?assertMatch({error, {badarg, _}}, jsone_decode:decode(<<"+1">>))end},
+      fun () -> ?assertMatch({error, {badarg, _}}, jsone_decode:decode(<<"+1">>)) end},
 
 
      %% Numbers: Floats
      %% Numbers: Floats
-     {"float: decimal notation", fun () -> ?assertEqual({ok, 1.23, <<"">>}, jsone_decode:decode(<<"1.23">>))end},
+     {"float: decimal notation", fun () -> ?assertEqual({ok, 1.23, <<"">>}, jsone_decode:decode(<<"1.23">>)) end},
      {"float: exponential notation",
      {"float: exponential notation",
       fun () ->
       fun () ->
               ?assertEqual({ok, 12.345, <<"">>}, jsone_decode:decode(<<"12345e-3">>)),  % lower case 'e'
               ?assertEqual({ok, 12.345, <<"">>}, jsone_decode:decode(<<"12345e-3">>)),  % lower case 'e'
@@ -73,7 +73,7 @@ decode_test_() ->
       end},
       end},
 
 
      %% Strings
      %% Strings
-     {"simple string", fun () -> ?assertEqual({ok, <<"abc">>, <<"">>}, jsone_decode:decode(<<"\"abc\"">>))end},
+     {"simple string", fun () -> ?assertEqual({ok, <<"abc">>, <<"">>}, jsone_decode:decode(<<"\"abc\"">>)) end},
      {"string: escaped characters",
      {"string: escaped characters",
       fun () ->
       fun () ->
               Input = list_to_binary([$", [[$\\, C] || C <- [$", $/, $\\, $b, $f, $n, $r, $t]], $"]),
               Input = list_to_binary([$", [[$\\, C] || C <- [$", $/, $\\, $b, $f, $n, $r, $t]], $"]),
@@ -247,7 +247,7 @@ decode_test_() ->
       end},
       end},
      {"atom keys",
      {"atom keys",
       fun () ->
       fun () ->
-              KeyOpt = fun (Keys) -> [{keys, Keys}, {object_format, proplist}]end,
+              KeyOpt = fun (Keys) -> [{keys, Keys}, {object_format, proplist}] end,
               Input = <<"{\"foo\":\"ok\"}">>,
               Input = <<"{\"foo\":\"ok\"}">>,
               ?assertEqual([{<<"foo">>, <<"ok">>}], jsone:decode(Input, KeyOpt(binary))),
               ?assertEqual([{<<"foo">>, <<"ok">>}], jsone:decode(Input, KeyOpt(binary))),
               ?assertEqual([{foo, <<"ok">>}], jsone:decode(Input, KeyOpt(atom))),
               ?assertEqual([{foo, <<"ok">>}], jsone:decode(Input, KeyOpt(atom))),

+ 10 - 10
test/jsone_encode_tests.erl

@@ -19,9 +19,9 @@
 encode_test_() ->
 encode_test_() ->
     [
     [
      %% Symbols
      %% Symbols
-     {"false", fun () -> ?assertEqual({ok, <<"false">>}, jsone_encode:encode(false))end},
-     {"true", fun () -> ?assertEqual({ok, <<"true">>}, jsone_encode:encode(true))end},
-     {"null", fun () -> ?assertEqual({ok, <<"null">>}, jsone_encode:encode(null))end},
+     {"false", fun () -> ?assertEqual({ok, <<"false">>}, jsone_encode:encode(false)) end},
+     {"true", fun () -> ?assertEqual({ok, <<"true">>}, jsone_encode:encode(true)) end},
+     {"null", fun () -> ?assertEqual({ok, <<"null">>}, jsone_encode:encode(null)) end},
 
 
      %% Numbers: Inline json term
      %% Numbers: Inline json term
      {"json",
      {"json",
@@ -40,9 +40,9 @@ encode_test_() ->
               ?assertEqual({ok, <<"[[1,2,3]]">>}, jsone_encode:encode([{{json, <<"[1,2,3]">>}}]))
               ?assertEqual({ok, <<"[[1,2,3]]">>}, jsone_encode:encode([{{json, <<"[1,2,3]">>}}]))
       end},
       end},
      %% Numbers: Integer
      %% Numbers: Integer
-     {"zero", fun () -> ?assertEqual({ok, <<"0">>}, jsone_encode:encode(0))end},
-     {"positive integer", fun () -> ?assertEqual({ok, <<"1">>}, jsone_encode:encode(1))end},
-     {"negative integer", fun () -> ?assertEqual({ok, <<"-1">>}, jsone_encode:encode(-1))end},
+     {"zero", fun () -> ?assertEqual({ok, <<"0">>}, jsone_encode:encode(0)) end},
+     {"positive integer", fun () -> ?assertEqual({ok, <<"1">>}, jsone_encode:encode(1)) end},
+     {"negative integer", fun () -> ?assertEqual({ok, <<"-1">>}, jsone_encode:encode(-1)) end},
      {"large number",
      {"large number",
       fun () ->
       fun () ->
               ?assertEqual({ok, <<"11111111111111111111111111111111111111111111111111111111111111111111111">>},
               ?assertEqual({ok, <<"11111111111111111111111111111111111111111111111111111111111111111111111">>},
@@ -67,8 +67,8 @@ encode_test_() ->
       end},
       end},
 
 
      %% Strings
      %% Strings
-     {"simple string", fun () -> ?assertEqual({ok, <<"\"abc\"">>}, jsone_encode:encode(<<"abc">>))end},
-     {"atom is regarded as string", fun () -> ?assertEqual({ok, <<"\"abc\"">>}, jsone_encode:encode(abc))end},
+     {"simple string", fun () -> ?assertEqual({ok, <<"\"abc\"">>}, jsone_encode:encode(<<"abc">>)) end},
+     {"atom is regarded as string", fun () -> ?assertEqual({ok, <<"\"abc\"">>}, jsone_encode:encode(abc)) end},
      {"string: contains escaped characters",
      {"string: contains escaped characters",
       fun () ->
       fun () ->
               Input = <<"\"\/\\\b\f\n\r\t">>,
               Input = <<"\"\/\\\b\f\n\r\t">>,
@@ -301,7 +301,7 @@ encode_test_() ->
      {"`map_unknown_value` option with singleton tuple",
      {"`map_unknown_value` option with singleton tuple",
       fun () ->
       fun () ->
               Input = [{foo}],
               Input = [{foo}],
-              MapFun = fun (Value) -> {ok, unicode:characters_to_binary(io_lib:format("~p~n", [Value]))}end,
+              MapFun = fun (Value) -> {ok, unicode:characters_to_binary(io_lib:format("~p~n", [Value]))} end,
               Expected = <<"[\"{foo}\\n\"]">>,
               Expected = <<"[\"{foo}\\n\"]">>,
               ?assertEqual(Expected, jsone:encode(Input, [{map_unknown_value, MapFun}]))
               ?assertEqual(Expected, jsone:encode(Input, [{map_unknown_value, MapFun}]))
       end},
       end},
@@ -334,7 +334,7 @@ encode_test_() ->
               ?assertEqual({ok, <<$", PidString/binary, $">>}, jsone_encode:encode(Pid)),
               ?assertEqual({ok, <<$", PidString/binary, $">>}, jsone_encode:encode(Pid)),
               ?assertMatch({error, {badarg, _}}, jsone_encode:encode(Pid, [{map_unknown_value, undefined}]))
               ?assertMatch({error, {badarg, _}}, jsone_encode:encode(Pid, [{map_unknown_value, undefined}]))
       end},
       end},
-     {"wrong option", fun () -> ?assertError(badarg, jsone_encode:encode(1, [{no_such_option, hoge}]))end},
+     {"wrong option", fun () -> ?assertError(badarg, jsone_encode:encode(1, [{no_such_option, hoge}])) end},
      {"canonical_form",
      {"canonical_form",
       fun () ->
       fun () ->
               Obj1 = ?OBJECT_FROM_LIST([{<<"key", (integer_to_binary(I))/binary>>, I} || I <- lists:seq(1000, 0, -1)]),
               Obj1 = ?OBJECT_FROM_LIST([{<<"key", (integer_to_binary(I))/binary>>, I} || I <- lists:seq(1000, 0, -1)]),