Update tests for new structure (#5)

library/Reenv.re

@@ -6,6 +6,8 @@ let t_of_in_channel = (t, ic) => {
   |> List.map(String.split_on_char('='))
   |> List.map(Util.escapeEquals)
   |> List.iter(((key, value)) => Hashtbl.replace(t, key, value));
+
+  t;
 };
 
 let array_of_t: t => array(string) =
@@ -14,10 +16,15 @@ let array_of_t: t => array(string) =
     |> Array.of_list;
   };
 
+let make = (): t => Hashtbl.create(64);
+
+let get_opt = (key, t) => Hashtbl.find_opt(t, key);
+let get_exn = (key, t) => Hashtbl.find(t, key);
+
 let main = (~envFiles, ~command, argv) => {
   let programArgs = Array.of_list([command, ...argv]);
 
-  let t: t = Hashtbl.create(64);
+  let t: t = make();
 
   Unix.environment()
   |> Array.map(s =>

library/Reenv.rei

@@ -1,5 +1,14 @@
+module Util = Util;
+
 type t;
 
+let make: unit => t;
+
+let get_opt: (string, t) => option(string);
+let get_exn: (string, t) => string;
+
 let array_of_t: t => array(string);
 
 let main: (~envFiles: list(string), ~command: string, list(string)) => 'a;
+
+let t_of_in_channel: (t, in_channel) => t;

library/Util.rei

@@ -0,0 +1,6 @@
+let readUntilEndOfFile:
+  (~previousLines: list(string)=?, in_channel) => list(string);
+
+let trimCitation: string => string;
+
+let escapeEquals: list(string) => (string, string);

test/DotenvCompliance.re

@@ -18,63 +18,51 @@ describe("dotenv compliance", utils => {
   utils.test("BASIC=basic is same as BASIC=\"basic\"", ({expect}) => {
     let env =
       open_in_bin("./fixtures/.env.quotes")
-      |> Reenv.tOfInChannel
-      |> Reenv.arrayOft;
+      |> Reenv.t_of_in_channel(Reenv.make())
+      |> Reenv.get_exn("BASIC");
 
-    let first = env[0];
-    let second = env[1];
-
-    expect.string(first).toEqual(second);
+    expect.string(env).toEqual("basic");
   });
 
   utils.test(
     "empty values become empty strings (EMPTY= becomes EMPTY=\"\")",
     ({expect}) => {
     let env =
       open_in_bin("./fixtures/.env.empty")
-      |> Reenv.tOfInChannel
-      |> Reenv.arrayOft;
-
-    let first = env[0];
-    let second = env[1];
+      |> Reenv.t_of_in_channel(Reenv.make())
+      |> Reenv.get_exn("EMPTY");
 
-    expect.string(first).toEqual(second);
+    expect.string(env).toEqual("");
   });
 
   utils.test(
     "single and double quoted values are escaped (SINGLE_QUOTE='quoted' == SINGLE_QUOTE=\"quoted\")",
     ({expect}) => {
       let env =
         open_in_bin("./fixtures/.env.single_quotes")
-        |> Reenv.tOfInChannel
-        |> Reenv.arrayOft;
+        |> Reenv.t_of_in_channel(Reenv.make())
+        |> Reenv.get_exn("SINGLE_QUOTE");
 
-      let first = env[0];
-      let second = env[1];
-
-      expect.string(first).toEqual(second);
+      expect.string(env).toEqual("quoted");
     },
   );
 
   utils.test("whitespace is removed from both ends of the value", ({expect}) => {
     let env =
       open_in_bin("./fixtures/.env.trim")
-      |> Reenv.tOfInChannel
-      |> Reenv.arrayOft;
-
-    let first = env[0];
-    let second = env[1];
+      |> Reenv.t_of_in_channel(Reenv.make())
+      |> Reenv.get_exn("TRIM");
 
-    expect.string(first).toEqual(second);
+    expect.string(env).toEqual("trim");
   });
 
   utils.test(
     "inner quotes are maintained (think JSON) (JSON={\"foo\": \"bar\"} becomes {JSON:\"{\\\"foo\\\": \\\"bar\\\"}\")",
     ({expect}) => {
       let env =
         open_in_bin("./fixtures/.env.json")
-        |> Reenv.tOfInChannel
-        |> Reenv.arrayOft;
+        |> Reenv.t_of_in_channel(Reenv.make())
+        |> Reenv.array_of_t;
 
       let first = env[0];
 
@@ -85,7 +73,7 @@ describe("dotenv compliance", utils => {
   utils.test("new lines are expanded", ({expect}) => {
     let env =
       open_in_bin("./fixtures/.env.new_line")
-      |> Reenv.tOfInChannel
+      |> Reenv.t_of_in_channel(Reenv.make())
       |> Reenv.array_of_t;
 
     let first = env[0];

test/UtilsTest.re

@@ -13,9 +13,10 @@ describe("readUntilEndOfFile", utils =>
   })
 );
 
-
-describe("escapeEquals", (utils) => {
+describe("escapeEquals", utils =>
   utils.test("works as expected", ({expect}) => {
-    expect.string(Reenv.Util.escapeEquals(["test", "test", "test"])).toEqual("test=test=test");
-  });
-})
+    let (key, value) = Reenv.Util.escapeEquals(["test", "test", "test"]);
+    expect.string(key).toEqual("test");
+    expect.string(value).toEqual("test=test");
+  })
+);

test/fixtures/.env.empty

@@ -1,2 +1 @@
-EMPTY=""
 EMPTY=

test/fixtures/.env.quotes

@@ -1,2 +1 @@
-BASIC=basic
 BASIC="basic"

test/fixtures/.env.single_quotes

@@ -1,2 +1 @@
-SINGLE_QUOTE="quoted"
 SINGLE_QUOTE='quoted'

test/fixtures/.env.trim

@@ -1,2 +1 @@
 TRIM=" trim "
-TRIM="trim"