Add tests on string validation

Author: kuenishi

src/msgpack.erl

@@ -159,12 +159,13 @@ parse_options([{known_atoms, Atoms}|T], Opt0) when is_list(Atoms) ->
     parse_options(T, Opt0?OPTION{known_atoms=Atoms});
 
 parse_options([{unpack_str, As}|T], Opt0) when As =:= as_binary orelse As =:= as_list ->
-    %% TODO Choose function here
     parse_options(T, Opt0?OPTION{unpack_str=As});
 
+parse_options([{validate_string, Bool}|T], Opt) when is_boolean(Bool) ->
+    parse_options(T, Opt?OPTION{validate_string=Bool});
+
 parse_options([{pack_str, From}|T], Opt)
   when From =:= from_binary orelse From =:= from_list orelse From =:= none ->
-    %% TODO Choose function here
     parse_options(T, Opt?OPTION{pack_str=From});
 
 parse_options([{map_format,Type}|T], Opt0)

src/msgpack_unpacker.erl

@@ -230,8 +230,8 @@ maybe_bin(Bin, _) ->
 %% NOTE: msgpack DOES validate the binary as valid unicode string.
 unpack_str(Binary) ->
     case unicode:characters_to_list(Binary) of
-        {error, _S, _Rest} -> throw({error, {invalid_string, Binary}});
-        {incomplete, _S, _Rest} -> throw({error, {invalid_string, Binary}});
+        {error, _S, _Rest} -> throw({invalid_string, Binary});
+        {incomplete, _S, _Rest} -> throw({invalid_string, Binary});
         String -> String
     end.
 

test/msgpack_tests.erl

@@ -607,8 +607,21 @@ new_spec_unpack_test_() ->
       ]}].
 
 unpack_str_validation_test_() ->
+    String = unicode:characters_to_binary("あいうえおかきくけこさしすせそ" "abcdefghijklmnopqrstuv"),
+    InvalidStr = <<255,255,255,255, 255,255,255,255, 255,255,255,255, 255,255,255,255>>,
+    WrongPack = <<16#D9, 16, InvalidStr/binary>>,
+    Packed = msgpack:pack(String, [{spec,new},{pack_str,from_binary}]),
+    NoValidation = [{spec,new},{unpack_str,as_binary},{validate_string,false}],
+    DoValidation = [{spec,new},{unpack_str,as_binary},{validate_string,true}],
     [{"validate_string false, on unpacking",
-      []},
+      [?_assertEqual({ok, String}, msgpack:unpack(Packed, NoValidation)),
+       ?_assertEqual({ok, InvalidStr}, msgpack:unpack(WrongPack, NoValidation))]},
      {"validate_string true, on unpacking",
-      []}
+      [?_assertEqual({ok, String}, msgpack:unpack(Packed, DoValidation)),
+       ?_assertEqual({error, {invalid_string, InvalidStr}}, msgpack:unpack(WrongPack, DoValidation)),
+
+       %% TODO: this should be invalid string
+       ?_assertEqual({error, {badarg, binary_to_list(InvalidStr)}},
+                     msgpack:unpack(binary_to_list(InvalidStr),
+                                    [{spec,new},{unpack_str,from_list},{validate_string,true}]))]}
     ].