Move core-tests into core/tests (#2010)

visgl · May 10, 2024 · de88b48 · de88b48
1 parent 455d3be
commit de88b48
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 164 deletions.
diff --git a/index.html b/index.html
@@ -4,5 +4,6 @@
     <title>luma.gl tests</title>
   </head>
   <body>
+    <script type="module" src="./test/browser.ts"></script>
   </body>
 </html>
diff --git a/modules/core-tests/package.json b/modules/core-tests/package.json
diff --git a/modules/core-tests/src/index.ts b/modules/core-tests/src/index.ts
diff --git a/modules/core-tests/test/adapter/canvas-context.spec.ts b/modules/core-tests/test/adapter/canvas-context.spec.ts
diff --git a/modules/core-tests/test/index.ts b/modules/core-tests/test/index.ts
diff --git a/modules/core-tests/tsconfig.json b/modules/core-tests/tsconfig.json
diff --git a/modules/core/test/adapter/canvas-context.spec.ts b/modules/core/test/adapter/canvas-context.spec.ts
@@ -5,6 +5,57 @@
 import test from 'tape-promise/tape';
 import {CanvasContext, Framebuffer} from '@luma.gl/core';
 import {isBrowser} from '@probe.gl/env';
+import {getTestDevices} from '@luma.gl/test-utils';
+
+test('CanvasContext#defined', t => {
+  t.ok(CanvasContext, 'CanvasContext defined');
+  // t.ok(new WEBGLCanvasContext()), 'Context creation ok');
+  t.end();
+});
+
+test('CanvasContext#getDevicePixelRatio', async t => {
+  const windowPixelRatio = (typeof window !== 'undefined' && window.devicePixelRatio) || 1;
+  const TEST_CASES = [
+    {
+      name: 'useDevicePixels: true: should use window.devicePixelRatio or 1',
+      useDevicePixels: true,
+      expected: windowPixelRatio
+    },
+    {
+      name: 'useDevicePixels: false: should use 1',
+      useDevicePixels: false,
+      expected: 1
+    },
+    {
+      name: 'Non Finite useDevicePixels null: should use 1',
+      useDevicePixels: null,
+      expected: 1
+    },
+    {
+      name: 'Non valid useDevicePixels 0: should use 1',
+      useDevicePixels: 0,
+      expected: 1
+    },
+    {
+      name: 'Non valid useDevicePixels negative: should use 1',
+      useDevicePixels: -3.2,
+      expected: 1
+    },
+    {
+      name: 'Valid useDevicePixels, should use it',
+      useDevicePixels: 1.5,
+      expected: 1.5
+    }
+  ];
+
+  for (const device of await getTestDevices()) {
+    TEST_CASES.forEach(tc => {
+      const result = device.canvasContext?.getDevicePixelRatio(tc.useDevicePixels);
+      t.equal(result, tc.expected, tc.name);
+    });
+  }
+  t.end();
+});
 
 // @ts-expect-error
 class TestCanvasContext extends CanvasContext {

diff --git a/...er/device-helpers/device-features.spec.ts → ...er/device-helpers/device-features.spec.ts b/...er/device-helpers/device-features.spec.ts → ...er/device-helpers/device-features.spec.ts
diff --git a/...dapter/device-helpers/device-info.spec.ts → ...dapter/device-helpers/device-info.spec.ts b/...dapter/device-helpers/device-info.spec.ts → ...dapter/device-helpers/device-info.spec.ts
diff --git a/...pter/device-helpers/device-limits.spec.ts → ...pter/device-helpers/device-limits.spec.ts b/...pter/device-helpers/device-limits.spec.ts → ...pter/device-helpers/device-limits.spec.ts
diff --git a/...ice-helpers/set-device-parameters.spec.ts → ...ice-helpers/set-device-parameters.spec.ts b/...ice-helpers/set-device-parameters.spec.ts → ...ice-helpers/set-device-parameters.spec.ts
diff --git a/...es/core-tests/test/adapter/device.spec.ts → modules/core/test/adapter/device.spec.ts b/...es/core-tests/test/adapter/device.spec.ts → modules/core/test/adapter/device.spec.ts
diff --git a/...helpers/parse-shader-compiler-log.spec.ts → ...helpers/parse-shader-compiler-log.spec.ts b/...helpers/parse-shader-compiler-log.spec.ts → ...helpers/parse-shader-compiler-log.spec.ts
diff --git a/...sts/test/adapter/resources/buffer.spec.ts → ...ore/test/adapter/resources/buffer.spec.ts b/...sts/test/adapter/resources/buffer.spec.ts → ...ore/test/adapter/resources/buffer.spec.ts
diff --git a/.../adapter/resources/command-buffer.spec.ts → .../adapter/resources/command-buffer.spec.ts b/.../adapter/resources/command-buffer.spec.ts → .../adapter/resources/command-buffer.spec.ts
diff --git a/...dapter/resources/compute-pipeline.spec.ts → ...dapter/resources/compute-pipeline.spec.ts b/...dapter/resources/compute-pipeline.spec.ts → ...dapter/resources/compute-pipeline.spec.ts
diff --git a/...est/adapter/resources/framebuffer.spec.ts → ...est/adapter/resources/framebuffer.spec.ts b/...est/adapter/resources/framebuffer.spec.ts → ...est/adapter/resources/framebuffer.spec.ts
diff --git a/.../test/adapter/resources/query-set.spec.ts → .../test/adapter/resources/query-set.spec.ts b/.../test/adapter/resources/query-set.spec.ts → .../test/adapter/resources/query-set.spec.ts
diff --git a/...adapter/resources/render-pipeline.spec.ts → ...adapter/resources/render-pipeline.spec.ts b/...adapter/resources/render-pipeline.spec.ts → ...adapter/resources/render-pipeline.spec.ts
diff --git a/...ts/test/adapter/resources/sampler.spec.ts → ...re/test/adapter/resources/sampler.spec.ts b/...ts/test/adapter/resources/sampler.spec.ts → ...re/test/adapter/resources/sampler.spec.ts
diff --git a/...sts/test/adapter/resources/shader.spec.ts → ...ore/test/adapter/resources/shader.spec.ts b/...sts/test/adapter/resources/shader.spec.ts → ...ore/test/adapter/resources/shader.spec.ts
diff --git a/...ts/test/adapter/resources/texture.spec.ts → ...re/test/adapter/resources/texture.spec.ts b/...ts/test/adapter/resources/texture.spec.ts → ...re/test/adapter/resources/texture.spec.ts
diff --git a/...st/adapter/resources/vertex-array.spec.ts → ...st/adapter/resources/vertex-array.spec.ts b/...st/adapter/resources/vertex-array.spec.ts → ...st/adapter/resources/vertex-array.spec.ts
diff --git a/...ests/test/adapter/texture-formats.spec.ts → ...core/test/adapter/texture-formats.spec.ts b/...ests/test/adapter/texture-formats.spec.ts → ...core/test/adapter/texture-formats.spec.ts
diff --git a/modules/core/test/index.ts b/modules/core/test/index.ts
@@ -15,6 +15,17 @@ import './adapter/type-utils/decode-texture-format.spec';
 import './adapter/type-utils/vertex-format-from-attribute.spec';
 
 // adapter
+
+// WebGLDevice, features & limits
+import './adapter/device-helpers/device-info.spec';
+import './adapter/device-helpers/device-features.spec';
+import './adapter/device-helpers/device-limits.spec';
+import './adapter/device-helpers/set-device-parameters.spec';
+
+import './adapter/helpers/parse-shader-compiler-log.spec';
+// import './adapter/helpers/get-shader-layout.spec';
+
+import './adapter/device.spec';
 import './adapter/canvas-context.spec';
 import './adapter/luma.spec';
 
@@ -23,3 +34,18 @@ import './lib/uniforms/uniform-buffer-layout.spec';
 
 // compiler logs
 import './lib/compiler-log/format-compiler-log.spec';
+
+// Resources
+import './adapter/texture-formats.spec';
+
+// Resources - TODO these tests only depend on Device and could move to API...
+import './adapter/resources/buffer.spec';
+import './adapter/resources/command-buffer.spec';
+import './adapter/resources/shader.spec';
+import './adapter/resources/render-pipeline.spec';
+import './adapter/resources/compute-pipeline.spec';
+import './adapter/resources/sampler.spec';
+import './adapter/resources/texture.spec';
+import './adapter/resources/framebuffer.spec';
+import './adapter/resources/vertex-array.spec';
+import './adapter/resources/query-set.spec';
diff --git a/test/modules.ts b/test/modules.ts
@@ -10,7 +10,6 @@ import '@luma.gl/shadertools/test';
 
 // DEVICE INDEPENDENT TESTS
 import '@luma.gl/core/test';
-import '@luma.gl/core-tests/test';
 
 // WEBGL ADAPTER TESTS
 import '@luma.gl/webgl/test';

diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -8,13 +8,11 @@
   "references": [
     {"path": "modules/constants"},
     {"path": "modules/core"},
-    {"path": "modules/core-tests"},
     {"path": "modules/engine"},
     {"path": "modules/gltf"},
     {"path": "modules/shadertools"},
     {"path": "modules/test-utils"},
     {"path": "modules/webgl"},
     {"path": "modules/webgpu"}
-    // {"path": "modules/experimental"}
   ]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -43,7 +43,6 @@
     "paths": {
       "@luma.gl/core/*": ["modules/core/src/*"],
       "@luma.gl/core/test/*": ["modules/core/test/*"],
-      "@luma.gl/core-tests/test/*": ["modules/core-tests/test/*"],
       "@luma.gl/constants/*": ["modules/constants/src/*"],
       "@luma.gl/constants/test/*": ["modules/constants/test/*"],
       "@luma.gl/engine/*": ["modules/engine/src/*"],
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,5 +4,6 @@ @@
         <title>luma.gl tests</title>
       </head>
       <body>
+        <script type="module" src="./test/browser.ts"></script>
       </body>
     </html>