Added to_arrow() tests and re-enabled tests for asm.js

texodus · texodus · commit 7bd5e1d68230 · 2019-02-18T21:07:42.000-05:00
diff --git a/packages/perspective/bench/js/bench.js b/packages/perspective/bench/js/bench.js
@@ -16,7 +16,7 @@ const LIMIT = args.indexOf("--limit");
 
 const multi_template = (xs, ...ys) => ys[0].map((y, i) => [y, xs.reduce((z, x, ix) => (ys[ix] ? z + x + ys[ix][i] : z + x), "")]);
 
-const UNPKG_VERSIONS = ["0.2.11", "0.2.10", "0.2.9", "0.2.8", "0.2.7", "0.2.6", "0.2.5", "0.2.4", "0.2.3", "0.2.2", "0.2.1", "0.2.0"];
+const UNPKG_VERSIONS = ["0.2.15", "0.2.12", "0.2.11", "0.2.10", "0.2.9", "0.2.8", "0.2.7", "0.2.6", "0.2.5", "0.2.4", "0.2.3", "0.2.2", "0.2.1", "0.2.0"];
 const UNPKG_URLS = multi_template`https://unpkg.com/@jpmorganchase/perspective@${UNPKG_VERSIONS}/build/perspective.js`;
 
 const OLD_FORMAT_UNPKG_VERSIONS = ["0.2.0-beta.3"];
diff --git a/packages/perspective/bench/js/browser_runtime.js b/packages/perspective/bench/js/browser_runtime.js
@@ -144,6 +144,7 @@ async function* run_all_cases() {
                 yield* run_view_cases(table, config);
                 yield* run_to_format_cases(table, config, "to_json");
                 yield* run_to_format_cases(table, config, "to_columns");
+                yield* run_to_format_cases(table, config, "to_arrow");
             }
         }
     }
diff --git a/packages/perspective/test/js/constructors.js b/packages/perspective/test/js/constructors.js
@@ -141,7 +141,7 @@ var data_6 = [{x: "š"}];
 
 var int_float_data = [{int: 1, float: 2.25}, {int: 2, float: 3.5}, {int: 3, float: 4.75}, {int: 4, float: 5.25}];
 var int_float_string_data = [{int: 1, float: 2.25, string: "a"}, {int: 2, float: 3.5, string: "b"}, {int: 3, float: 4.75, string: "c"}, {int: 4, float: 5.25, string: "d"}];
-var datetime_data = [{datetime: +new Date(), int: 1}, {datetime: +new Date(), int: 1}, {datetime: +new Date(), int: 2}, {datetime: +new Date(), int: 2}];
+var datetime_data = [{datetime: new Date(), int: 1}, {datetime: new Date(), int: 1}, {datetime: new Date(), int: 2}, {datetime: new Date(), int: 2}];
 
 // utility for checking typed arrays
 function validate_typed_array(typed_array, column_data) {
@@ -207,7 +207,7 @@ module.exports = perspective => {
             var table = perspective.table(int_float_data);
             var view = table.view();
             const result = await view.col_to_js_typed_array("int");
-            expect(result.byteLength).toEqual(16);
+            expect(result[0].byteLength).toEqual(16);
             view.delete();
             table.delete();
         });
@@ -216,16 +216,18 @@ module.exports = perspective => {
             var table = perspective.table(int_float_data);
             var view = table.view();
             const result = await view.col_to_js_typed_array("float");
-            expect(result.byteLength).toEqual(32);
+            expect(result[0].byteLength).toEqual(32);
             view.delete();
             table.delete();
         });
 
         it("Datetime, 0-sided view", async function() {
             var table = perspective.table(datetime_data);
             var view = table.view();
+            var schema = await view.schema();
+            expect(schema).toEqual({datetime: "datetime", int: "integer"});
             const result = await view.col_to_js_typed_array("datetime");
-            expect(result.byteLength).toEqual(32);
+            expect(result[0].byteLength).toEqual(32);
             view.delete();
             table.delete();
         });
@@ -238,7 +240,7 @@ module.exports = perspective => {
             });
             const result = await view.col_to_js_typed_array("int");
             // should include aggregate row
-            expect(result.byteLength).toEqual(20);
+            expect(result[0].byteLength).toEqual(20);
             view.delete();
             table.delete();
         });
@@ -250,7 +252,7 @@ module.exports = perspective => {
                 aggregate: [{op: "sum", column: "int"}, {op: "sum", column: "float"}]
             });
             const result = await view.col_to_js_typed_array("float");
-            expect(result.byteLength).toEqual(40);
+            expect(result[0].byteLength).toEqual(40);
             view.delete();
             table.delete();
         });
@@ -262,7 +264,7 @@ module.exports = perspective => {
                 aggregate: [{op: "high", column: "datetime"}]
             });
             const result = await view.col_to_js_typed_array("datetime");
-            expect(result.byteLength).toEqual(24);
+            expect(result[0].byteLength).toEqual(24);
             view.delete();
             table.delete();
         });
@@ -275,7 +277,7 @@ module.exports = perspective => {
                 aggregate: [{op: "sum", column: "int"}, {op: "sum", column: "float"}]
             });
             const result = await view.col_to_js_typed_array("3.5|int");
-            expect(result.byteLength).toEqual(20);
+            expect(result[0].byteLength).toEqual(20);
             view.delete();
             table.delete();
         });
@@ -288,7 +290,7 @@ module.exports = perspective => {
                 aggregate: [{op: "sum", column: "int"}, {op: "sum", column: "float"}]
             });
             const result = await view.col_to_js_typed_array("3.5|float");
-            expect(result.byteLength).toEqual(40);
+            expect(result[0].byteLength).toEqual(40);
             view.delete();
             table.delete();
         });
@@ -298,7 +300,7 @@ module.exports = perspective => {
             var view = table.view({column_pivot: ["float"]});
             const result = await view.col_to_js_typed_array("3.5|int");
             // bytelength should not include the aggregate row
-            expect(result.byteLength).toEqual(16);
+            expect(result[0].byteLength).toEqual(16);
             view.delete();
             table.delete();
         });
@@ -307,31 +309,22 @@ module.exports = perspective => {
             var table = perspective.table(int_float_data);
             var view = table.view({column_pivot: ["float"]});
             const result = await view.col_to_js_typed_array("3.5|float");
-            expect(result.byteLength).toEqual(32);
-            view.delete();
-            table.delete();
-        });
-
-        it("Undefined for non-int/float columns", async function() {
-            var table = perspective.table(int_float_string_data);
-            var view = table.view();
-            const result = await view.col_to_js_typed_array("string");
-            expect(result).toBeUndefined();
+            expect(result[0].byteLength).toEqual(32);
             view.delete();
             table.delete();
         });
 
         it("Symmetric output with to_columns, 0-sided", async function() {
-            let table = perspective.table(int_float_string_data);
+            let table = perspective.table(int_float_data);
             let view = table.view();
             let cols = await view.to_columns();
 
             for (let col in cols) {
                 let ta = await view.col_to_js_typed_array(col);
                 let column = cols[col];
                 if (ta !== undefined && column !== undefined) {
-                    expect(ta.length).toEqual(cols[col].length);
-                    expect(validate_typed_array(ta, cols[col])).toEqual(true);
+                    expect(ta[0].length).toEqual(cols[col].length);
+                    expect(validate_typed_array(ta[0], cols[col])).toEqual(true);
                 }
             }
             view.delete();
@@ -350,8 +343,8 @@ module.exports = perspective => {
                 let ta = await view.col_to_js_typed_array(col);
                 let column = cols[col];
                 if (ta !== undefined && column !== undefined) {
-                    expect(ta.length).toEqual(cols[col].length);
-                    expect(validate_typed_array(ta, cols[col])).toEqual(true);
+                    expect(ta[0].length).toEqual(cols[col].length);
+                    expect(validate_typed_array(ta[0], cols[col])).toEqual(true);
                 }
             }
             view.delete();
diff --git a/packages/perspective/test/js/perspective.spec.js b/packages/perspective/test/js/perspective.spec.js
@@ -13,9 +13,9 @@ const RUNTIMES = {
     NODE: node_perspective
 };
 
-if (!process.env.PSP_DEBUG && window.perspective) {
+if (!process.env.PSP_DEBUG) {
     require("../../build/perspective.asmjs.worker.js");
-    RUNTIMES.ASMJS = window.perspective;
+    RUNTIMES.ASMJS = global.perspective;
 }
 
 const clear_tests = require("./clear.js");
@@ -24,6 +24,7 @@ const pivot_tests = require("./pivots.js");
 const update_tests = require("./updates.js");
 const filter_tests = require("./filters.js");
 const internal_tests = require("./internal.js");
+const toformat_tests = require("./to_format.js");
 
 describe("perspective.js", function() {
     Object.keys(RUNTIMES).forEach(function(mode) {
@@ -33,6 +34,7 @@ describe("perspective.js", function() {
             pivot_tests(RUNTIMES[mode]);
             update_tests(RUNTIMES[mode]);
             filter_tests(RUNTIMES[mode]);
+            toformat_tests(RUNTIMES[mode]);
             internal_tests(RUNTIMES[mode], mode);
         });
     });
diff --git a/packages/perspective/test/js/to_format.js b/packages/perspective/test/js/to_format.js
@@ -0,0 +1,103 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2017, the Perspective Authors.
+ *
+ * This file is part of the Perspective library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
+
+var int_float_string_data = [
+    {int: 1, float: 2.25, string: "a", datetime: new Date()},
+    {int: 2, float: 3.5, string: "b", datetime: new Date()},
+    {int: 3, float: 4.75, string: "c", datetime: new Date()},
+    {int: 4, float: 5.25, string: "d", datetime: new Date()}
+];
+
+module.exports = perspective => {
+    describe("to_arrow()", function() {
+        it("Transitive arrow output 0-sided", async function() {
+            let table = perspective.table(int_float_string_data);
+            let view = table.view();
+            let arrow = await view.to_arrow();
+            let json2 = await view.to_json();
+            expect(arrow.byteLength).toEqual(940);
+
+            let table2 = perspective.table(arrow);
+            let view2 = table2.view();
+            let json = await view2.to_json();
+            expect(json).toEqual(json2);
+
+            view2.delete();
+            table2.delete();
+            view.delete();
+            table.delete();
+        });
+
+        it("Transitive arrow output 1-sided", async function() {
+            let table = perspective.table(int_float_string_data);
+            let view = table.view({row_pivot: ["string"]});
+            let json = await view.to_json();
+            let arrow = await view.to_arrow();
+            let table2 = perspective.table(arrow);
+            let view2 = table2.view();
+            let json2 = await view2.to_json();
+
+            expect(json2).toEqual(
+                json.map(x => {
+                    delete x["__ROW_PATH__"];
+                    return x;
+                })
+            );
+
+            view2.delete();
+            table2.delete();
+            view.delete();
+            table.delete();
+        });
+
+        it("Transitive arrow output 2-sided", async function() {
+            let table = perspective.table(int_float_string_data);
+            let view = table.view({row_pivot: ["string"], col_pivot: ["int"]});
+            let json = await view.to_json();
+            let arrow = await view.to_arrow();
+            let table2 = perspective.table(arrow);
+            let view2 = table2.view();
+            let json2 = await view2.to_json();
+
+            expect(json2).toEqual(
+                json.map(x => {
+                    delete x["__ROW_PATH__"];
+                    return x;
+                })
+            );
+
+            view2.delete();
+            table2.delete();
+            view.delete();
+            table.delete();
+        });
+
+        it("Transitive arrow output 2-sided column only", async function() {
+            let table = perspective.table(int_float_string_data);
+            let view = table.view({col_pivot: ["string"]});
+            let json = await view.to_json();
+            let arrow = await view.to_arrow();
+            let table2 = perspective.table(arrow);
+            let view2 = table2.view();
+            let json2 = await view2.to_json();
+
+            expect(json2).toEqual(
+                json.map(x => {
+                    delete x["__ROW_PATH__"];
+                    return x;
+                })
+            );
+
+            view2.delete();
+            table2.delete();
+            view.delete();
+            table.delete();
+        });
+    });
+};

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ async function* run_all_cases() {`
`144`	`144`	`yield* run_view_cases(table, config);`
`145`	`145`	`yield* run_to_format_cases(table, config, "to_json");`
`146`	`146`	`yield* run_to_format_cases(table, config, "to_columns");`
	`147`	`+ yield* run_to_format_cases(table, config, "to_arrow");`
`147`	`148`	`}`
`148`	`149`	`}`
`149`	`150`	`}`