refactor: Remove testing.loadMem (#4857)

* refactor: Remove testing.loadMem I have not found anyone overriding this and I am not sure what such an override would do as `csv.from` already loads from memory. So I think we can just remove this entirely * chore: Don't use testing.loadMem in doc tests
influxdata · Jun 9, 2022 · 1785418 · 1785418
1 parent 9501c99
commit 1785418
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 86 deletions.
diff --git a/libflux/go/libflux/buildinfo.gen.go b/libflux/go/libflux/buildinfo.gen.go
diff --git a/semantic/ast_test.go b/semantic/ast_test.go
@@ -103,7 +103,7 @@ my_value
 			name: "option statement for subpackage",
 			s: `import c "csv"
 import "testing"
-option testing.loadMem = (csv) => c.from(csv: csv)
+option testing.load = (tables) => tables
 `,
 		},
 		{

diff --git a/stdlib/contrib/bonitoo-io/tickscript/alert_test.flux b/stdlib/contrib/bonitoo-io/tickscript/alert_test.flux
@@ -69,7 +69,7 @@ tickscript_alert = (table=<-) =>
         |> drop(columns: ["_time"])
 
 testcase tickscript_alert {
-    want = testing.loadMem(csv: outData)
+    want = csv.from(csv: outData)
     got = csv.from(csv: inData) |> testing.load() |> tickscript_alert()
 
     testing.diff(want: want, got: got) |> yield()

diff --git a/stdlib/contrib/bonitoo-io/tickscript/alert_with_topic_test.flux b/stdlib/contrib/bonitoo-io/tickscript/alert_with_topic_test.flux
@@ -70,7 +70,7 @@ tickscript_alert = (table=<-) =>
         |> drop(columns: ["_time"])
 
 testcase tickscript_alert_with_topic {
-    want = testing.loadMem(csv: outData)
+    want = csv.from(csv: outData)
     got = csv.from(csv: inData) |> testing.load() |> tickscript_alert()
 
     testing.diff(want: want, got: got) |> yield()

diff --git a/stdlib/contrib/bonitoo-io/tickscript/deadman_threshold_test.flux b/stdlib/contrib/bonitoo-io/tickscript/deadman_threshold_test.flux
@@ -60,7 +60,7 @@ tickscript_deadman = (table=<-) =>
         |> drop(columns: ["_time"])
 
 testcase tickscript_deadman_threshold {
-    want = testing.loadMem(csv: outData)
+    want = csv.from(csv: outData)
     got = csv.from(csv: inData) |> testing.load() |> tickscript_deadman()
 
     testing.diff(want: want, got: got) |> yield()

diff --git a/stdlib/experimental/oee/apq_test.flux b/stdlib/experimental/oee/apq_test.flux
@@ -30,7 +30,7 @@ outData =
 
 testcase APQ {
     got =
-        testing.loadMem(csv: inData)
+        csv.from(csv: inData)
             |> range(start: 2021-03-22T00:00:00Z, stop: 2021-03-22T04:00:00Z)
             |> oee.APQ(runningState: "running", plannedTime: 8h, idealCycleTime: 30s)
             |> drop(columns: ["_start", "_stop"])

diff --git a/stdlib/experimental/oee/computeapq_test.flux b/stdlib/experimental/oee/computeapq_test.flux
@@ -53,14 +53,14 @@ outData =
 ,,0,2021-03-22T04:00:00Z,0.375,0.24583333333333332,0.6666666666666666,0.9833333333333333,10800000000000
 "
 productionEvents =
-    testing.loadMem(csv: productionData)
+    csv.from(csv: productionData)
         |> range(start: 2021-03-22T00:00:00Z, stop: 2021-03-22T04:00:00Z)
 partEvents =
-    testing.loadMem(csv: partData)
+    csv.from(csv: partData)
         |> range(start: 2021-03-22T00:00:00Z, stop: 2021-03-22T04:00:00Z)
 
 testcase computeAPQ {
-    table = testing.loadMem(csv: inData)
+    table = csv.from(csv: inData)
     got =
         oee.computeAPQ(
             productionEvents: productionEvents,

diff --git a/stdlib/experimental/table/fill_test.flux b/stdlib/experimental/table/fill_test.flux
@@ -2,6 +2,7 @@ package table_test
 
 
 import "array"
+import "csv"
 import "planner"
 import "testing"
 import "testing/expect"
@@ -104,7 +105,7 @@ loadData = () =>
 
 testcase window {
         want =
-            testing.loadMem(
+            csv.from(
                 csv:
                     "
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,string,string,double,string
@@ -237,7 +238,7 @@ test_idempotent =
     () =>
         {
             want =
-                testing.loadMem(
+                csv.from(
                     csv:
                         "
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,string,string,double,string
@@ -282,7 +283,7 @@ testcase idempotent_planner_rule {
 
 testcase fill_unknown_column {
         want =
-            testing.loadMem(
+            csv.from(
                 csv:
                     "
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,string,string,double,string

diff --git a/stdlib/internal/debug/debug_test.flux b/stdlib/internal/debug/debug_test.flux
@@ -38,13 +38,13 @@ input = () =>
 
 testcase slurp {
     got = input() |> debug.slurp()
-    want = testing.loadMem(csv: inData)
+    want = csv.from(csv: inData)
 
     testing.diff(got, want) |> yield()
 }
 testcase sink {
     got = input() |> debug.sink()
-    want = testing.loadMem(csv: inData) |> filter(fn: (r) => false)
+    want = csv.from(csv: inData) |> filter(fn: (r) => false)
 
     testing.diff(got, want) |> yield()
 }

diff --git a/stdlib/planner/group_max_test.flux b/stdlib/planner/group_max_test.flux
@@ -39,7 +39,7 @@ testcase group_max_bare {
 ,,0,2018-05-22T19:53:26Z,system,host.local,load4,1.77
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_max_bare)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_max_bare)) |> yield()
     }
 
 input_host =
@@ -79,7 +79,7 @@ testcase group_max_bare_host {
 ,,2,2018-05-22T19:53:36Z,system,host.local,load4,1.78
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_max_bare)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_max_bare)) |> yield()
     }
 
 input_field =
@@ -131,7 +131,7 @@ testcase group_max_bare_field {
 ,,2,2018-05-22T19:00:00Z,2018-05-24T00:00:00Z,hostC,load5,1.95
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_max_bare)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_max_bare)) |> yield()
     }
 testcase group_max_window {
         result =
@@ -151,7 +151,7 @@ testcase group_max_window {
 ,,0,2018-05-22T19:53:26Z,2018-05-23T00:00:00Z,2018-05-22T19:53:26Z,system,host.local,load4,1.77
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_max_window)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_max_window)) |> yield()
     }
 testcase group_max_agg_window {
         result =
@@ -169,7 +169,7 @@ testcase group_max_agg_window {
 ,,0,2018-05-22T19:53:26Z,2018-05-24T00:00:00Z,2018-05-23T00:00:00Z,system,host.local,load1,1.83
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_max_agg_window)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_max_agg_window)) |> yield()
     }
 testcase group_max_agg_window_empty {
         result =
@@ -193,5 +193,5 @@ testcase group_max_agg_window_empty {
 ,,2,2018-05-22T19:53:26Z,2018-05-24T00:00:00Z,2018-05-24T00:00:00Z,load4,
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_max_agg_window_empty)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_max_agg_window_empty)) |> yield()
     }
diff --git a/stdlib/planner/group_min_max_table_test.flux b/stdlib/planner/group_min_max_table_test.flux
@@ -109,7 +109,7 @@ testcase group_min_table {
 ,,2,2019-11-25T00:00:00Z,m0,f0,a-2,b-0,1.0
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_min_table)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_min_table)) |> yield()
     }
 testcase group_max_table {
         result =
@@ -130,7 +130,7 @@ testcase group_max_table {
 ,,2,2019-11-25T00:00:30Z,m0,f0,a-2,b-1,8.0
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_max_table)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_max_table)) |> yield()
     }
 testcase group_no_agg_table {
         result =
@@ -220,5 +220,5 @@ testcase group_no_agg_table {
 ,,2,2019-11-25T00:01:50Z,m0,f0,a-2,b-1,8.0
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_no_agg_table)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_no_agg_table)) |> yield()
     }
diff --git a/stdlib/planner/group_min_test.flux b/stdlib/planner/group_min_test.flux
@@ -38,7 +38,7 @@ testcase group_min_bare {
 ,,0,2018-05-22T19:53:26Z,system,host.local,load4,1.77
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_min_bare)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_min_bare)) |> yield()
     }
 
 input_host =
@@ -78,7 +78,7 @@ testcase group_min_bare_host {
 ,,2,2018-05-22T19:53:26Z,system,host.local,load4,1.77
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_min_bare)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_min_bare)) |> yield()
     }
 
 input_field =
@@ -130,7 +130,7 @@ testcase group_min_bare_field {
 ,,2,2018-05-22T19:00:00Z,2018-05-24T00:00:00Z,hostC,load1,1.89
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_min_bare)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_min_bare)) |> yield()
     }
 testcase group_min_window {
         result =
@@ -150,7 +150,7 @@ testcase group_min_window {
 ,,0,2018-05-22T19:53:26Z,2018-05-23T00:00:00Z,2018-05-22T19:53:26Z,system,host.local,load4,1.77
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_min_window)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_min_window)) |> yield()
     }
 testcase group_min_agg_window {
         result =
@@ -168,7 +168,7 @@ testcase group_min_agg_window {
 ,,0,2018-05-22T19:53:26Z,2018-05-24T00:00:00Z,2018-05-23T00:00:00Z,system,host.local,load1,1.63
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_min_agg_window)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_min_agg_window)) |> yield()
     }
 testcase group_min_agg_window_empty {
         result =
@@ -192,5 +192,5 @@ testcase group_min_agg_window_empty {
 ,,2,2018-05-22T19:53:26Z,2018-05-24T00:00:00Z,2018-05-24T00:00:00Z,load4,
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_min_agg_window_empty)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_min_agg_window_empty)) |> yield()
     }
diff --git a/stdlib/testing/testing.flux b/stdlib/testing/testing.flux
@@ -230,37 +230,6 @@ option loadStorage = (csv) =>
 //
 option load = (tables=<-) => tables
 
-// loadMem loads annotated CSV test data from memory to emulate query results
-// returned by Flux.
-//
-// ## Parameters
-// - csv: Annotated CSV data to load.
-//
-// ## Examples
-//
-// ### Load annotated CSV as if returned by Flux
-// ```
-// import "testing"
-//
-// csvData =
-//     "
-// #datatype,string,long,string,dateTime:RFC3339,string,double
-// #group,false,false,true,false,true,false
-// #default,_result,,,,,
-// ,result,table,_measurement,_time,_field,_value
-// ,,0,m,2021-01-01T00:00:00Z,t,1.2
-// ,,0,m,2021-01-02T00:00:00Z,t,1.4
-// ,,0,m,2021-01-03T00:00:00Z,t,2.2
-// "
-//
-// testing.loadMem(csv: csvData)
-// ```
-//
-// ## Metadata
-// introduced: 0.20.0
-//
-option loadMem = (csv) => c.from(csv: csv)
-
 // inspect returns information about a test case.
 //
 // ## Parameters
@@ -297,7 +266,7 @@ option loadMem = (csv) => c.from(csv: csv)
 //         |> range(start: 2021-01-01T00:00:00Z, stop: 2021-01-03T01:00:00Z)
 //         |> sum()
 //
-// test _sum = () => ({input: testing.loadStorage(csv: inData), want: testing.loadMem(csv: outData), fn: t_sum})
+// test _sum = () => ({input: csv.from(csv: inData), want: csv.from(csv: outData), fn: t_sum})
 //
 // testing.inpsect(case: _sum)
 //
@@ -336,6 +305,7 @@ inspect = (case) => {
 //
 // ### Define and execute a test case
 // ```
+// import "csv"
 // import "testing"
 //
 // inData =
@@ -363,7 +333,7 @@ inspect = (case) => {
 //         |> range(start: 2021-01-01T00:00:00Z, stop: 2021-01-03T01:00:00Z)
 //         |> sum()
 //
-// test _sum = () => ({input: testing.loadStorage(csv: inData), want: testing.loadMem(csv: outData), fn: t_sum})
+// test _sum = () => ({input: csv.from(csv: inData), want: csv.from(csv: outData), fn: t_sum})
 //
 // testing.run(case: _sum)
 // ```
@@ -389,6 +359,7 @@ run = (case) => {
 // profilers to measure query performance.
 //
 // ```
+// import "csv"
 // import "testing"
 // import "profiler"
 //
@@ -419,7 +390,7 @@ run = (case) => {
 //         |> range(start: 2021-01-01T00:00:00Z, stop: 2021-01-03T01:00:00Z)
 //         |> sum()
 //
-// test _sum = () => ({input: testing.loadStorage(csv: inData), want: testing.loadMem(csv: outData), fn: t_sum})
+// test _sum = () => ({input: csv.from(csv: inData), want: csv.from(csv: outData), fn: t_sum})
 //
 // testing.benchmark(case: _sum)
 // ```

diff --git a/stdlib/universe/join_test.flux b/stdlib/universe/join_test.flux
@@ -50,7 +50,7 @@ testcase join_base {
             |> testing.load()
             |> range(start: 2018-05-22T19:53:00Z, stop: 2018-05-22T19:55:00Z)
             |> drop(columns: ["_start", "_stop"])
-    want = testing.loadMem(csv: outData)
+    want = csv.from(csv: outData)
     left =
         input
             |> filter(fn: (r) => r.user == "user1")

diff --git a/stdlib/universe/limit_offset_test.flux b/stdlib/universe/limit_offset_test.flux
@@ -61,7 +61,7 @@ input = () =>
 
 testcase limit_offset {
     want = input()
-    got = testing.loadMem(csv: outData)
+    got = csv.from(csv: outData)
 
     testing.diff(want: want, got: got) |> yield()
 }
diff --git a/stdlib/universe/limit_test.flux b/stdlib/universe/limit_test.flux
@@ -57,7 +57,7 @@ input = () =>
 
 testcase limit_1 {
     want = input()
-    got = testing.loadMem(csv: outData)
+    got = csv.from(csv: outData)
 
     testing.diff(want: want, got: got) |> yield()
 }
diff --git a/stdlib/universe/merge_filter_test.flux b/stdlib/universe/merge_filter_test.flux
@@ -41,7 +41,7 @@ merge_filter_fn = () =>
 //testcase merge_filter {
 //    expect.planner(rules: ["MergeFiltersRule": 1])
 //    result = merge_filter_fn()
-//    testing.diff(got: result, want: testing.loadMem(csv: output))
+//    testing.diff(got: result, want: csv.from(csv: output))
 //}
 testcase merge_filter_flag_off {
     option planner.disableLogicalRules = ["MergeFiltersRule"]
@@ -50,5 +50,5 @@ testcase merge_filter_flag_off {
 
     result = merge_filter_fn()
 
-    testing.diff(got: result, want: testing.loadMem(csv: output))
+    testing.diff(got: result, want: csv.from(csv: output))
 }
diff --git a/stdlib/universe/pivot_table_test.flux b/stdlib/universe/pivot_table_test.flux
@@ -79,5 +79,5 @@ testcase pivot_table {
 ,,1,2018-05-22T19:53:26Z,2030-01-01T00:00:00Z,2018-05-22T19:54:16Z,system,host.local,1.84,1.97,93
 "
 
-        testing.diff(got: result, want: testing.loadMem(csv: out_fields)) |> yield()
+        testing.diff(got: result, want: csv.from(csv: out_fields)) |> yield()
     }
diff --git a/stdlib/universe/yield_test.flux b/stdlib/universe/yield_test.flux
@@ -46,7 +46,7 @@ testcase yield {
             |> sample(n: 2, pos: 1)
             |> yield(name: "2: 2nd row")
             |> yield(name: "5")
-    want = testing.loadMem(csv: outData) |> yield(name: "6")
+    want = csv.from(csv: outData) |> yield(name: "6")
 
     testing.diff(got, want)
 }