From 14d902a3fc4ae45d96775b332d4296f029b35374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Fri, 2 Feb 2018 16:44:46 +0100 Subject: [PATCH] Test: split out `test/{p2p,utils}` in various package dir --- src/lib_crypto/test/jbuild | 33 +++++++++++++ .../lib_crypto/test}/test_merkle.ml | 5 +- {test/p2p => src/lib_p2p/test}/jbuild | 0 .../lib_p2p/test}/test_p2p_io_scheduler.ml | 0 .../p2p => src/lib_p2p/test}/test_p2p_pool.ml | 0 .../lib_p2p/test}/test_p2p_socket.ml | 0 src/lib_stdlib/test/jbuild | 33 +++++++++++++ .../lib_stdlib/test}/test_mbytes_buffer.ml | 0 .../lib_stdlib/test/test_tzList.ml | 25 ++++++---- src/lib_stdlib_lwt/test/jbuild | 27 +++++++++++ .../lib_stdlib_lwt/test}/test_lwt_pipe.ml | 9 ++++ test/utils/jbuild | 47 ------------------- 12 files changed, 119 insertions(+), 60 deletions(-) create mode 100644 src/lib_crypto/test/jbuild rename {test/utils => src/lib_crypto/test}/test_merkle.ml (97%) rename {test/p2p => src/lib_p2p/test}/jbuild (100%) rename {test/p2p => src/lib_p2p/test}/test_p2p_io_scheduler.ml (100%) rename {test/p2p => src/lib_p2p/test}/test_p2p_pool.ml (100%) rename {test/p2p => src/lib_p2p/test}/test_p2p_socket.ml (100%) create mode 100644 src/lib_stdlib/test/jbuild rename {test/utils => src/lib_stdlib/test}/test_mbytes_buffer.ml (100%) rename test/utils/test_utils.ml => src/lib_stdlib/test/test_tzList.ml (70%) create mode 100644 src/lib_stdlib_lwt/test/jbuild rename {test/utils => src/lib_stdlib_lwt/test}/test_lwt_pipe.ml (73%) delete mode 100644 test/utils/jbuild diff --git a/src/lib_crypto/test/jbuild b/src/lib_crypto/test/jbuild new file mode 100644 index 000000000..36d9c0da2 --- /dev/null +++ b/src/lib_crypto/test/jbuild @@ -0,0 +1,33 @@ +(jbuild_version 1) + +(executables + ((names (test_merkle)) + (libraries (tezos-stdlib + tezos-error-monad + tezos-data-encoding + tezos-crypto + tezos-test-helpers)) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_test_helpers + -open Tezos_stdlib + -open Tezos_error_monad + -open Tezos_data_encoding + -open Tezos_crypto)))) + +(alias + ((name buildtest) + (deps (test_merkle.exe)))) + +(alias + ((name runtest_merkle) + (action (run ${exe:test_merkle.exe})))) + +(alias + ((name runtest) + (deps ((alias runtest_merkle))))) + +(alias + ((name runtest_indent) + (deps ((glob_files *.ml) (glob_files *.mli))) + (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) diff --git a/test/utils/test_merkle.ml b/src/lib_crypto/test/test_merkle.ml similarity index 97% rename from test/utils/test_merkle.ml rename to src/lib_crypto/test/test_merkle.ml index d027dec25..3b2895a5e 100644 --- a/test/utils/test_merkle.ml +++ b/src/lib_crypto/test/test_merkle.ml @@ -7,9 +7,8 @@ (* *) (**************************************************************************) -let rec (--) i j = - if j < i then [] - else i :: (i+1) -- j +open Error_monad +open Utils.Infix type tree = | Empty diff --git a/test/p2p/jbuild b/src/lib_p2p/test/jbuild similarity index 100% rename from test/p2p/jbuild rename to src/lib_p2p/test/jbuild diff --git a/test/p2p/test_p2p_io_scheduler.ml b/src/lib_p2p/test/test_p2p_io_scheduler.ml similarity index 100% rename from test/p2p/test_p2p_io_scheduler.ml rename to src/lib_p2p/test/test_p2p_io_scheduler.ml diff --git a/test/p2p/test_p2p_pool.ml b/src/lib_p2p/test/test_p2p_pool.ml similarity index 100% rename from test/p2p/test_p2p_pool.ml rename to src/lib_p2p/test/test_p2p_pool.ml diff --git a/test/p2p/test_p2p_socket.ml b/src/lib_p2p/test/test_p2p_socket.ml similarity index 100% rename from test/p2p/test_p2p_socket.ml rename to src/lib_p2p/test/test_p2p_socket.ml diff --git a/src/lib_stdlib/test/jbuild b/src/lib_stdlib/test/jbuild new file mode 100644 index 000000000..adf446f82 --- /dev/null +++ b/src/lib_stdlib/test/jbuild @@ -0,0 +1,33 @@ +(jbuild_version 1) + +(executables + ((names (test_tzList + test_mbytes_buffer)) + (libraries (tezos-stdlib tezos-test-helpers)) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_test_helpers + -open Tezos_stdlib)))) + +(alias + ((name buildtest) + (deps (test_tzList.exe + test_mbytes_buffer.exe)))) + +(alias + ((name runtest_tzList) + (action (run ${exe:test_tzList.exe})))) + +(alias + ((name runtest_mbytes_buffer) + (action (run ${exe:test_mbytes_buffer.exe})))) + +(alias + ((name runtest) + (deps ((alias runtest_tzList) + (alias runtest_mbytes_buffer))))) + +(alias + ((name runtest_indent) + (deps ((glob_files *.ml) (glob_files *.mli))) + (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) diff --git a/test/utils/test_mbytes_buffer.ml b/src/lib_stdlib/test/test_mbytes_buffer.ml similarity index 100% rename from test/utils/test_mbytes_buffer.ml rename to src/lib_stdlib/test/test_mbytes_buffer.ml diff --git a/test/utils/test_utils.ml b/src/lib_stdlib/test/test_tzList.ml similarity index 70% rename from test/utils/test_utils.ml rename to src/lib_stdlib/test/test_tzList.ml index 83b0b637b..1f97d2a0f 100644 --- a/test/utils/test_utils.ml +++ b/src/lib_stdlib/test/test_tzList.ml @@ -7,6 +7,12 @@ (* *) (**************************************************************************) +module Error = struct + type error = .. + let pp_print_error _ _ = () +end +module Test = Tezos_test_helpers.Test.Make(Error) + let rec permut = function | [] -> [[]] | x :: xs -> @@ -23,32 +29,31 @@ let rec permut = function let test_take_n _ = ListLabels.iter (permut [1;2;3;4;5;6;7;8;9]) ~f:begin fun xs -> - Assert.equal ~msg:__LOC__ (List.take_n ~compare 1 xs) [9] + Assert.equal ~msg:__LOC__ (TzList.take_n ~compare 1 xs) [9] end ; ListLabels.iter (permut [1;2;3;4;5;6;7;8;9]) ~f:begin fun xs -> - Assert.equal ~msg:__LOC__ (List.take_n ~compare 3 xs) [7;8;9] + Assert.equal ~msg:__LOC__ (TzList.take_n ~compare 3 xs) [7;8;9] end ; let inv_compare x y = compare y x in ListLabels.iter (permut [1;2;3;4;5;6;7;8;9]) ~f:begin fun xs -> - Assert.equal ~msg:__LOC__ (List.take_n ~compare:inv_compare 3 xs) [3;2;1] + Assert.equal ~msg:__LOC__ (TzList.take_n ~compare:inv_compare 3 xs) [3;2;1] end ; (* less elements than the bound. *) ListLabels.iter (permut [1;2;3;4;5;6;7;8;9]) ~f:begin fun xs -> - Assert.equal ~msg:__LOC__ (List.take_n ~compare 12 xs) [1;2;3;4;5;6;7;8;9] + Assert.equal ~msg:__LOC__ (TzList.take_n ~compare 12 xs) [1;2;3;4;5;6;7;8;9] end ; (* with duplicates. *) ListLabels.iter (permut [1;2;3;3;4;5;5;5;6]) ~f:begin fun xs -> - Assert.equal ~msg:__LOC__ (List.take_n ~compare 3 xs) [5;5;6] + Assert.equal ~msg:__LOC__ (TzList.take_n ~compare 3 xs) [5;5;6] end ; ListLabels.iter (permut [1;2;3;3;4;5;5;5;6]) ~f:begin fun xs -> - Assert.equal ~msg:__LOC__ (List.take_n ~compare 5 xs) [4;5;5;5;6] + Assert.equal ~msg:__LOC__ (TzList.take_n ~compare 5 xs) [4;5;5;5;6] end ; - return () + Lwt.return_ok () -let tests : (string * (string -> unit tzresult Lwt.t)) list = [ +let tests : (string * (string -> (unit, Error.error list) result Lwt.t)) list = [ "take_n", test_take_n ; ] let () = - let module Test = Tezos_test_helpers.Test.Make(Error_monad) in - Test.run "utils." tests + Test.run "tzList." tests diff --git a/src/lib_stdlib_lwt/test/jbuild b/src/lib_stdlib_lwt/test/jbuild new file mode 100644 index 000000000..0140d96dd --- /dev/null +++ b/src/lib_stdlib_lwt/test/jbuild @@ -0,0 +1,27 @@ +(jbuild_version 1) + +(executables + ((names (test_lwt_pipe)) + (libraries (tezos-stdlib-lwt tezos-test-helpers)) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_test_helpers + -open Tezos_stdlib_lwt)))) + +(alias + ((name buildtest) + (deps (test_lwt_pipe.exe)))) + +(alias + ((name runtest_lwt_pipe) + (action (run ${exe:test_lwt_pipe.exe})))) + + +(alias + ((name runtest) + (deps ((alias runtest_lwt_pipe))))) + +(alias + ((name runtest_indent) + (deps ((glob_files *.ml) (glob_files *.mli))) + (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) diff --git a/test/utils/test_lwt_pipe.ml b/src/lib_stdlib_lwt/test/test_lwt_pipe.ml similarity index 73% rename from test/utils/test_lwt_pipe.ml rename to src/lib_stdlib_lwt/test/test_lwt_pipe.ml index 55a09f99f..2b9c06d4e 100644 --- a/test/utils/test_lwt_pipe.ml +++ b/src/lib_stdlib_lwt/test/test_lwt_pipe.ml @@ -1,3 +1,12 @@ +(**************************************************************************) +(* *) +(* Copyright (c) 2014 - 2017. *) +(* Dynamic Ledger Solutions, Inc. *) +(* *) +(* All rights reserved. No warranty, explicit or implicit, provided. *) +(* *) +(**************************************************************************) + open Lwt.Infix include Logging.Make (struct let name = "test-pipe" end) diff --git a/test/utils/jbuild b/test/utils/jbuild deleted file mode 100644 index 16d6dce9e..000000000 --- a/test/utils/jbuild +++ /dev/null @@ -1,47 +0,0 @@ -(jbuild_version 1) - -(executables - ((names (test_lwt_pipe - test_merkle - test_utils - test_mbytes_buffer)) - (libraries (tezos-base tezos-test-helpers)) - (flags (:standard -w -9-32 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_test_helpers)))) - -(alias - ((name buildtest) - (deps (test_lwt_pipe.exe - test_merkle.exe - test_utils.exe - test_mbytes_buffer.exe)))) - -(alias - ((name runtest_lwt_pipe) - (action (run ${exe:test_lwt_pipe.exe})))) - -(alias - ((name runtest_merkle) - (action (run ${exe:test_merkle.exe})))) - -(alias - ((name runtest_utils) - (action (run ${exe:test_utils.exe})))) - -(alias - ((name runtest_mbytes_buffer) - (action (run ${exe:test_mbytes_buffer.exe})))) - -(alias - ((name runtest) - (deps ((alias runtest_lwt_pipe) - (alias runtest_merkle) - (alias runtest_utils) - (alias runtest_mbytes_buffer))))) - -(alias - ((name runtest_indent) - (deps ((glob_files *.ml) (glob_files *.mli))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))