adapated unit tests to inconsistent mtcnn box order between chrome and firefox

justadudewhohacks · justadudewhohacks · commit 729ea84d4ac7 · 2018-07-23T17:53:25.000+02:00
diff --git a/test/tests/e2e/allFacesMtcnn.test.ts b/test/tests/e2e/allFacesMtcnn.test.ts
@@ -1,7 +1,6 @@
 import * as faceapi from '../../../src';
 import { FaceLandmarks5 } from '../../../src/mtcnn/FaceLandmarks5';
-import { NetInput } from '../../../src/NetInput';
-import { describeWithNets, expectAllTensorsReleased } from '../../utils';
+import { describeWithNets, expectAllTensorsReleased, expectMaxDelta } from '../../utils';
 import { expectMtcnnResults } from './expectedResults';
 
 describe('allFacesMtcnn', () => {
@@ -29,9 +28,9 @@ describe('allFacesMtcnn', () => {
         faceDetection: res.detection,
         faceLandmarks: res.landmarks as FaceLandmarks5
       }))
-      expectMtcnnResults(mtcnnResult, [0, 1, 2, 3, 4, 5], 1, 1)
+      expectMtcnnResults(mtcnnResult, 5, 5)
       results.forEach(({ descriptor }, i) => {
-        expect(descriptor).toEqual(new Float32Array(facesFaceDescriptors[i]))
+        descriptor.forEach((val, j) => expectMaxDelta(val, facesFaceDescriptors[i][j], 0.05))
       })
     })
 
diff --git a/test/tests/e2e/expectedResults.ts b/test/tests/e2e/expectedResults.ts
@@ -1,7 +1,7 @@
 import * as faceapi from '../../../src';
 import { FaceLandmarks5 } from '../../../src/mtcnn/FaceLandmarks5';
 import { Point } from '../../../src/Point';
-import { expectMaxDelta, expectPointClose, expectRectClose } from '../../utils';
+import { expectMaxDelta, expectPointClose, expectRectClose, rectDist } from '../../utils';
 
 export const expectedSsdBoxes = [
   { x: 48, y: 253, width: 104, height: 129 },
@@ -30,13 +30,25 @@ export const expectedMtcnnFaceLandmarks = [
   [new Point(489, 224), new Point(534, 223), new Point(507, 250), new Point(493, 271), new Point(530, 270)]
 ]
 
-
 export function expectMtcnnResults(
   results: { faceDetection: faceapi.FaceDetection, faceLandmarks: faceapi.FaceLandmarks5 }[],
-  boxOrder: number[],
   maxBoxDelta: number,
   maxLandmarkPointsDelta: number
 ) {
+
+  // find idx of closest box
+  const boxOrder = results
+    .map(({ faceDetection }) => faceDetection.getBox())
+    .map((box) =>
+      expectedMtcnnBoxes
+        .map((box, idx) => ({ box, idx }))
+        .reduce((closest, curr) => rectDist(box, closest.box) < rectDist(box, curr.box) ? closest : curr)
+        .idx
+  )
+
+  // expect there to be no duplicate indices
+  expect(new Set(boxOrder).size).toEqual(results.length)
+
   results.forEach((result, i) => {
     const { faceDetection, faceLandmarks } = result
     expect(faceDetection instanceof faceapi.FaceDetection).toBe(true)
diff --git a/test/tests/e2e/mtcnn.test.ts b/test/tests/e2e/mtcnn.test.ts
@@ -22,7 +22,7 @@ describe('mtcnn', () => {
 
       const results = await mtcnn.forward(imgEl, forwardParams)
       expect(results.length).toEqual(6)
-      expectMtcnnResults(results, [0, 1, 2, 3, 4, 5], 1, 1)
+      expectMtcnnResults(results, 5, 5)
     })
 
     it('minFaceSize = 80, finds all faces', async () => {
@@ -33,7 +33,7 @@ describe('mtcnn', () => {
       const results = await mtcnn.forward(imgEl, forwardParams)
 
       expect(results.length).toEqual(6)
-      expectMtcnnResults(results, [0, 5, 3, 1, 2, 4], 12, 12)
+      expectMtcnnResults(results, 12, 12)
     })
 
     it('all optional params passed, finds all faces', async () => {
@@ -46,7 +46,7 @@ describe('mtcnn', () => {
 
       const results = await mtcnn.forward(imgEl, forwardParams)
       expect(results.length).toEqual(6)
-      expectMtcnnResults(results, [5, 1, 4, 3, 2, 0], 6, 10)
+      expectMtcnnResults(results, 6, 10)
     })
 
     it('scale steps passed, finds all faces', async () => {
@@ -56,7 +56,7 @@ describe('mtcnn', () => {
 
       const results = await mtcnn.forward(imgEl, forwardParams)
       expect(results.length).toEqual(6)
-      expectMtcnnResults(results, [5, 1, 3, 0, 2, 4], 7, 15)
+      expectMtcnnResults(results, 7, 15)
     })
 
   })
diff --git a/test/utils.ts b/test/utils.ts
@@ -7,6 +7,9 @@ import { IPoint } from '../src/';
 import { allFacesFactory, allFacesMtcnnFactory } from '../src/allFacesFactory';
 import { allFacesMtcnnFunction, allFacesFunction } from '../src/globalApi';
 
+// increase default timeout for async hooks
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000
+
 export function zeros(length: number): Float32Array {
   return new Float32Array(length)
 }
@@ -50,6 +53,13 @@ export function expectRectClose(
   expectMaxDelta(height, expectedBox.height, maxDelta)
 }
 
+export function rectDist (r1: IRect, r2: IRect) {
+  return Math.abs(r1.x - r2.x)
+    + Math.abs(r1.y - r2.y)
+    + Math.abs(r1.width - r2.width)
+    + Math.abs(r1.height - r2.height)
+}
+
 export type WithNetOptions = {
   quantized?: boolean
 }
