chore: update path

antvis · May 23, 2024 · 2389d00 · 2389d00
1 parent 373c622
commit 2389d00
Show file tree

Hide file tree

Showing 94 changed files with 54 additions and 22 deletions.
diff --git a/__tests__/integration/gallery.spec.ts b/__tests__/integration/gallery.spec.ts
@@ -13,5 +13,5 @@ const TEST_CASES = [
 ];
 
 describe('Gallery Snapshot', () => {
-  generateCanvasTestCases('Gallery', TEST_CASES);
+  generateCanvasTestCases('gallery', TEST_CASES);
 });
diff --git a/__tests__/integration/heatmap.spec.ts b/__tests__/integration/heatmap.spec.ts
@@ -15,5 +15,5 @@ const TEST_CASES = [
 ];
 
 describe('Heatmap Snapshot', () => {
-  generateCanvasTestCases('Heatmap', TEST_CASES);
+  generateCanvasTestCases('heatmap', TEST_CASES);
 });
diff --git a/__tests__/integration/line.spec.ts b/__tests__/integration/line.spec.ts
@@ -35,5 +35,5 @@ const TEST_CASES = [
 ];
 
 describe('Line Snapshot', () => {
-  generateCanvasTestCases('Line', TEST_CASES);
+  generateCanvasTestCases('line', TEST_CASES);
 });
diff --git a/__tests__/integration/mask.spec.ts b/__tests__/integration/mask.spec.ts
@@ -11,5 +11,5 @@ const TEST_CASES = [
 ];
 
 describe('Mask Snapshot', () => {
-  generateCanvasTestCases('Mask', TEST_CASES);
+  generateCanvasTestCases('mask', TEST_CASES);
 });
diff --git a/__tests__/integration/point.spec.ts b/__tests__/integration/point.spec.ts
@@ -16,7 +16,6 @@ const TEST_CASES = [
   },
   {
     name: 'fill_image',
-    sleepTime: 1000,
   },
   {
     name: 'image',
@@ -28,5 +27,5 @@ const TEST_CASES = [
 ];
 
 describe('Point Snapshot', () => {
-  generateCanvasTestCases('Point', TEST_CASES);
+  generateCanvasTestCases('point', TEST_CASES);
 });
diff --git a/__tests__/integration/polygon.spec.ts b/__tests__/integration/polygon.spec.ts
@@ -27,5 +27,5 @@ const TEST_CASES = [
 ];
 
 describe('Polygon Snapshot', () => {
-  generateCanvasTestCases('Polygon', TEST_CASES);
+  generateCanvasTestCases('polygon', TEST_CASES);
 });
diff --git a/__tests__/integration/utils/generator.ts b/__tests__/integration/utils/generator.ts
@@ -1,23 +1,21 @@
-import type { Browser, BrowserContext, Page } from 'playwright';
+import type { Browser, BrowserContext } from 'playwright';
 import { chromium, devices } from 'playwright';
 import { sleep } from './sleep';
 import './useSnapshotMatchers';
 
 export function generateCanvasTestCases(
   namespace: string,
-  tests: { name: string; sleepTime?: number; snapshots?: boolean }[],
+  tests: { name: string; sleepTime?: number; snapshot?: boolean }[],
 ) {
   const port = (globalThis as any).PORT;
-  let browser: Browser, context: BrowserContext, page: Page;
+  let browser: Browser, context: BrowserContext;
 
   beforeAll(async () => {
     // Setup
     browser = await chromium.launch({
       args: ['--headless', '--no-sandbox'],
     });
     context = await browser.newContext(devices['Desktop Chrome']);
-    page = await context.newPage();
-    await context.exposeFunction('screenshot', () => {});
   });
 
   afterAll(async () => {
@@ -26,15 +24,29 @@ export function generateCanvasTestCases(
   });
 
   tests
-    .filter((test) => test.snapshots !== false)
+    .filter((test) => test.snapshot !== false)
     .map((test) => {
       const { name, sleepTime = 200 } = test;
       const key = `${namespace}_${name}`;
 
       it(key, async () => {
+        const page = await context.newPage();
+
+        let resolveReady: () => void;
+        const readyPromise = new Promise<void>((resolve) => {
+          resolveReady = () => {
+            resolve();
+          };
+        });
+
+        await page.exposeFunction('screenshot', async () => {
+          resolveReady();
+        });
+
         // Go to test page served by vite devServer.
         const url = `http://localhost:${port}/?namespace=${namespace}&name=${name}&snapshot=true`;
         await page.goto(url);
+        await readyPromise;
         await sleep(sleepTime);
 
         // Chart already rendered, capture into buffer.
@@ -45,7 +57,7 @@ export function generateCanvasTestCases(
         try {
           expect(buffer).toMatchCanvasSnapshot(dir, key, { maxError });
         } finally {
-          //
+          page.close();
         }
       });
     });

diff --git a/examples/demos_next/basemap/amap-data.ts → examples/demos/basemap/amap-data.ts b/examples/demos_next/basemap/amap-data.ts → examples/demos/basemap/amap-data.ts
diff --git a/examples/demos_next/basemap/index.ts → examples/demos/basemap/index.ts b/examples/demos_next/basemap/index.ts → examples/demos/basemap/index.ts
diff --git a/examples/demos_next/basemap/wgs84-data.ts → examples/demos/basemap/wgs84-data.ts b/examples/demos_next/basemap/wgs84-data.ts → examples/demos/basemap/wgs84-data.ts
diff --git a/examples/demos_next/bugfix/data-shake.ts → examples/demos/bugfix/data-shake.ts b/examples/demos_next/bugfix/data-shake.ts → examples/demos/bugfix/data-shake.ts
diff --git a/examples/demos_next/bugfix/index.ts → examples/demos/bugfix/index.ts b/examples/demos_next/bugfix/index.ts → examples/demos/bugfix/index.ts
diff --git a/examples/demos_next/bugfix/legend-event.ts → examples/demos/bugfix/legend-event.ts b/examples/demos_next/bugfix/legend-event.ts → examples/demos/bugfix/legend-event.ts
diff --git a/examples/demos_next/bugfix/muti-polygon.ts → examples/demos/bugfix/muti-polygon.ts b/examples/demos_next/bugfix/muti-polygon.ts → examples/demos/bugfix/muti-polygon.ts
diff --git a/...es/demos_next/bugfix/remove-muti-layer.ts → examples/demos/bugfix/remove-muti-layer.ts b/...es/demos_next/bugfix/remove-muti-layer.ts → examples/demos/bugfix/remove-muti-layer.ts
diff --git a/examples/demos_next/bugfix/set-color.ts → examples/demos/bugfix/set-color.ts b/examples/demos_next/bugfix/set-color.ts → examples/demos/bugfix/set-color.ts
diff --git a/examples/demos_next/bugfix/set-data.ts → examples/demos/bugfix/set-data.ts b/examples/demos_next/bugfix/set-data.ts → examples/demos/bugfix/set-data.ts
diff --git a/examples/demos_next/bugfix/set-size.ts → examples/demos/bugfix/set-size.ts b/examples/demos_next/bugfix/set-size.ts → examples/demos/bugfix/set-size.ts
diff --git a/examples/demos_next/bugfix/text-offsets.ts → examples/demos/bugfix/text-offsets.ts b/examples/demos_next/bugfix/text-offsets.ts → examples/demos/bugfix/text-offsets.ts
diff --git a/examples/demos_next/bugfix/tile-update.ts → examples/demos/bugfix/tile-update.ts b/examples/demos_next/bugfix/tile-update.ts → examples/demos/bugfix/tile-update.ts
diff --git a/examples/demos_next/bugfix/touch-event.ts → examples/demos/bugfix/touch-event.ts b/examples/demos_next/bugfix/touch-event.ts → examples/demos/bugfix/touch-event.ts
diff --git a/examples/demos_next/canvas/event.ts → examples/demos/canvas/event.ts b/examples/demos_next/canvas/event.ts → examples/demos/canvas/event.ts
diff --git a/examples/demos_next/canvas/index.ts → examples/demos/canvas/index.ts b/examples/demos_next/canvas/index.ts → examples/demos/canvas/index.ts
diff --git a/examples/demos_next/canvas/layer.ts → examples/demos/canvas/layer.ts b/examples/demos_next/canvas/layer.ts → examples/demos/canvas/layer.ts
diff --git a/examples/demos_next/components/index.ts → examples/demos/components/index.ts b/examples/demos_next/components/index.ts → examples/demos/components/index.ts
diff --git a/...ples/demos_next/components/layer-popup.ts → examples/demos/components/layer-popup.ts b/...ples/demos_next/components/layer-popup.ts → examples/demos/components/layer-popup.ts
diff --git a/examples/demos_next/components/marker.ts → examples/demos/components/marker.ts b/examples/demos_next/components/marker.ts → examples/demos/components/marker.ts
diff --git a/examples/demos_next/components/popup.ts → examples/demos/components/popup.ts b/examples/demos_next/components/popup.ts → examples/demos/components/popup.ts
diff --git a/examples/demos_next/components/swipe.ts → examples/demos/components/swipe.ts b/examples/demos_next/components/swipe.ts → examples/demos/components/swipe.ts
diff --git a/examples/demos_next/components/zoom.ts → examples/demos/components/zoom.ts b/examples/demos_next/components/zoom.ts → examples/demos/components/zoom.ts
diff --git a/examples/demos_next/extend/index.ts → examples/demos/extend/index.ts b/examples/demos_next/extend/index.ts → examples/demos/extend/index.ts
diff --git a/examples/demos_next/extend/three-geometry.ts → examples/demos/extend/three-geometry.ts b/examples/demos_next/extend/three-geometry.ts → examples/demos/extend/three-geometry.ts
diff --git a/examples/demos_next/gallery/fujian.ts → examples/demos/gallery/fujian.ts b/examples/demos_next/gallery/fujian.ts → examples/demos/gallery/fujian.ts
diff --git a/examples/demos_next/gallery/index.ts → examples/demos/gallery/index.ts b/examples/demos_next/gallery/index.ts → examples/demos/gallery/index.ts
diff --git a/examples/demos_next/gallery/vari-flight.ts → examples/demos/gallery/vari-flight.ts b/examples/demos_next/gallery/vari-flight.ts → examples/demos/gallery/vari-flight.ts
diff --git a/examples/demos_next/heatmap/grid.ts → examples/demos/heatmap/grid.ts b/examples/demos_next/heatmap/grid.ts → examples/demos/heatmap/grid.ts
diff --git a/examples/demos_next/heatmap/hexagon.ts → examples/demos/heatmap/hexagon.ts b/examples/demos_next/heatmap/hexagon.ts → examples/demos/heatmap/hexagon.ts
@@ -45,9 +45,9 @@ export const hexagon: TestCase = async (options) => {
       ].reverse(),
     );
 
-  scene.startAnimate();
+  // scene.startAnimate();
   scene.addLayer(layer);
-  scene.render();
+  // scene.render();
 
   return scene;
 };
diff --git a/examples/demos_next/heatmap/index.ts → examples/demos/heatmap/index.ts b/examples/demos_next/heatmap/index.ts → examples/demos/heatmap/index.ts
diff --git a/examples/demos_next/heatmap/normal-3d.ts → examples/demos/heatmap/normal-3d.ts b/examples/demos_next/heatmap/normal-3d.ts → examples/demos/heatmap/normal-3d.ts
diff --git a/examples/demos_next/heatmap/normal.ts → examples/demos/heatmap/normal.ts b/examples/demos_next/heatmap/normal.ts → examples/demos/heatmap/normal.ts
diff --git a/examples/demos_next/index.ts → examples/demos/index.ts b/examples/demos_next/index.ts → examples/demos/index.ts
@@ -14,8 +14,6 @@ import * as RasterTestCases from './raster';
 import * as TileTestCases from './tile';
 import * as WebgpuTestCases from './webgpu';
 
-export { BasemapTestCases, CanvasTestCases, PointTestCases };
-
 export const TestCases = new Map<string, [string, TestCase][]>([
   ['bugfix', Object.entries(BugfixTestCases)],
   ['point', Object.entries(PointTestCases)],
@@ -32,3 +30,16 @@ export const TestCases = new Map<string, [string, TestCase][]>([
   ['webgpu', Object.entries(WebgpuTestCases)],
   ['extend', Object.entries(ExtendTestCases)],
 ]);
+
+export function geSnapshotTestsFromNamespace(namespace: string) {
+  const testcases = TestCases.get(namespace);
+  if (!testcases) return [];
+  const demo = testcases
+    .filter(([, demo]) => Boolean(demo.snapshot))
+    .map(([name, demo]) => ({
+      name,
+      snapshot: Boolean(demo.snapshot),
+      sleepTime: typeof demo?.snapshot === 'object' ? demo.snapshot?.sleepTime : undefined,
+    }));
+  return demo;
+}
diff --git a/examples/demos_next/line/arc-3d.ts → examples/demos/line/arc-3d.ts b/examples/demos_next/line/arc-3d.ts → examples/demos/line/arc-3d.ts
diff --git a/examples/demos_next/line/arc.ts → examples/demos/line/arc.ts b/examples/demos_next/line/arc.ts → examples/demos/line/arc.ts
diff --git a/examples/demos_next/line/dash.ts → examples/demos/line/dash.ts b/examples/demos_next/line/dash.ts → examples/demos/line/dash.ts
diff --git a/examples/demos_next/line/flow.ts → examples/demos/line/flow.ts b/examples/demos_next/line/flow.ts → examples/demos/line/flow.ts
diff --git a/examples/demos_next/line/greatcircle.ts → examples/demos/line/greatcircle.ts b/examples/demos_next/line/greatcircle.ts → examples/demos/line/greatcircle.ts
diff --git a/examples/demos_next/line/index.ts → examples/demos/line/index.ts b/examples/demos_next/line/index.ts → examples/demos/line/index.ts
diff --git a/examples/demos_next/line/normal.ts → examples/demos/line/normal.ts b/examples/demos_next/line/normal.ts → examples/demos/line/normal.ts
diff --git a/examples/demos_next/line/simple.ts → examples/demos/line/simple.ts b/examples/demos_next/line/simple.ts → examples/demos/line/simple.ts
diff --git a/examples/demos_next/line/wall.ts → examples/demos/line/wall.ts b/examples/demos_next/line/wall.ts → examples/demos/line/wall.ts
diff --git a/examples/demos_next/mask/index.ts → examples/demos/mask/index.ts b/examples/demos_next/mask/index.ts → examples/demos/mask/index.ts
diff --git a/examples/demos_next/mask/multi.ts → examples/demos/mask/multi.ts b/examples/demos_next/mask/multi.ts → examples/demos/mask/multi.ts
diff --git a/examples/demos_next/mask/raster-tile.ts → examples/demos/mask/raster-tile.ts b/examples/demos_next/mask/raster-tile.ts → examples/demos/mask/raster-tile.ts
diff --git a/examples/demos_next/mask/single.ts → examples/demos/mask/single.ts b/examples/demos_next/mask/single.ts → examples/demos/mask/single.ts
diff --git a/examples/demos_next/point/billboard.ts → examples/demos/point/billboard.ts b/examples/demos_next/point/billboard.ts → examples/demos/point/billboard.ts
diff --git a/examples/demos_next/point/column.ts → examples/demos/point/column.ts b/examples/demos_next/point/column.ts → examples/demos/point/column.ts
diff --git a/examples/demos_next/point/dot.ts → examples/demos/point/dot.ts b/examples/demos_next/point/dot.ts → examples/demos/point/dot.ts
diff --git a/examples/demos_next/point/fill-image.ts → examples/demos/point/fill-image.ts b/examples/demos_next/point/fill-image.ts → examples/demos/point/fill-image.ts
diff --git a/examples/demos_next/point/fill.ts → examples/demos/point/fill.ts b/examples/demos_next/point/fill.ts → examples/demos/point/fill.ts
diff --git a/examples/demos_next/point/image.ts → examples/demos/point/image.ts b/examples/demos_next/point/image.ts → examples/demos/point/image.ts
diff --git a/examples/demos_next/point/index.ts → examples/demos/point/index.ts b/examples/demos_next/point/index.ts → examples/demos/point/index.ts
diff --git a/examples/demos_next/point/radar.ts → examples/demos/point/radar.ts b/examples/demos_next/point/radar.ts → examples/demos/point/radar.ts
diff --git a/examples/demos_next/point/text.ts → examples/demos/point/text.ts b/examples/demos_next/point/text.ts → examples/demos/point/text.ts
diff --git a/examples/demos_next/polygon/extrude-city.ts → examples/demos/polygon/extrude-city.ts b/examples/demos_next/polygon/extrude-city.ts → examples/demos/polygon/extrude-city.ts
diff --git a/examples/demos_next/polygon/extrude.ts → examples/demos/polygon/extrude.ts b/examples/demos_next/polygon/extrude.ts → examples/demos/polygon/extrude.ts
diff --git a/examples/demos_next/polygon/extrusion.ts → examples/demos/polygon/extrusion.ts b/examples/demos_next/polygon/extrusion.ts → examples/demos/polygon/extrusion.ts
diff --git a/examples/demos_next/polygon/fill-linear.ts → examples/demos/polygon/fill-linear.ts b/examples/demos_next/polygon/fill-linear.ts → examples/demos/polygon/fill-linear.ts
diff --git a/examples/demos_next/polygon/fill.ts → examples/demos/polygon/fill.ts b/examples/demos_next/polygon/fill.ts → examples/demos/polygon/fill.ts
diff --git a/examples/demos_next/polygon/index.ts → examples/demos/polygon/index.ts b/examples/demos_next/polygon/index.ts → examples/demos/polygon/index.ts
diff --git a/examples/demos_next/polygon/ocean.ts → examples/demos/polygon/ocean.ts b/examples/demos_next/polygon/ocean.ts → examples/demos/polygon/ocean.ts
diff --git a/examples/demos_next/polygon/texture.ts → examples/demos/polygon/texture.ts b/examples/demos_next/polygon/texture.ts → examples/demos/polygon/texture.ts
diff --git a/examples/demos_next/polygon/water.ts → examples/demos/polygon/water.ts b/examples/demos_next/polygon/water.ts → examples/demos/polygon/water.ts
diff --git a/examples/demos_next/raster/dem.ts → examples/demos/raster/dem.ts b/examples/demos_next/raster/dem.ts → examples/demos/raster/dem.ts
diff --git a/examples/demos_next/raster/image.ts → examples/demos/raster/image.ts b/examples/demos_next/raster/image.ts → examples/demos/raster/image.ts
diff --git a/examples/demos_next/raster/imageBox.ts → examples/demos/raster/imageBox.ts b/examples/demos_next/raster/imageBox.ts → examples/demos/raster/imageBox.ts
diff --git a/examples/demos_next/raster/index.ts → examples/demos/raster/index.ts b/examples/demos_next/raster/index.ts → examples/demos/raster/index.ts
diff --git a/examples/demos_next/raster/multiband.ts → examples/demos/raster/multiband.ts b/examples/demos_next/raster/multiband.ts → examples/demos/raster/multiband.ts
diff --git a/examples/demos_next/raster/ndvi.ts → examples/demos/raster/ndvi.ts b/examples/demos_next/raster/ndvi.ts → examples/demos/raster/ndvi.ts
diff --git a/examples/demos_next/raster/tiff.ts → examples/demos/raster/tiff.ts b/examples/demos_next/raster/tiff.ts → examples/demos/raster/tiff.ts
diff --git a/examples/demos_next/tile/index.ts → examples/demos/tile/index.ts b/examples/demos_next/tile/index.ts → examples/demos/tile/index.ts
diff --git a/examples/demos_next/tile/raster-tile.ts → examples/demos/tile/raster-tile.ts b/examples/demos_next/tile/raster-tile.ts → examples/demos/tile/raster-tile.ts
diff --git a/examples/demos_next/tile/terrain-rgb.ts → examples/demos/tile/terrain-rgb.ts b/examples/demos_next/tile/terrain-rgb.ts → examples/demos/tile/terrain-rgb.ts
diff --git a/examples/demos_next/tile/vector-city.ts → examples/demos/tile/vector-city.ts b/examples/demos_next/tile/vector-city.ts → examples/demos/tile/vector-city.ts
diff --git a/examples/demos_next/tile/vector-line.ts → examples/demos/tile/vector-line.ts b/examples/demos_next/tile/vector-line.ts → examples/demos/tile/vector-line.ts
diff --git a/examples/demos_next/tile/vector-perf.ts → examples/demos/tile/vector-perf.ts b/examples/demos_next/tile/vector-perf.ts → examples/demos/tile/vector-perf.ts
diff --git a/examples/demos_next/tile/vector-usa.ts → examples/demos/tile/vector-usa.ts b/examples/demos_next/tile/vector-usa.ts → examples/demos/tile/vector-usa.ts
diff --git a/examples/demos_next/webgpu/boids.ts → examples/demos/webgpu/boids.ts b/examples/demos_next/webgpu/boids.ts → examples/demos/webgpu/boids.ts
diff --git a/...ples/demos_next/webgpu/compute-texture.ts → examples/demos/webgpu/compute-texture.ts b/...ples/demos_next/webgpu/compute-texture.ts → examples/demos/webgpu/compute-texture.ts
diff --git a/examples/demos_next/webgpu/idw.ts → examples/demos/webgpu/idw.ts b/examples/demos_next/webgpu/idw.ts → examples/demos/webgpu/idw.ts
diff --git a/examples/demos_next/webgpu/index.ts → examples/demos/webgpu/index.ts b/examples/demos_next/webgpu/index.ts → examples/demos/webgpu/index.ts
diff --git a/examples/demos_next/webgpu/perf.ts → examples/demos/webgpu/perf.ts b/examples/demos_next/webgpu/perf.ts → examples/demos/webgpu/perf.ts
diff --git a/examples/demos_next/webgpu/template.ts → examples/demos/webgpu/template.ts b/examples/demos_next/webgpu/template.ts → examples/demos/webgpu/template.ts
diff --git a/examples/demos_next/webgpu/utils/common.ts → examples/demos/webgpu/utils/common.ts b/examples/demos_next/webgpu/utils/common.ts → examples/demos/webgpu/utils/common.ts
diff --git a/examples/main.tsx b/examples/main.tsx
@@ -1,11 +1,11 @@
 import type { Scene } from '@antv/l7-scene';
-import { Cascader } from 'antd';
+import { Cascader, ConfigProvider } from 'antd';
 import 'antd/dist/reset.css';
 import type { Controller } from 'lil-gui';
 import GUI from 'lil-gui';
 import React, { useEffect, useRef, useState } from 'react';
 import { DEFAULT_GUI_OPTIONS, MAP_TYPES, SEARCH_PARAMS_KEYS } from './constants';
-import { TestCases } from './demos_next';
+import { TestCases } from './demos';
 import type { GUIOptions } from './types';
 
 const DEMO_LIST = Array.from(TestCases).map(([namespace, cases]) => {
@@ -66,6 +66,12 @@ export const Main = () => {
       if (TestCase.extendGUI) {
         extendGUI = TestCase.extendGUI?.(guiRef.current!);
       }
+
+      // @ts-ignore
+      if (isSnapshotMode && window.screenshot) {
+        // @ts-ignore
+        await window.screenshot();
+      }
     };
 
     asyncFun();
@@ -74,6 +80,9 @@ export const Main = () => {
     return () => {
       scene?.destroy();
       extendGUI.forEach((d) => d.destroy());
+      while (mapContainer.current?.firstChild) {
+        mapContainer.current.removeChild(mapContainer.current.lastChild!);
+      }
     };
   }, [viewDemo, guiOptions]);
 
@@ -84,14 +93,15 @@ export const Main = () => {
   return (
     <>
       {!isSnapshotMode && (
-        <div style={{ position: 'absolute', left: '20px', zIndex: 10, top: '20px' }}>
+        <ConfigProvider theme={{ components: { Cascader: { dropdownHeight: 400 } } }}>
           <Cascader
+            style={{ position: 'absolute', left: '20px', zIndex: 10, top: '20px' }}
             size="large"
             defaultValue={viewDemo}
             options={DEMO_LIST}
             onChange={onDemoViewChange}
           />
-        </div>
+        </ConfigProvider>
       )}
       <div ref={mapContainer} style={{ width: '100%', height: '100%' }} />
     </>