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

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 {

modules/core/test/index.ts

@@ -13,7 +13,33 @@ import './adapter-utils/is-uniform-value.spec';
 import './adapter-utils/format-compiler-log.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';
 
+// 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';
+
 // portable - uniform buffers
 import './portable/uniform-buffer-layout.spec';

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';

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"}
   ]
 }

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/*"],