--- JSON-XS/t/19_incr.t	2008/03/25 06:37:39	1.1
+++ JSON-XS/t/19_incr.t	2018/11/15 22:35:35	1.6
@@ -3,13 +3,16 @@
 use strict;
 no warnings;
 use Test::More;
-BEGIN { plan tests => 686 };
+BEGIN { plan tests => 745 };
 
 use JSON::XS;
 
 sub splitter {
    my ($coder, $text) = @_;
 
+   # work around hash randomisation bug introduced in 5.18
+   $coder->canonical;
+
    for (0 .. length $text) {
       my $a = substr $text, 0, $_;
       my $b = substr $text, $_;
@@ -18,36 +21,84 @@
       $coder->incr_parse ($b);
 
       my $data = $coder->incr_parse;
-      ok ($data);
-      ok ($coder->encode ($data) eq $coder->encode ($coder->decode ($text)), "data");
+      #ok (defined $data, "split<$a><$b>");
+      ok (defined $data, "split");
+      my $e1 = $coder->encode ($data);
+      my $e2 = $coder->encode ($coder->decode ($text));
+      #ok ($e1 eq $e2, "data<$a><$b><$e1><$e2>");
+      #ok ($coder->incr_text =~ /^\s*$/, "tailws<$a><$b>");
+      ok ($e1 eq $e2, "data");
       ok ($coder->incr_text =~ /^\s*$/, "tailws");
    }
 }
 
-splitter +JSON::XS->new              , '  ["x\\"","\\u1000\\\\n\\nx",1,{"\\\\" :5 , "": "x"}]';
-splitter +JSON::XS->new              , '[ "x\\"","\\u1000\\\\n\\nx" , 1,{"\\\\ " :5 , "": " x"} ] ';
-splitter +JSON::XS->new->allow_nonref, '"test"';
-splitter +JSON::XS->new->allow_nonref, ' "5" ';
-
-my $text = '[5],{"":1} , [ 1,2, 3], {"3":null}';
-my $coder = new JSON::XS;
-for (0 .. length $text) {
-   my $a = substr $text, 0, $_;
-   my $b = substr $text, $_;
-
-   $coder->incr_parse ($a);
-   $coder->incr_parse ($b);
-
-   my $j1 = $coder->incr_parse; ok ($coder->incr_text =~ s/^\s*,//, "cskip1");
-   my $j2 = $coder->incr_parse; ok ($coder->incr_text =~ s/^\s*,//, "cskip2");
-   my $j3 = $coder->incr_parse; ok ($coder->incr_text =~ s/^\s*,//, "cskip3");
-   my $j4 = $coder->incr_parse; ok ($coder->incr_text !~ s/^\s*,//, "cskip4");
-   my $j5 = $coder->incr_parse; ok ($coder->incr_text !~ s/^\s*,//, "cskip5");
-
-   ok ('[5]' eq encode_json $j1, "cjson1");
-   ok ('{"":1}' eq encode_json $j2, "cjson2");
-   ok ('[1,2,3]' eq encode_json $j3, "cjson3");
-   ok ('{"3":null}' eq encode_json $j4, "cjson4");
-   ok (!defined $j5, "cjson5");
+splitter +JSON::XS->new->allow_nonref (0), '  ["x\\"","\\u1000\\\\n\\nx",1,{"\\\\" :5 , "": "x"}]';
+splitter +JSON::XS->new->allow_nonref (0), '[ "x\\"","\\u1000\\\\n\\nx" , 1,{"\\\\ " :5 , "": " x"} ] ';
+splitter +JSON::XS->new                  , '"test"';
+splitter +JSON::XS->new                  , ' "5" ';
+splitter +JSON::XS->new                  , '-1e5';
+splitter +JSON::XS->new                  , ' 0.00E+00 ';
+
+{
+   my $text = '[5],{"":1} , [ 1,2, 3], {"3":null}';
+   my $coder = new JSON::XS;
+   for (0 .. length $text) {
+      my $a = substr $text, 0, $_;
+      my $b = substr $text, $_;
+
+      $coder->incr_parse ($a);
+      $coder->incr_parse ($b);
+
+      my $j1 = $coder->incr_parse; ok ($coder->incr_text =~ s/^\s*,//, "cskip1");
+      my $j2 = $coder->incr_parse; ok ($coder->incr_text =~ s/^\s*,//, "cskip2");
+      my $j3 = $coder->incr_parse; ok ($coder->incr_text =~ s/^\s*,//, "cskip3");
+      my $j4 = $coder->incr_parse; ok ($coder->incr_text !~ s/^\s*,//, "cskip4");
+      my $j5 = $coder->incr_parse; ok ($coder->incr_text !~ s/^\s*,//, "cskip5");
+
+      ok ('[5]' eq encode_json $j1, "cjson1");
+      ok ('{"":1}' eq encode_json $j2, "cjson2");
+      ok ('[1,2,3]' eq encode_json $j3, "cjson3");
+      ok ('{"3":null}' eq encode_json $j4, "cjson4");
+      ok (!defined $j5, "cjson5");
+   }
+}
+
+{
+   my $text = '[x][5]';
+   my $coder = new JSON::XS;
+   $coder->incr_parse ($text);
+   ok (!eval { $coder->incr_parse }, "sparse1");
+   ok (!eval { $coder->incr_parse }, "sparse2");
+   $coder->incr_skip;
+   ok ('[5]' eq $coder->encode (scalar $coder->incr_parse), "sparse3");
 }
 
+{
+   my $coder = JSON::XS->new->max_size (5);
+   ok (!$coder->incr_parse ("[    "), "incsize1");
+   eval { !$coder->incr_parse ("]  ") }; ok ($@ =~ /6 bytes/, "incsize2 $@");
+}
+
+{
+   my $coder = JSON::XS->new->max_depth (3);
+   ok (!$coder->incr_parse ("[[["), "incdepth1");
+   eval { !$coder->incr_parse (" [] ") }; ok ($@ =~ /maximum nesting/, "incdepth2 $@");
+}
+
+# contributed by yuval kogman, reformatted to fit style
+{
+   my $coder = JSON::XS->new;
+   
+   my $res = eval { $coder->incr_parse("]") };
+   my $e = $@; # test more clobbers $@, we need it twice
+   
+   ok (!$res, "unbalanced bracket");
+   ok ($e, "got error");
+   like ($e, qr/malformed/, "malformed json string error");
+   
+   $coder->incr_skip;
+   
+   is_deeply (eval { $coder->incr_parse("[42]") }, [42], "valid data after incr_skip");
+}
+
+