test cleanup

Author: sc1f

packages/perspective/test/js/computed/functionality.js

@@ -228,23 +228,38 @@ module.exports = perspective => {
             table.delete();
         });
 
-        it("Should be able to create multiple computed columns in multiple `view()`s", async function() {
+        it("Should be able to create multiple computed columns with unique names in multiple `view()`s", async function() {
             const table = perspective.table(common.int_float_data);
             const view = table.view({
                 computed_columns: [
                     {
                         column: "float + int",
                         computed_function_name: "+",
                         inputs: ["w", "x"]
+                    },
+                    {
+                        column: "float - int",
+                        computed_function_name: "-",
+                        inputs: ["w", "x"]
+                    },
+                    {
+                        column: "float * int",
+                        computed_function_name: "*",
+                        inputs: ["w", "x"]
                     }
                 ]
             });
             const view2 = table.view({
                 computed_columns: [
                     {
-                        column: "float - int",
-                        computed_function_name: "-",
+                        column: "float / int",
+                        computed_function_name: "/",
                         inputs: ["w", "x"]
+                    },
+                    {
+                        column: "int * float",
+                        computed_function_name: "*",
+                        inputs: ["x", "w"]
                     }
                 ]
             });
@@ -257,15 +272,18 @@ module.exports = perspective => {
                 x: "integer",
                 y: "string",
                 z: "boolean",
-                "float + int": "float"
+                "float + int": "float",
+                "float - int": "float",
+                "float * int": "float"
             });
 
             expect(schema2).toEqual({
                 w: "float",
                 x: "integer",
                 y: "string",
                 z: "boolean",
-                "float - int": "float"
+                "float / int": "float",
+                "int * float": "float"
             });
 
             const result = await view.to_columns();
@@ -276,15 +294,18 @@ module.exports = perspective => {
                 x: [1, 2, 3, 4],
                 y: ["a", "b", "c", "d"],
                 z: [true, false, true, false],
-                "float + int": [2.5, 4.5, 6.5, 8.5]
+                "float + int": [2.5, 4.5, 6.5, 8.5],
+                "float - int": [0.5, 0.5, 0.5, 0.5],
+                "float * int": [1.5, 5, 10.5, 18]
             });
 
             expect(result2).toEqual({
                 w: [1.5, 2.5, 3.5, 4.5],
                 x: [1, 2, 3, 4],
                 y: ["a", "b", "c", "d"],
                 z: [true, false, true, false],
-                "float - int": [0.5, 0.5, 0.5, 0.5]
+                "float / int": [1.5, 1.25, 1.1666666666666667, 1.125],
+                "int * float": [1.5, 5, 10.5, 18]
             });
 
             view2.delete();
@@ -334,6 +355,9 @@ module.exports = perspective => {
 
             view.delete();
 
+            // force a process()
+            expect(await table.size()).toEqual(4);
+
             const schema2 = await view2.schema();
 
             expect(schema2).toEqual({
@@ -408,6 +432,9 @@ module.exports = perspective => {
 
             const schema2 = await view2.schema();
 
+            // force a process()
+            expect(await table.size()).toEqual(4);
+
             expect(schema2).toEqual({
                 w: "float",
                 x: "integer",
@@ -549,7 +576,7 @@ module.exports = perspective => {
             table.delete();
         });
 
-        it("A view without computed columns should break when serializing after another view with a computed column is deleted.", async function() {
+        it("A view without computed columns should not serialize computed columns from other views.", async function() {
             const table = perspective.table(common.int_float_data);
             const view = table.view({
                 computed_columns: [
@@ -802,7 +829,7 @@ module.exports = perspective => {
             table.delete();
         });
 
-        it("Should be able to row pivot on a non-computed column and get correct results.", async function() {
+        it("Should be able to row pivot on a non-computed column and get correct results for the computed column.", async function() {
             const table = perspective.table(common.int_float_data);
             const view = table.view({
                 row_pivots: ["w"],

python/perspective/perspective/tests/table/test_view.py

@@ -1479,6 +1479,13 @@ def test_invalid_sorts_should_throw(self):
             tbl.view(sort=[["x", "desc"]])
         assert str(ex.value) == "Invalid column 'x' found in View sorts.\n"
 
+    def test_should_throw_on_first_invalid(self):
+        data = [{"a": 1, "b": 2, "c": "a"}, {"a": 3, "b": 4, "c": "b"}]
+        tbl = Table(data)
+        with raises(PerspectiveCppError) as ex:
+            tbl.view(row_pivots=["a"], column_pivots=["c"], filter=[["a", ">", 1]], aggregates={"a": "avg"}, sort=[["x", "desc"]])
+        assert str(ex.value) == "Invalid column 'x' found in View sorts.\n"
+
     def test_invalid_columns_not_in_computed_should_throw(self):
         data = [{"a": 1, "b": 2, "c": "a"}, {"a": 3, "b": 4, "c": "b"}]
         tbl = Table(data)