Commit 1b28164f authored by Thiabaud Engelbrecht's avatar Thiabaud Engelbrecht Committed by Commit Bot

Test batching of shape_detection unit tests

For reference, the UNIT_TESTS batch can be run locally using:
out/.../bin/run_chrome_public_test_apk -A Batch=UnitTests

Bug: 989569
Change-Id: Icea283a01697c4fdade7039d8b4ef629af835655
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346984Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Commit-Queue: Thiabaud Engelbrecht <thiabaud@google.com>
Cr-Commit-Position: refs/heads/master@{#796529}
parent ceb2c354
...@@ -16,6 +16,7 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate; ...@@ -16,6 +16,7 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
import org.chromium.base.test.params.ParameterProvider; import org.chromium.base.test.params.ParameterProvider;
import org.chromium.base.test.params.ParameterSet; import org.chromium.base.test.params.ParameterSet;
import org.chromium.base.test.params.ParameterizedRunner; import org.chromium.base.test.params.ParameterizedRunner;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.shape_detection.mojom.BarcodeDetection; import org.chromium.shape_detection.mojom.BarcodeDetection;
import org.chromium.shape_detection.mojom.BarcodeDetectionProvider; import org.chromium.shape_detection.mojom.BarcodeDetectionProvider;
...@@ -32,6 +33,7 @@ import java.util.concurrent.TimeUnit; ...@@ -32,6 +33,7 @@ import java.util.concurrent.TimeUnit;
* Test suite for BarcodeDetectionImpl. * Test suite for BarcodeDetectionImpl.
*/ */
@RunWith(ParameterizedRunner.class) @RunWith(ParameterizedRunner.class)
@Batch(Batch.UNIT_TESTS)
@UseRunnerDelegate(BaseJUnit4RunnerDelegate.class) @UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
public class BarcodeDetectionImplTest { public class BarcodeDetectionImplTest {
private static final org.chromium.skia.mojom.Bitmap QR_CODE_BITMAP = private static final org.chromium.skia.mojom.Bitmap QR_CODE_BITMAP =
......
...@@ -16,6 +16,7 @@ import org.junit.Test; ...@@ -16,6 +16,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.BaseJUnit4ClassRunner; import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.shape_detection.mojom.FaceDetection; import org.chromium.shape_detection.mojom.FaceDetection;
import org.chromium.shape_detection.mojom.FaceDetectionResult; import org.chromium.shape_detection.mojom.FaceDetectionResult;
...@@ -28,6 +29,7 @@ import java.util.concurrent.TimeUnit; ...@@ -28,6 +29,7 @@ import java.util.concurrent.TimeUnit;
* Test suite for FaceDetectionImpl. * Test suite for FaceDetectionImpl.
*/ */
@RunWith(BaseJUnit4ClassRunner.class) @RunWith(BaseJUnit4ClassRunner.class)
@Batch(Batch.UNIT_TESTS)
public class FaceDetectionImplTest { public class FaceDetectionImplTest {
private static final org.chromium.skia.mojom.Bitmap MONA_LISA_BITMAP = private static final org.chromium.skia.mojom.Bitmap MONA_LISA_BITMAP =
TestUtils.mojoBitmapFromFile("mona_lisa.jpg"); TestUtils.mojoBitmapFromFile("mona_lisa.jpg");
......
...@@ -11,6 +11,7 @@ import org.junit.Test; ...@@ -11,6 +11,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.BaseJUnit4ClassRunner; import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.gfx.mojom.RectF; import org.chromium.gfx.mojom.RectF;
import org.chromium.shape_detection.mojom.TextDetection; import org.chromium.shape_detection.mojom.TextDetection;
...@@ -23,6 +24,7 @@ import java.util.concurrent.TimeUnit; ...@@ -23,6 +24,7 @@ import java.util.concurrent.TimeUnit;
* Test suite for TextDetectionImpl. * Test suite for TextDetectionImpl.
*/ */
@RunWith(BaseJUnit4ClassRunner.class) @RunWith(BaseJUnit4ClassRunner.class)
@Batch(Batch.UNIT_TESTS)
public class TextDetectionImplTest { public class TextDetectionImplTest {
private static final String[] DETECTION_EXPECTED_TEXT = { private static final String[] DETECTION_EXPECTED_TEXT = {
"The quick brown fox jumped over the lazy dog.", "Helvetica Neue 36."}; "The quick brown fox jumped over the lazy dog.", "Helvetica Neue 36."};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment