move getTime from frameworkConfig to runConfig (anticipating combinin… (

#132)

Summary:
…g TestFrameworks)
Pull Request resolved: #132

Differential Revision: D14569804

fbshipit-source-id: de0634eabb554e2d3e847f87377739ad427aa56b

src/rely/Rely.re

@@ -31,6 +31,7 @@ module Describe = {
   type describeConfig = {
     updateSnapshots: bool,
     snapshotDir: string,
+    getTime: unit => Time.t,
   };
 
   type describeUtils('ext) = {
@@ -149,7 +150,7 @@ module Make = (UserConfig: FrameworkConfig) => {
       open Test;
       open Describe;
       open RunConfig;
-      let startTime = UserConfig.config.getTime();
+      let startTime = config.getTime();
       let describeName = TestPath.(Describe(describePath) |> toString);
 
       let testHashes = state.testHashes;
@@ -310,7 +311,7 @@ module Make = (UserConfig: FrameworkConfig) => {
           let runTest = () => {
             let timingInfo =
               Util.time(
-                UserConfig.config.getTime,
+                config.getTime,
                 () => {
                   let _ =
                     switch (usersTest(testUtils)) {
@@ -424,7 +425,7 @@ module Make = (UserConfig: FrameworkConfig) => {
 
       let describeResult = {
         path: describePath,
-        endTime: Some(UserConfig.config.getTime()),
+        endTime: Some(config.getTime()),
         startTime: Some(startTime),
         describeResults: childDescribeResults^,
         testResults,
@@ -516,7 +517,7 @@ module Make = (UserConfig: FrameworkConfig) => {
   let run = (config: RunConfig.t) =>
     useIsRunning(() =>
       Util.withBacktrace(() => {
-        let startTime = UserConfig.config.getTime();
+        let startTime = config.getTime();
         let notifyReporters = f => List.iter(f, config.reporters);
         let reporterTestSuites =
           testSuites^
@@ -549,6 +550,7 @@ module Make = (UserConfig: FrameworkConfig) => {
                        ~config={
                          updateSnapshots: config.updateSnapshots,
                          snapshotDir: UserConfig.config.snapshotDir,
+                         getTime: config.getTime
                        },
                        ~state=acc.testRunState,
                        ~describePath=Terminal(name),

src/rely/Rely.rei

@@ -39,6 +39,7 @@ module RunConfig: {
   let onTestFrameworkFailure: (unit => unit, t) => t;
   let updateSnapshots: (bool, t) => t;
   let withReporters: (list(reporter), t) => t;
+  let internal_do_not_use_get_time: (unit => Time.t, t) => t;
 };
 
 module MatcherUtils: {
@@ -92,7 +93,6 @@ module TestFrameworkConfig: {
   type t;
   let initialize: requiredConfiguration => t;
   let withMaxNumberOfMockCalls: (int, t) => t;
-  let internal_do_not_use_get_time: (unit => Time.t, t) => t;
 };
 
 module type FrameworkConfig = {let config: TestFrameworkConfig.t;};

src/rely/RunConfig.re

@@ -16,6 +16,7 @@ module RunConfig = {
     updateSnapshots: bool,
     onTestFrameworkFailure: unit => unit,
     reporters: list(Reporter.t),
+    getTime: unit => Time.t,
   };
 
   let initialize = () => {
@@ -29,6 +30,7 @@ module RunConfig = {
         flush,
       }),
     ],
+    getTime: Clock.getTime,
   };
 
   type reporter =
@@ -58,6 +60,8 @@ module RunConfig = {
     {...config, reporters};
   };
 
+  let internal_do_not_use_get_time = (fn, cfg: t) => {...cfg, getTime: fn};
+
   let onTestFrameworkFailure = (onTestFrameworkFailure, config) => {
     ...config,
     onTestFrameworkFailure,

src/rely/TestFrameworkConfig.re

@@ -16,7 +16,6 @@ module TestFrameworkConfig = {
     snapshotDir: string,
     projectDir: string,
     maxNumMockCalls: int,
-    getTime: unit => Time.t,
   };
 
   type optionalConfiguration = {getTime: unit => Time.t};
@@ -25,11 +24,9 @@ module TestFrameworkConfig = {
     config => {
       snapshotDir: config.snapshotDir,
       projectDir: config.projectDir,
-      getTime: Clock.getTime,
       maxNumMockCalls: Mock.defaultNumMaxCalls,
     };
 
-  let internal_do_not_use_get_time = (fn, cfg: t) => {...cfg, getTime: fn};
   let withMaxNumberOfMockCalls = (num: int, cfg: t) => {
     ...cfg,
     maxNumMockCalls: num,

tests/TestRunnerOutputSnapshotTest.re

@@ -27,16 +27,6 @@ module MakeTestFramework = (SnapshotDir: SnapshotDir) : Rely.TestFramework =>
             ),
           projectDir: "",
         })
-        /* evil hack, default reporter not currently exposed and time can't be
-         * passed to reporters, setting time in the future by a second (which is longer
-         * than any tests should take so that when the terminal reporter calculates
-         * how long tests took to run it gets a negative number which gets "rounded"
-         * to < 1 ms. Come either virtual modules/the next major version we can fix this,
-         * until then, I think this is the most reasonable option to ensure our
-         * snapshots are consistent */
-        |> internal_do_not_use_get_time(() =>
-             Seconds(Unix.gettimeofday() +. 1000.)
-           )
       );
   });
 
@@ -78,7 +68,20 @@ let testRunnerOutputSnapshotTest =
               testFn(utils)
             );
             TestFramework.run(
-              Rely.RunConfig.(initialize() |> updateSnapshots(doUpdate)),
+              Rely.RunConfig.(
+                initialize()
+                |> updateSnapshots(doUpdate)
+                /* evil hack, default reporter not currently exposed and time can't be
+                 * passed to reporters, setting time in the future by a second (which is longer
+                 * than any tests should take so that when the terminal reporter calculates
+                 * how long tests took to run it gets a negative number which gets "rounded"
+                 * to < 1 ms. Come either virtual modules/the next major version we can fix this,
+                 * until then, I think this is the most reasonable option to ensure our
+                 * snapshots are consistent */
+                |> internal_do_not_use_get_time(() =>
+                     Seconds(Unix.gettimeofday() +. 1000.)
+                   )
+              ),
             );
             ();
           })

tests/__tests__/rely/TestSuiteRunner.re

@@ -19,10 +19,12 @@ let run = (testSuites: list(TestSuite.t), reporter: Rely.Reporter.t) => {
 
   testSuites
   |> List.map(TestSuite.toFunction)
-  |> List.iter(ts => ts(
-    ~describe=TestFramework.describe,
-    ~describeSkip=TestFramework.describeSkip,
-  ));
+  |> List.iter(ts =>
+       ts(
+         ~describe=TestFramework.describe,
+         ~describeSkip=TestFramework.describeSkip,
+       )
+     );
 
   TestFramework.run(
     Rely.RunConfig.(
@@ -39,7 +41,6 @@ let runWithCustomTime = (getTime, testSuites, reporter) => {
       let config =
         Rely.TestFrameworkConfig.(
           initialize({snapshotDir: "unused", projectDir: ""})
-          |> internal_do_not_use_get_time(getTime)
         );
     });
 
@@ -57,6 +58,7 @@ let runWithCustomTime = (getTime, testSuites, reporter) => {
       initialize()
       |> withReporters([Custom(reporter)])
       |> onTestFrameworkFailure(() => ())
+      |> internal_do_not_use_get_time(getTime)
     ),
   );
 };