Update expect tests with large signed numbers for zigzag encoding/decoding

Author: andersfugmann

src/ocaml_protoc_plugin/deserialize.ml

@@ -326,3 +326,31 @@ let deserialize_fast: type constr a. (constr, a) compound_list -> constr -> Read
   let extension_ranges = extension_ranges spec in
   let values = make_values spec in
   fun reader -> deserialize_fast extension_ranges values constr reader
+
+let%expect_test "zigzag encoding" =
+  let test vl =
+    let v = Int64.to_int vl in
+    Printf.printf "zigzag_decoding(%LdL) = %LdL\n" vl (decode_zigzag vl);
+    Printf.printf "zigzag_decoding_unboxed(%d) = %d\n" v (decode_zigzag_unboxed v);
+  in
+  List.iter ~f:test [0L; -1L; 1L; -2L; 2L; 2147483647L; -2147483648L; Int64.max_int; Int64.min_int; ];
+  [%expect {|
+    zigzag_decoding(0L) = 0L
+    zigzag_decoding_unboxed(0) = 0
+    zigzag_decoding(-1L) = -9223372036854775808L
+    zigzag_decoding_unboxed(-1) = -4611686018427387904
+    zigzag_decoding(1L) = -1L
+    zigzag_decoding_unboxed(1) = -1
+    zigzag_decoding(-2L) = 9223372036854775807L
+    zigzag_decoding_unboxed(-2) = 4611686018427387903
+    zigzag_decoding(2L) = 1L
+    zigzag_decoding_unboxed(2) = 1
+    zigzag_decoding(2147483647L) = -1073741824L
+    zigzag_decoding_unboxed(2147483647) = -1073741824
+    zigzag_decoding(-2147483648L) = 9223372035781033984L
+    zigzag_decoding_unboxed(-2147483648) = 4611686017353646080
+    zigzag_decoding(9223372036854775807L) = -4611686018427387904L
+    zigzag_decoding_unboxed(-1) = -4611686018427387904
+    zigzag_decoding(-9223372036854775808L) = 4611686018427387904L
+    zigzag_decoding_unboxed(0) = 0
+    |}]

src/ocaml_protoc_plugin/serialize.ml

@@ -201,4 +201,5 @@ let%expect_test "zigzag encoding" =
     zigzag_encoding(9223372036854775807L) = -2L
     zigzag_encoding_unboxed(-1) = 1
     zigzag_encoding(-9223372036854775808L) = -1L
-    zigzag_encoding_unboxed(0) = 0 |}]
+    zigzag_encoding_unboxed(0) = 0
+    |}]

test/int_types_native_test.ml

@@ -5,7 +5,7 @@ let proto_file = "int_types_native.proto"
 
 let test_signed64 (type t) ~(create : Int64.t -> t) (module T : Test_lib.T with type t = t) =
   Printf.printf "Test %s\n%!" (T.name ());
-  let values = [-1073741823L; -2L; -1L; 0L; 1L; 2L; 1073741823L] in
+  let values = [Int64.min_int; Int64.succ Int64.min_int; -1073741823L; -2L; -1L; 0L; 1L; 2L; 1073741823L; Int64.pred Int64.max_int; Int64.max_int] in
   List.iter
     ~f:(fun v -> Test_lib.test_encode ~proto_file (module T) (create v))
     values
@@ -19,7 +19,7 @@ let test_unsigned64 (type t) ~(create : Int64.t -> t) (module T : Test_lib.T wit
 
 let test_signed32 (type t) ~(create : Int32.t -> t) (module T : Test_lib.T with type t = t) =
   Printf.printf "Test %s\n%!" (T.name ());
-  let values = [-1073741823l; -2l; -1l; 0l; 1l; 2l; 1073741823l] in
+  let values = [Int32.min_int; Int32.succ Int32.min_int; -1073741823l; -2l; -1l; 0l; 1l; 2l; 1073741823l; Int32.pred Int32.max_int; Int32.max_int] in
   List.iter
     ~f:(fun v -> Test_lib.test_encode ~proto_file (module T) (create v))
     values
@@ -37,38 +37,53 @@ let%expect_test _ =
   test_signed64 ~create (module T);
   [%expect {|
     Test .int_types_native.SInt64
+    i: -9223372036854775808
+    i: -9223372036854775807
     i: -1073741823
     i: -2
     i: -1
     i: 1
     i: 2
-    i: 1073741823 |}]
+    i: 1073741823
+    i: 9223372036854775806
+    i: 9223372036854775807
+    |}]
 
 let%expect_test _ =
   let module T = Int_types_native.SInt32 in
   let create i = i in
   test_signed32 ~create (module T);
   [%expect {|
     Test .int_types_native.SInt32
+    i: -2147483648
+    i: -2147483647
     i: -1073741823
     i: -2
     i: -1
     i: 1
     i: 2
-    i: 1073741823 |}]
+    i: 1073741823
+    i: 2147483646
+    i: 2147483647
+    |}]
 
 let%expect_test _ =
   let module T = Int_types_native.Int64 in
   let create i = i in
   test_signed64 ~create (module T);
   [%expect {|
     Test .int_types_native.Int64
+    i: -9223372036854775808
+    i: -9223372036854775807
     i: -1073741823
     i: -2
     i: -1
     i: 1
     i: 2
-    i: 1073741823 |}]
+    i: 1073741823
+    i: 9223372036854775806
+    i: 9223372036854775807
+    |}]
 
 let%expect_test _ =
   let module T = Int_types_native.Int32 in
@@ -77,12 +92,17 @@ let%expect_test _ =
   [%expect
     {|
     Test .int_types_native.Int32
+    i: -2147483648
+    i: -2147483647
     i: -1073741823
     i: -2
     i: -1
     i: 1
     i: 2
-    i: 1073741823 |}]
+    i: 1073741823
+    i: 2147483646
+    i: 2147483647
+    |}]
 
 let%expect_test _ =
   let module T = Int_types_native.UInt64 in