test: fix test with new parameter names

MONOGRID · Oct 27, 2023 · a9f2a7e · a9f2a7e
1 parent ea5b968
commit a9f2a7e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/src/libultrahdr.ts b/src/libultrahdr.ts
@@ -1,13 +1,15 @@
 import { MainModule } from '../libultrahdr-wasm/build/libultrahdr'
 // @ts-expect-error untyped
 import libultrahdr from '../libultrahdr-wasm/build/libultrahdr-esm'
-import { CompressedEncodingResult, GainMapMetadata } from './types'
+import { CompressedImage, GainMapMetadata } from './types'
 
 export * from '../libultrahdr-wasm/build/libultrahdr'
 let library: MainModule | undefined
 
 /**
- * Instances the WASM module and returns it, only one module will be created upon multiple calls
+ * Instances the WASM module and returns it, only one module will be created upon multiple calls.
+ * @category General
+ * @group General
  *
  * @returns
  */
@@ -30,7 +32,7 @@ export const getLibrary = async () => {
  * @throws {Error} If `encodingResult.sdr.mimeType !== 'image/jpeg'`
  * @throws {Error} If `encodingResult.gainMap.mimeType !== 'image/jpeg'`
  */
-export const encodeJPEGMetadata = async (encodingResult: CompressedEncodingResult) => {
+export const encodeJPEGMetadata = async (encodingResult: GainMapMetadata & { sdr: CompressedImage, gainMap: CompressedImage }) => {
   const lib = await getLibrary()
 
   if (encodingResult.sdr.mimeType !== 'image/jpeg') throw new Error('This function expects an SDR image compressed in jpeg')

diff --git a/tests/libultrahdr.test.ts b/tests/libultrahdr.test.ts
@@ -11,10 +11,8 @@ describe('wasm', () => {
     const { page, pageError } = await getTestbed()
 
     const result = await page.evaluate(`
-      encodeJPEGMetadata(
-        'memorial.exr',
-        'image/jpeg'
-    )`) as Awaited<number[]>
+      encodeJPEGMetadata('memorial.exr')
+    `) as Awaited<number[]>
 
     expect(pageError).not.toBeCalled()
     // expect(pageLog).not.toBeCalled()

diff --git a/tests/testbed.html b/tests/testbed.html
@@ -35,26 +35,26 @@
       })
     }
 
-    window.encodeAndCompress = async (url, outMimeType = 'image/jpeg', outQuality = 0.9, sdrToneMapping = ACESFilmicToneMapping) => {
+    window.encodeAndCompress = async (url, mimeType = 'image/jpeg', quality = 0.9) => {
       let loader
       if (url.indexOf('.exr') !== -1) loader = new EXRLoader()
       if (url.indexOf('.hdr') !== -1) loader = new RGBELoader()
       const image = await loader.loadAsync(`https://local/${url}`)
       image.flipY = false
-      const result = await encodeAndCompress({ image, outMimeType, outQuality, sdrToneMapping, flipY: loader instanceof EXRLoader })
+      const result = await encodeAndCompress({ image, mimeType, quality, flipY: loader instanceof EXRLoader })
       // Uint8Arrays can't be transferred outside puppetteer
       result.gainMap.data = Array.from(result.gainMap.data)
       result.sdr.data = Array.from(result.sdr.data)
       return result
     }
 
-    window.encodeJPEGMetadata = async (url, outMimeType = 'image/jpeg', outQuality = 0.9, sdrToneMapping = ACESFilmicToneMapping) => {
+    window.encodeJPEGMetadata = async (url, quality = 0.9) => {
       let loader
       if (url.indexOf('.exr') !== -1) loader = new EXRLoader()
       if (url.indexOf('.hdr') !== -1) loader = new RGBELoader()
       const image = await loader.loadAsync(`https://local/${url}`)
       image.flipY = false
-      const result = await encodeAndCompress({ image, outMimeType, outQuality, sdrToneMapping, flipY: loader instanceof EXRLoader })
+      const result = await encodeAndCompress({ image, mimeType: 'image/jpeg', quality, flipY: loader instanceof EXRLoader })
 
       const jpeg = await encodeJPEGMetadata(result)
       // Uint8Arrays can't be transferred outside puppetteer
@@ -69,12 +69,6 @@
       result.gainMap = Array.from(result.gainMap)
       result.sdr = Array.from(result.sdr)
       return result
-      // image.flipY = false
-      // const result = await encode({ image, outMimeType, outQuality, sdrToneMapping, flipY: loader instanceof EXRLoader})
-
-      // const jpeg = await encodeJPEGMetadata(result)
-      // // Uint8Arrays can't be transferred outside puppetteer
-      // return Array.from(jpeg)
     }
 
     document.getElementById('hdr').onchange = async (e) => {
@@ -85,7 +79,7 @@
       if (file.name.indexOf('.exr') !== -1) loader = new EXRLoader()
       if (file.name.indexOf('.hdr') !== -1) loader = new RGBELoader()
       const image = await loader.parse(buf)
-      const result = await encodeAndCompress({ image, outMimeType: 'image/jpeg', flipY: loader instanceof EXRLoader })
+      const result = await encodeAndCompress({ image, mimeType: 'image/jpeg', flipY: loader instanceof EXRLoader })
 
       encodeJPEGMetadata(result)
     }