update tests

finos · Feb 28, 2024 · 6e2fe6b · 6e2fe6b
1 parent a093f3c
commit 6e2fe6b
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 49 deletions.
diff --git a/packages/perspective-jupyterlab/test/jupyter/widget.spec.js b/packages/perspective-jupyterlab/test/jupyter/widget.spec.js
@@ -39,24 +39,18 @@ describe_jupyter(
                 "w",
             ],
             async ({ page }) => {
-                const viewer = await default_body(page);
-                const num_columns = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer
-                        .querySelector("perspective-viewer-datagrid")
-                        .shadowRoot.querySelector("regular-table");
-                    return tbl.querySelector("thead tr").childElementCount;
-                });
+                await default_body(page);
 
-                expect(num_columns).toEqual(3);
+                const num_columns = await page
+                    .locator("regular-table thead tr")
+                    .first()
+                    .evaluate((tr) => tr.childElementCount);
 
-                const num_rows = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer
-                        .querySelector("perspective-viewer-datagrid")
-                        .shadowRoot.querySelector("regular-table");
-                    return tbl.querySelectorAll("tbody tr").length;
-                });
+                expect(num_columns).toEqual(3);
 
-                expect(num_rows).toEqual(5);
+                await expect(
+                    page.locator("regular-table tbody tr")
+                ).toHaveCount(5);
             }
         );
 
@@ -71,24 +65,17 @@ describe_jupyter(
                 "table.update(arrow_data)",
             ],
             async ({ page }) => {
-                const viewer = await default_body(page);
-                const num_columns = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer
-                        .querySelector("perspective-viewer-datagrid")
-                        .shadowRoot.querySelector("regular-table");
-                    return tbl.querySelector("thead tr").childElementCount;
-                });
+                await default_body(page);
+                const num_columns = await page
+                    .locator("regular-table thead tr")
+                    .first()
+                    .evaluate((tr) => tr.childElementCount);
 
                 expect(num_columns).toEqual(3);
 
-                const num_rows = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer
-                        .querySelector("perspective-viewer-datagrid")
-                        .shadowRoot.querySelector("regular-table");
-                    return tbl.querySelectorAll("tbody tr").length;
-                });
-
-                expect(num_rows).toEqual(10);
+                await expect(
+                    page.locator("regular-table tbody tr")
+                ).toHaveCount(10);
             }
         );
         test_jupyter(
@@ -101,25 +88,18 @@ describe_jupyter(
                 "w",
             ],
             async ({ page }) => {
-                const viewer = await default_body(page);
-                const num_columns = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer
-                        .querySelector("perspective-viewer-datagrid")
-                        .shadowRoot.querySelector("regular-table");
+                await default_body(page);
 
-                    return tbl.querySelector("thead tr").childElementCount;
-                });
+                const num_columns = await page
+                    .locator("regular-table thead tr")
+                    .first()
+                    .evaluate((tr) => tr.childElementCount);
 
                 expect(num_columns).toEqual(3);
 
-                const num_rows = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer
-                        .querySelector("perspective-viewer-datagrid")
-                        .shadowRoot.querySelector("regular-table");
-                    return tbl.querySelectorAll("tbody tr").length;
-                });
-
-                expect(num_rows).toEqual(5);
+                await expect(
+                    page.locator("regular-table tbody tr")
+                ).toHaveCount(5);
             }
         );
 
@@ -228,6 +208,7 @@ describe_jupyter(
                 // Check default config
                 expect(config).toEqual({
                     version: utils.API_VERSION,
+                    column_config: {},
                     aggregates: {},
                     columns: [
                         "ui8",
@@ -281,6 +262,7 @@ w.theme = "Pro Dark"`
                 // and check it
                 expect(config).toEqual({
                     version: utils.API_VERSION,
+                    column_config: {},
                     aggregates: {},
                     columns: ["ui8"],
                     expressions: {},
@@ -315,6 +297,7 @@ w.theme = "Pro Dark"`
                 // Check default config
                 expect(config).toEqual({
                     version: utils.API_VERSION,
+                    column_config: {},
                     aggregates: {},
                     columns: [
                         "ui8",

diff --git a/rust/perspective-viewer/test/js/migrate_viewer.spec.ts b/rust/perspective-viewer/test/js/migrate_viewer.spec.ts
@@ -10,7 +10,12 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-import { test, expect, DEFAULT_CONFIG } from "@finos/perspective-test";
+import {
+    test,
+    expect,
+    DEFAULT_CONFIG,
+    compareSVGContentsToSnapshot,
+} from "@finos/perspective-test";
 import {
     compareContentsToSnapshot,
     API_VERSION,
@@ -384,7 +389,6 @@ const TESTS: [string, any, PerspectiveViewerConfig][] = [
         },
         {
             ...MIGRATE_BASE_CONFIG,
-            version: "2.7.1",
             plugin: "Datagrid",
             plugin_config: {
                 columns: {},
@@ -525,8 +529,18 @@ test.describe("Migrate Viewer", () => {
 
                 expect(saved).toEqual(expected);
 
-                const contents = await get_contents(page);
-                await compareContentsToSnapshot(contents, [
+                let selector;
+                if (saved.plugin === "Datagrid") {
+                    selector = "perspective-viewer-datagrid";
+                } else if (saved.plugin === "Map Scatter") {
+                    selector = "perspective-viewer-openlayers-scatter";
+                } else {
+                    const plugin = saved.plugin
+                        ?.replace(/[-\/\s]/gi, "")
+                        .toLowerCase();
+                    selector = `perspective-viewer-d3fc-${plugin}`;
+                }
+                await compareSVGContentsToSnapshot(page, selector, [
                     `migrate-restore-${name}.txt`,
                 ]);
             });

diff --git a/tools/perspective-test/results.tar.gz b/tools/perspective-test/results.tar.gz