| OLD | NEW | 
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> | 
| 2 <script src="../resources/testharness.js"></script> | 2 <script src="../resources/testharness.js"></script> | 
| 3 <script src="../resources/testharnessreport.js"></script> | 3 <script src="../resources/testharnessreport.js"></script> | 
| 4 <script src="../resources/mojo-helpers.js"></script> | 4 <script src="../resources/mojo-helpers.js"></script> | 
| 5 <script src="resources/mock-barcodedetection.js"></script> | 5 <script src="resources/mock-barcodedetection.js"></script> | 
| 6 <script src="resources/mock-facedetection.js"></script> | 6 <script src="resources/mock-facedetection.js"></script> | 
| 7 <script> | 7 <script> | 
| 8 | 8 | 
| 9 var createTestForImageBitmap = function(detectorName, mockReady, | 9 var createTestForImageBitmap = function(createDetector, mockReady, | 
| 10                                         detectionResultTest) { | 10                                         detectionResultTest) { | 
| 11   async_test(function(t) { | 11   async_test(function(t) { | 
| 12     var img = new Image(); | 12     var img = new Image(); | 
| 13 | 13 | 
| 14     img.onload = function() { | 14     img.onload = function() { | 
| 15       var theImageBitmap = null; | 15       var theImageBitmap = null; | 
| 16       var theMock = null; | 16       var theMock = null; | 
| 17 | 17 | 
| 18       createImageBitmap(img) | 18       createImageBitmap(img) | 
| 19           .then(imageBitmap => { | 19           .then(imageBitmap => { | 
| 20             theImageBitmap = imageBitmap; | 20             theImageBitmap = imageBitmap; | 
| 21             return mockReady(); | 21             return mockReady(); | 
| 22           }) | 22           }) | 
| 23           .catch(error => { | 23           .catch(error => { | 
| 24             assert_unreached('createImageBitmap() error: ' + error); | 24             assert_unreached("createImageBitmap() error: " + error); | 
| 25           }) | 25           }) | 
| 26           .then(mock => { | 26           .then(mock => { | 
| 27             theMock = mock; | 27             theMock = mock; | 
| 28             var detector = eval("new " + detectorName + "();"); | 28             var detector = createDetector(); | 
| 29             return detector; | 29             return detector; | 
| 30           }) | 30           }) | 
| 31           .catch(error => { | 31           .catch(error => { | 
| 32             assert_unreached("Error creating MockFaceDetection: " + error); | 32             assert_unreached("Error creating Mock Detector: " + error); | 
| 33           }) | 33           }) | 
| 34           .then(detector => { | 34           .then(detector => { | 
| 35             return detector.detect(theImageBitmap); | 35             return detector.detect(theImageBitmap); | 
| 36           }) | 36           }) | 
| 37           .then(detectionResult => { | 37           .then(detectionResult => { | 
| 38             detectionResultTest(detectionResult, theMock); | 38             detectionResultTest(detectionResult, theMock); | 
| 39             t.done(); | 39             t.done(); | 
| 40           }) | 40           }) | 
| 41           .catch(error => { | 41           .catch(error => { | 
| 42             assert_unreached("Error during detect(img): " + error); | 42             assert_unreached("Error during detect(img): " + error); | 
| 43           }); | 43           }); | 
| 44     } | 44     } | 
| 45     img.src = '../media/content/greenbox.png'; | 45     img.src = "../media/content/greenbox.png"; | 
| 46   }, "Detector detect(ImageBitmap)"); | 46   }, "Detector detect(ImageBitmap)"); | 
| 47 }; | 47 }; | 
| 48 | 48 | 
| 49 function FaceDetectorDetectionResultTest(detectionResult, mock) { | 49 function FaceDetectorDetectionResultTest(detectionResult, mock) { | 
| 50   const imageReceivedByMock = mock.getFrameData(); | 50   const imageReceivedByMock = mock.getFrameData(); | 
| 51   assert_equals(imageReceivedByMock.byteLength, 2500,"Image length"); | 51   assert_equals(imageReceivedByMock.byteLength, 2500,"Image length"); | 
| 52   const GREEN_PIXEL = 0xFF00FF00; | 52   const GREEN_PIXEL = 0xFF00FF00; | 
| 53   assert_equals(imageReceivedByMock[0], GREEN_PIXEL, "Pixel color"); | 53   assert_equals(imageReceivedByMock[0], GREEN_PIXEL, "Pixel color"); | 
| 54   assert_equals(detectionResult.length, 3, "Number of faces"); | 54   assert_equals(detectionResult.length, 3, "Number of faces"); | 
| 55 } | 55 } | 
| 56 | 56 | 
| 57 function BarcodeDetectorDetectionResultTest(detectionResult, mock) { | 57 function BarcodeDetectorDetectionResultTest(detectionResult, mock) { | 
| 58   assert_equals(detectionResult.length, 2, "Number of barcodes"); | 58   assert_equals(detectionResult.length, 2, "Number of barcodes"); | 
| 59   assert_equals(detectionResult[0].rawValue, "cats", "barcode 1"); | 59   assert_equals(detectionResult[0].rawValue, "cats", "barcode 1"); | 
| 60   assert_equals(detectionResult[1].rawValue, "dogs", "barcode 2"); | 60   assert_equals(detectionResult[1].rawValue, "dogs", "barcode 2"); | 
| 61 } | 61 } | 
| 62 | 62 | 
| 63 // These tests verify that a Detector's detect() works on an ImageBitmap. | 63 // These tests verify that a Detector's detect() works on an ImageBitmap. | 
| 64 // Use the mock mojo server implemented in mock-{barcode,face}detection.js. | 64 // Use the mock mojo server implemented in mock-{barcode,face}detection.js. | 
| 65 generate_tests(createTestForImageBitmap, [ | 65 generate_tests(createTestForImageBitmap, [ | 
| 66   [ | 66   [ | 
| 67     "Face", | 67     "Face", | 
| 68     "FaceDetector", | 68     () => { return new FaceDetector(); }, | 
| 69     () => { return mockFaceDetectionReady; }, | 69     () => { return mockFaceDetectionReady; }, | 
| 70     FaceDetectorDetectionResultTest | 70     FaceDetectorDetectionResultTest | 
| 71   ], | 71   ], | 
| 72   [ | 72   [ | 
| 73     "Barcode", | 73     "Barcode", | 
| 74     "BarcodeDetector", | 74     () => { return new BarcodeDetector(); }, | 
| 75     () => { return mockBarcodeDetectionReady; }, | 75     () => { return mockBarcodeDetectionReady; }, | 
| 76     BarcodeDetectorDetectionResultTest | 76     BarcodeDetectorDetectionResultTest | 
| 77   ] | 77   ] | 
| 78 ]); | 78 ]); | 
| 79 | 79 | 
| 80 </script> | 80 </script> | 
| OLD | NEW | 
|---|