Switched from OUnit to alcotest

20 files changed, 63 insertions, 59 deletions

diff --git a/lib/analysers/dependency.ml b/lib/analysers/dependency.ml
index 9dd4736..d0ea8b3 100644
--- a/lib/analysers/dependency.ml
+++ b/lib/analysers/dependency.ml
@@ -23,6 +23,7 @@ type key = {
   expression : Path.column Expression.t;
   columns : ImportContainers.IntSet.t Lazy.t;
 }
+[@@deriving show, eq]
 
 type t = {
   table : Table.t;
diff --git a/lib/analysers/dependency.mli b/lib/analysers/dependency.mli
index c89522a..bc761ae 100644
--- a/lib/analysers/dependency.mli
+++ b/lib/analysers/dependency.mli
@@ -1,9 +1,9 @@
 type t
 
 val get_process_order : ImportConf.Syntax.t -> t list
-(** Extract the file list to process, following the identified dependancies.
-    Try to load first the document which does not required another spreadsheet,
-    and keep going in the topological order  
+(** Extract the file list to process, following the identified dependancies. Try
+    to load first the document which does not required another spreadsheet, and
+    keep going in the topological order
 
     Raise [Unknown_source file] if a source is referenced but is not declared.
     The order matter : the exception will be raised in a source is referenced
@@ -13,28 +13,29 @@ val table : t -> ImportDataTypes.Table.t
 (** Get the table to proceed. *)
 
 val columns : t -> ImportContainers.IntSet.t
-(** A set of columns loaded in this table. Thoses columns may not need
-            reported in the final export. 
+(** A set of columns loaded in this table. Thoses columns may not need reported
+    in the final export.
 
-            Each column is identified by is index in the Excel document. 
+    Each column is identified by is index in the Excel document.
 
-            This set does not include the columns used in the keys. They can be
-            fetched with the [keys] function *)
+    This set does not include the columns used in the keys. They can be fetched
+    with the [keys] function *)
 
 type key = {
   name : string;  (** This is the name of the target table we are pointed to *)
   expression : ImportDataTypes.Path.column ImportExpression.T.t;
       (** The expression used as key *)
   columns : ImportContainers.IntSet.t Lazy.t;
-      (** The list of columns used in the key. All the columns are referenced
-            in the expression. We can have many columns used inside a single
-            key when a function is used (for example for joining multiple
-            columns into a single key)  *)
+      (** The list of columns used in the key. All the columns are referenced in
+          the expression. We can have many columns used inside a single key when
+          a function is used (for example for joining multiple columns into a
+          single key) *)
 }
+[@@deriving show, eq]
 (** This type describe the join key in a table. The name is the refering table
     using this key (the key name in the datable is key_"name" ), and the
     expression describe how to build the key. *)
 
 val keys : t -> key list
-(** [keys] is the list of columns pointed by another one. They are
-          considered as join key between the diffrent tables. *)
+(** [keys] is the list of columns pointed by another one. They are considered as
+    join key between the diffrent tables. *)
diff --git a/lib/analysers/dune b/lib/analysers/dune
index 1bbc30f..382dd6b 100755
--- a/lib/analysers/dune
+++ b/lib/analysers/dune
@@ -9,4 +9,8 @@
    importErrors

    tsort

  )

+ (preprocess (pps 

+     ppx_deriving.ord

+     ppx_deriving.show 

+     ppx_deriving.eq ))

 )

diff --git a/lib/configuration/dune b/lib/configuration/dune
index c29ba49..74ace87 100755
--- a/lib/configuration/dune
+++ b/lib/configuration/dune
@@ -11,9 +11,12 @@
    importExpression

    importErrors

  )

+ (preprocess (pps 

+   ppx_deriving.ord

+   ppx_deriving.show 

+   ppx_deriving.eq 

+ ))

  (foreign_stubs (language c) (names locale))

-

-(preprocess (pps ppx_deriving.ord))

 )

 

 (rule

diff --git a/lib/configuration/importConf.ml b/lib/configuration/importConf.ml
index 47f4ea4..2f56bd6 100644
--- a/lib/configuration/importConf.ml
+++ b/lib/configuration/importConf.ml
@@ -72,11 +72,5 @@ let get_dependancies_for_table : Syntax.t -> Table.t -> Syntax.Extern.t list =
             | Some v -> String.equal v source.name
             | None -> is_root))
 
-let print_path_expression t = ImportExpression.Repr.repr Path.repr t
-
-let print_extern t =
-  let toml = Syntax.Extern.toml_of_extern t in
-  Otoml.Printer.to_string toml
-
 let expression_from_string s =
   Read_conf.ExpressionParser.of_string Read_conf.ExpressionParser.path s
diff --git a/lib/configuration/importConf.mli b/lib/configuration/importConf.mli
index c88b0f1..9ddc40c 100644
--- a/lib/configuration/importConf.mli
+++ b/lib/configuration/importConf.mli
@@ -14,9 +14,5 @@ val get_table_for_name : Syntax.t -> string option -> Table.t
 val get_dependancies_for_table : Syntax.t -> Table.t -> Syntax.Extern.t list
 (** Get all the externals refered by the source *)
 
-val print_path_expression : Path.t ImportExpression.T.t -> string
-
 val expression_from_string :
   string -> (Path.t ImportExpression.T.t, string) result
-
-val print_extern : Syntax.Extern.t -> string
diff --git a/lib/configuration/syntax.ml b/lib/configuration/syntax.ml
index 253720e..ee47277 100644
--- a/lib/configuration/syntax.ml
+++ b/lib/configuration/syntax.ml
@@ -21,6 +21,7 @@ module Extern = struct
     allow_missing : bool;
     match_rule : string option;
   }
+  [@@deriving show, eq]
   (** Describe a relation beteween two tables *)
 
   let toml_of_extern extern =
@@ -28,7 +29,7 @@ module Extern = struct
       [
         ( "intern_key",
           Otoml.string
-          @@ ImportExpression.Repr.repr ~top:true Path.repr extern.intern_key );
+          @@ ImportExpression.Repr.repr ~top:true Path.show extern.intern_key );
         ( "extern_key",
           Otoml.string
           @@ ImportExpression.Repr.repr ~top:true
@@ -67,7 +68,7 @@ let repr t =
   let repr_expression_list l =
     Otoml.array
       (List.map l ~f:(fun v ->
-           Otoml.string (ImportExpression.Repr.repr ~top:true Path.repr v)))
+           Otoml.string (ImportExpression.Repr.repr ~top:true Path.show v)))
   in
 
   let sheet =
diff --git a/lib/containers/dune b/lib/containers/dune
index 46d0e24..70bbf0b 100755
--- a/lib/containers/dune
+++ b/lib/containers/dune
@@ -4,4 +4,8 @@
    importDataTypes

    importConf

  )

+ (preprocess (pps 

+     ppx_deriving.ord

+     ppx_deriving.show 

+     ppx_deriving.eq ))

 )

diff --git a/lib/containers/importContainers.ml b/lib/containers/importContainers.ml
index bf65ba4..6da8374 100644
--- a/lib/containers/importContainers.ml
+++ b/lib/containers/importContainers.ml
@@ -2,8 +2,7 @@ module Conf = ImportConf
 module Syntax = Conf.Syntax
 module Table = ImportDataTypes.Table
 
-(** This key is used to create the table of each externals in the
-    configuration. 
+(** This key is used to create the table of each externals in the configuration.
 
     This table allow to check if there are cycles between the references *)
 module KeyName : sig
@@ -49,13 +48,12 @@ end = struct
 end
 
 module Externals = MoreLabels.Map.Make (KeyName)
-module IntSet = MoreLabels.Set.Make (Int)
-
-let show_intSet set =
-  let b = Buffer.create 16 in
-  IntSet.iter
-    ~f:(fun v ->
-      Buffer.add_string b (string_of_int v);
-      Buffer.add_char b ',')
-    set;
-  Buffer.contents b
+
+module IntSet = struct
+  include MoreLabels.Set.Make (Int)
+
+  let pp : Format.formatter -> t -> unit =
+   fun format set ->
+    let iter' f = iter ~f in
+    Format.pp_print_iter iter' Format.pp_print_int format set
+end
diff --git a/lib/data_types/dune b/lib/data_types/dune
index e38310b..b735171 100644
--- a/lib/data_types/dune
+++ b/lib/data_types/dune
@@ -4,7 +4,8 @@
    importCSV
  )
 
- (preprocess (pps ppx_deriving.ord))
+ (preprocess (pps 
+     ppx_deriving.ord
+     ppx_deriving.show 
+     ppx_deriving.eq ))
  )
-
-
diff --git a/lib/data_types/path.ml b/lib/data_types/path.ml
index 6684b5a..0a87109 100644
--- a/lib/data_types/path.ml
+++ b/lib/data_types/path.ml
@@ -1,14 +1,14 @@
-type column = int [@@deriving ord]
+type column = int [@@deriving ord, show, eq]
 
 type t = {
   alias : string option;
       (* External file to load, when the information is missing, load in
-              the current file *)
+         the current file *)
   column : column;
 }
-[@@deriving ord]
+[@@deriving ord, show, eq]
 
-let repr { alias; column } =
+let show { alias; column } =
   let column_text = ImportCSV.Csv.column_to_string column in
   match alias with
   | None -> ":" ^ column_text
diff --git a/lib/data_types/table.ml b/lib/data_types/table.ml
index 82a7d95..2dd956b 100644
--- a/lib/data_types/table.ml
+++ b/lib/data_types/table.ml
@@ -5,6 +5,7 @@ type t = {
   tab : int;
   name : string;
 }
+[@@deriving show, eq]
 
 (** Get the internal name for the given table.
 
diff --git a/lib/data_types/types.ml b/lib/data_types/types.ml
index 37fd90f..866e923 100644
--- a/lib/data_types/types.ml
+++ b/lib/data_types/types.ml
@@ -5,11 +5,4 @@ type t =
   | None
   | Extern
   | Float
-
-let string_of_t : t -> string = function
-  | Number -> "Number"
-  | String -> "String"
-  | Bool -> "Bool"
-  | None -> "None"
-  | Extern -> "Extern"
-  | Float -> "Float"
+[@@deriving show, eq]
diff --git a/lib/errors/dune b/lib/errors/dune
index ab71219..c39f47f 100644
--- a/lib/errors/dune
+++ b/lib/errors/dune
@@ -1,6 +1,7 @@
 (library
  (name importErrors)
  (libraries 
+   ppx_deriving.runtime
    csv
    sqlite3
    importCSV
diff --git a/lib/errors/importErrors.ml b/lib/errors/importErrors.ml
index 97a6259..f888725 100644
--- a/lib/errors/importErrors.ml
+++ b/lib/errors/importErrors.ml
@@ -43,8 +43,8 @@ let repr_error = function
   | TypeError { expected; actual; expression; subset } ->
       Printf.sprintf
         "In this expression %s has type %s but %s was expected:\n%s" subset
-        (ImportDataTypes.Types.string_of_t actual)
-        (ImportDataTypes.Types.string_of_t expected)
+        (ImportDataTypes.Types.show actual)
+        (ImportDataTypes.Types.show expected)
         expression
   | Unknown_extension ext -> Printf.sprintf "Unknown file extension %s" ext
   | UnknowFunction name ->
diff --git a/lib/expression/dune b/lib/expression/dune
index 96e386e..d141b7b 100755
--- a/lib/expression/dune
+++ b/lib/expression/dune
@@ -6,4 +6,7 @@
    importDataTypes

    importErrors

  )

+ (preprocess (pps 

+    ppx_deriving.show 

+    ppx_deriving.eq ))

 )

diff --git a/lib/expression/t.ml b/lib/expression/t.ml
index 9ce21b8..fec8fd7 100644
--- a/lib/expression/t.ml
+++ b/lib/expression/t.ml
@@ -6,6 +6,7 @@ type 'a window =
   | Counter
   | Previous of 'a
   | Sum of 'a
+[@@deriving show, eq]
 
 type 'a t =
   | Empty
@@ -21,6 +22,7 @@ type 'a t =
   | BOperator of binary_operator * 'a t * 'a t
   | GEquality of binary_operator * 'a t * 'a t list
   | Function' of funct * 'a t list
+[@@deriving show, eq]
 
 and binary_operator =
   | Equal
diff --git a/lib/expression/t.mli b/lib/expression/t.mli
index 49ef3e7..4e1af55 100644
--- a/lib/expression/t.mli
+++ b/lib/expression/t.mli
@@ -19,6 +19,7 @@ type 'a t =
   | BOperator of binary_operator * 'a t * 'a t
   | GEquality of binary_operator * 'a t * 'a t list
   | Function' of funct * 'a t list
+[@@deriving show, eq]
 
 and binary_operator =
   | Equal
diff --git a/lib/sql/db.ml b/lib/sql/db.ml
index 0f06f15..f1aee8c 100644
--- a/lib/sql/db.ml
+++ b/lib/sql/db.ml
@@ -16,7 +16,7 @@ let reset = T.reset
 let insert_header = Header.insert_header
 let query_headers = Header.query_headers
 
-let with_db : string -> (Sqlite3.db -> unit T.result) -> unit T.result =
+let with_db : string -> (Sqlite3.db -> 'b T.result) -> 'b T.result =
  fun filename f ->
   let db = Sqlite3.db_open filename in
 
diff --git a/lib/sql/db.mli b/lib/sql/db.mli
index 478d762..91933c4 100644
--- a/lib/sql/db.mli
+++ b/lib/sql/db.mli
@@ -3,7 +3,7 @@ module Syntax = ImportConf.Syntax
 type 'a t
 type 'a result = ('a, exn) Result.t
 
-val with_db : string -> ('a t -> unit result) -> unit result
+val with_db : string -> ('a t -> 'b result) -> 'b result
 
 val check_table_schema : 'a t -> ImportAnalyser.Dependency.t -> bool result
 (** Check if a table with the same structure already exists in the database.