Add tests

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraXProxy.java

@@ -74,13 +74,13 @@ public static Size sizeFromResolution(@NonNull ResolutionInfo resolutionInfo) {
     return new Size(resolutionInfo.getWidth().intValue(), resolutionInfo.getHeight().intValue());
   }
 
-    /**
+  /**
    * Creates an instance of the {@code ImageAnalysisFlutterApiImpl}.
    *
    * <p>Included in this class for testing purposes.
    */
   public ImageAnalysisFlutterApiImpl createImageAnalysisFlutterApiImpl(
-    @NonNull BinaryMessenger binaryMessenger) {
-  return new ImageAnalysisFlutterApiImpl(binaryMessenger);
-}
+      @NonNull BinaryMessenger binaryMessenger) {
+    return new ImageAnalysisFlutterApiImpl(binaryMessenger);
+  }
 }

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/ImageAnalysisHostApiImpl.java

@@ -36,7 +36,6 @@ public ImageAnalysisHostApiImpl(
   public void setContext(Context context) {
     this.context = context;
   }
-
 
   @Override
   public void create(@NonNull Long identifier, @Nullable ResolutionInfo targetResolution) {
@@ -81,7 +80,7 @@ public void analyze(@NonNull ImageProxy image) {
                   .build());
         }
 
-        // TODO (camsim99): Retrieve and send the following when made available by b/274791178: 
+        // TODO (camsim99): Retrieve and send the following when made available by b/274791178:
         // last lens aperture, last sensor exposure time, last sensor sensitivity.
         GeneratedCameraXLibrary.ImageInformation.Builder imageInfoBuilder =
             new GeneratedCameraXLibrary.ImageInformation.Builder();
@@ -91,7 +90,7 @@ public void analyze(@NonNull ImageProxy image) {
         imageInfoBuilder.setImagePlanesInformation(imagePlanesInformation);
 
         ImageAnalysisFlutterApiImpl imageAnalysisFlutterApiImpl =
-          cameraXProxy.createImageAnalysisFlutterApiImpl(binaryMessenger);
+            cameraXProxy.createImageAnalysisFlutterApiImpl(binaryMessenger);
         imageAnalysisFlutterApiImpl.sendOnImageAnalyzedEvent(imageInfoBuilder.build(), reply -> {});
         image.close();
       }
@@ -101,8 +100,7 @@ public void analyze(@NonNull ImageProxy image) {
   @Override
   public void clearAnalyzer(@NonNull Long identifier) {
     ImageAnalysis imageAnalysis =
-      (ImageAnalysis) Objects.requireNonNull(instanceManager.getInstance(identifier));
+        (ImageAnalysis) Objects.requireNonNull(instanceManager.getInstance(identifier));
     imageAnalysis.clearAnalyzer();
   }
-
 }

packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/ImageAnalysisTest.java

@@ -8,9 +8,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -19,165 +17,164 @@
 import androidx.camera.core.ImageAnalysis;
 import androidx.camera.core.ImageProxy;
 import androidx.test.core.app.ApplicationProvider;
-import io.flutter.plugins.camerax.CameraXProxy;
-import io.flutter.plugins.camerax.ImageAnalysisFlutterApiImpl;
-import io.flutter.plugins.camerax.ImageAnalysisHostApiImpl;
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.ImageInformation;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.ImagePlaneInformation;
-import io.flutter.plugins.camerax.GeneratedCameraXLibrary.ResolutionInfo;
-import io.flutter.plugins.camerax.InstanceManager;
-import io.flutter.plugin.common.BinaryMessenger;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.concurrent.Executor;
 import java.util.List;
+import java.util.concurrent.Executor;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.MockedStatic;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class ImageAnalysisTest {
-    @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();
-
-    @Mock public ImageAnalysis mockImageAnalysis;
-    @Mock public BinaryMessenger mockBinaryMessenger;
-    @Mock public CameraXProxy mockCameraXProxy;
-
-    InstanceManager testInstanceManager;
-    private Context context;
-
-    @Before
-    public void setUp() throws Exception {
-      testInstanceManager = spy(InstanceManager.open(identifier -> {}));
-      context = ApplicationProvider.getApplicationContext();
-    }
-
-    @After
-    public void tearDown() {
-      testInstanceManager.close();
-    }
-
-    @Test
-    public void create_buildsExpectedImageAnalysisInstance() {
-        final ImageAnalysisHostApiImpl imageAnalysisHostApiImpl =
-            new ImageAnalysisHostApiImpl(mockBinaryMessenger, testInstanceManager);
-        final Long imageAnalysisIdentifier = 83L;
-        final int targetResolutionWidth = 11;
-        final int targetResolutionHeight = 51;
-        final GeneratedCameraXLibrary.ResolutionInfo resolutionInfo =
-            new GeneratedCameraXLibrary.ResolutionInfo.Builder()
-                .setWidth(Long.valueOf(targetResolutionWidth))
-                .setHeight(Long.valueOf(targetResolutionHeight))
-                .build();
-        final ImageAnalysis.Builder mockImageAnalysisBuilder = mock(ImageAnalysis.Builder.class);
-
-        imageAnalysisHostApiImpl.cameraXProxy = mockCameraXProxy;
-        when(mockCameraXProxy.createImageAnalysisBuilder()).thenReturn(mockImageAnalysisBuilder);
-        when(mockImageAnalysisBuilder.build()).thenReturn(mockImageAnalysis);
-
-        final ArgumentCaptor<Size> sizeCaptor = ArgumentCaptor.forClass(Size.class);
-
-        imageAnalysisHostApiImpl.create(imageAnalysisIdentifier, resolutionInfo);
-
-        verify(mockImageAnalysisBuilder).setTargetResolution(sizeCaptor.capture());
-        assertEquals(sizeCaptor.getValue().getWidth(), targetResolutionWidth);
-        assertEquals(sizeCaptor.getValue().getHeight(), targetResolutionHeight);
-        verify(mockImageAnalysisBuilder).build();
-        verify(testInstanceManager).addDartCreatedInstance(mockImageAnalysis, imageAnalysisIdentifier);
-    }
-
-    @Test
-    public void setAnalyzer_setsAnalyzerThatSendsExpectedImageInformation() {
-        final ImageAnalysisHostApiImpl imageAnalysisHostApiImpl =
-            new ImageAnalysisHostApiImpl(mockBinaryMessenger, testInstanceManager);
-        final ImageAnalysisFlutterApiImpl mockImageAnalysisFlutterApiImpl = mock(ImageAnalysisFlutterApiImpl.class);
-        final Long mockImageAnalysisIdentifier = 37L;
-        final ImageProxy mockImageProxy = mock(ImageProxy.class);
-
-        testInstanceManager.addDartCreatedInstance(mockImageAnalysis, mockImageAnalysisIdentifier);
-        imageAnalysisHostApiImpl.setContext(context);
-        imageAnalysisHostApiImpl.cameraXProxy = mockCameraXProxy;
-        when(mockCameraXProxy.createImageAnalysisFlutterApiImpl(mockBinaryMessenger)).thenReturn(mockImageAnalysisFlutterApiImpl);
-
-        final ArgumentCaptor<ImageAnalysis.Analyzer> analyzerCaptor = ArgumentCaptor.forClass(ImageAnalysis.Analyzer.class);
-
-        // Test that analyzer is set:
-
-        imageAnalysisHostApiImpl.setAnalyzer(mockImageAnalysisIdentifier);
-
-        verify(mockImageAnalysis).setAnalyzer(any(Executor.class), analyzerCaptor.capture());
-        ImageAnalysis.Analyzer analyzer = analyzerCaptor.getValue();
-
-        // Test that the expected image information is sent:
-
-        final ImageProxy.PlaneProxy mockPlaneProxy = mock(ImageProxy.PlaneProxy.class);
-        final ImageProxy.PlaneProxy[] mockPlanes = new ImageProxy.PlaneProxy[] { mockPlaneProxy };
-        final ByteBuffer mockByteBuffer = mock(ByteBuffer.class);
-        final int remainingBytes = 1;
-        final int rowStride = 40;
-        final int pixelStride = 36;
-        final int width = 50;
-        final int height = 10;
-        final int format = 35;
-
-        when(mockImageProxy.getPlanes()).thenReturn(mockPlanes);
-        when(mockPlaneProxy.getBuffer()).thenReturn(mockByteBuffer);
-        when(mockByteBuffer.remaining()).thenReturn(remainingBytes);
-        when(mockPlaneProxy.getRowStride()).thenReturn(rowStride);
-        when(mockPlaneProxy.getPixelStride()).thenReturn(pixelStride);
-        when(mockImageProxy.getWidth()).thenReturn(width);
-        when(mockImageProxy.getHeight()).thenReturn(height);
-        when(mockImageProxy.getFormat()).thenReturn(format);
-
-        final ArgumentCaptor<GeneratedCameraXLibrary.ImageInformation> imageInformationCaptor = ArgumentCaptor.forClass(GeneratedCameraXLibrary.ImageInformation.class);
-
-        analyzer.analyze(mockImageProxy);
-
-        verify(mockImageAnalysisFlutterApiImpl).sendOnImageAnalyzedEvent(imageInformationCaptor.capture(), any());
-        verify(mockImageProxy).close();
-
-        ImageInformation imageInformation = imageInformationCaptor.getValue();
-        assertEquals(imageInformation.getWidth(), Long.valueOf(width));
-        assertEquals(imageInformation.getHeight(), Long.valueOf(height));
-        assertEquals(imageInformation.getFormat(), Long.valueOf(format));
-        List<ImagePlaneInformation> imagePlanesInformation = imageInformation.getImagePlanesInformation();
-        ImagePlaneInformation imagePlaneInformation = imagePlanesInformation.get(0);
-        assertEquals(imagePlaneInformation.getBytesPerRow(), Long.valueOf(rowStride));
-        assertEquals(imagePlaneInformation.getBytesPerPixel(), Long.valueOf(pixelStride));
-        // We expect one (remainingBytes) bye. This byte should equal the byte contained by the mock ByteBuffer.
-        assertEquals(imagePlaneInformation.getBytes().length, remainingBytes);
-        assertEquals(imagePlaneInformation.getBytes()[0], mockByteBuffer.get());
-    }
-
-    @Test
-    public void clearAnalyzer_makesCallToClearAnalyzer() {
-        final ImageAnalysisHostApiImpl imageAnalysisHostApiImpl =
-            new ImageAnalysisHostApiImpl(mockBinaryMessenger, testInstanceManager);
-        final Long mockImageAnalysisIdentifier = 12L;
-
-        testInstanceManager.addDartCreatedInstance(mockImageAnalysis, mockImageAnalysisIdentifier);
-
-        imageAnalysisHostApiImpl.clearAnalyzer(mockImageAnalysisIdentifier);
-
-        verify(mockImageAnalysis).clearAnalyzer();
-    }
-
-    @Test
-    public void sendOnImageAnalyzedEvent_callsOnImageAnalyzed() {
-        final ImageAnalysisFlutterApiImpl spyFlutterApi =
-            spy(new ImageAnalysisFlutterApiImpl(mockBinaryMessenger));
-        final ImageInformation mockImageInformation = mock(ImageInformation.class);
-
-        spyFlutterApi.sendOnImageAnalyzedEvent(mockImageInformation, reply -> {});
-
-        verify(spyFlutterApi).onImageAnalyzed(eq(mockImageInformation), any());
-    }
- }
+  @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();
+
+  @Mock public ImageAnalysis mockImageAnalysis;
+  @Mock public BinaryMessenger mockBinaryMessenger;
+  @Mock public CameraXProxy mockCameraXProxy;
+
+  InstanceManager testInstanceManager;
+  private Context context;
+
+  @Before
+  public void setUp() throws Exception {
+    testInstanceManager = spy(InstanceManager.open(identifier -> {}));
+    context = ApplicationProvider.getApplicationContext();
+  }
+
+  @After
+  public void tearDown() {
+    testInstanceManager.close();
+  }
+
+  @Test
+  public void create_buildsExpectedImageAnalysisInstance() {
+    final ImageAnalysisHostApiImpl imageAnalysisHostApiImpl =
+        new ImageAnalysisHostApiImpl(mockBinaryMessenger, testInstanceManager);
+    final Long imageAnalysisIdentifier = 83L;
+    final int targetResolutionWidth = 11;
+    final int targetResolutionHeight = 51;
+    final GeneratedCameraXLibrary.ResolutionInfo resolutionInfo =
+        new GeneratedCameraXLibrary.ResolutionInfo.Builder()
+            .setWidth(Long.valueOf(targetResolutionWidth))
+            .setHeight(Long.valueOf(targetResolutionHeight))
+            .build();
+    final ImageAnalysis.Builder mockImageAnalysisBuilder = mock(ImageAnalysis.Builder.class);
+
+    imageAnalysisHostApiImpl.cameraXProxy = mockCameraXProxy;
+    when(mockCameraXProxy.createImageAnalysisBuilder()).thenReturn(mockImageAnalysisBuilder);
+    when(mockImageAnalysisBuilder.build()).thenReturn(mockImageAnalysis);
+
+    final ArgumentCaptor<Size> sizeCaptor = ArgumentCaptor.forClass(Size.class);
+
+    imageAnalysisHostApiImpl.create(imageAnalysisIdentifier, resolutionInfo);
+
+    verify(mockImageAnalysisBuilder).setTargetResolution(sizeCaptor.capture());
+    assertEquals(sizeCaptor.getValue().getWidth(), targetResolutionWidth);
+    assertEquals(sizeCaptor.getValue().getHeight(), targetResolutionHeight);
+    verify(mockImageAnalysisBuilder).build();
+    verify(testInstanceManager).addDartCreatedInstance(mockImageAnalysis, imageAnalysisIdentifier);
+  }
+
+  @Test
+  public void setAnalyzer_setsAnalyzerThatSendsExpectedImageInformation() {
+    final ImageAnalysisHostApiImpl imageAnalysisHostApiImpl =
+        new ImageAnalysisHostApiImpl(mockBinaryMessenger, testInstanceManager);
+    final ImageAnalysisFlutterApiImpl mockImageAnalysisFlutterApiImpl =
+        mock(ImageAnalysisFlutterApiImpl.class);
+    final Long mockImageAnalysisIdentifier = 37L;
+    final ImageProxy mockImageProxy = mock(ImageProxy.class);
+
+    testInstanceManager.addDartCreatedInstance(mockImageAnalysis, mockImageAnalysisIdentifier);
+    imageAnalysisHostApiImpl.setContext(context);
+    imageAnalysisHostApiImpl.cameraXProxy = mockCameraXProxy;
+    when(mockCameraXProxy.createImageAnalysisFlutterApiImpl(mockBinaryMessenger))
+        .thenReturn(mockImageAnalysisFlutterApiImpl);
+
+    final ArgumentCaptor<ImageAnalysis.Analyzer> analyzerCaptor =
+        ArgumentCaptor.forClass(ImageAnalysis.Analyzer.class);
+
+    // Test that analyzer is set:
+
+    imageAnalysisHostApiImpl.setAnalyzer(mockImageAnalysisIdentifier);
+
+    verify(mockImageAnalysis).setAnalyzer(any(Executor.class), analyzerCaptor.capture());
+    ImageAnalysis.Analyzer analyzer = analyzerCaptor.getValue();
+
+    // Test that the expected image information is sent:
+
+    final ImageProxy.PlaneProxy mockPlaneProxy = mock(ImageProxy.PlaneProxy.class);
+    final ImageProxy.PlaneProxy[] mockPlanes = new ImageProxy.PlaneProxy[] {mockPlaneProxy};
+    final ByteBuffer mockByteBuffer = mock(ByteBuffer.class);
+    final int remainingBytes = 1;
+    final int rowStride = 40;
+    final int pixelStride = 36;
+    final int width = 50;
+    final int height = 10;
+    final int format = 35;
+
+    when(mockImageProxy.getPlanes()).thenReturn(mockPlanes);
+    when(mockPlaneProxy.getBuffer()).thenReturn(mockByteBuffer);
+    when(mockByteBuffer.remaining()).thenReturn(remainingBytes);
+    when(mockPlaneProxy.getRowStride()).thenReturn(rowStride);
+    when(mockPlaneProxy.getPixelStride()).thenReturn(pixelStride);
+    when(mockImageProxy.getWidth()).thenReturn(width);
+    when(mockImageProxy.getHeight()).thenReturn(height);
+    when(mockImageProxy.getFormat()).thenReturn(format);
+
+    final ArgumentCaptor<GeneratedCameraXLibrary.ImageInformation> imageInformationCaptor =
+        ArgumentCaptor.forClass(GeneratedCameraXLibrary.ImageInformation.class);
+
+    analyzer.analyze(mockImageProxy);
+
+    verify(mockImageAnalysisFlutterApiImpl)
+        .sendOnImageAnalyzedEvent(imageInformationCaptor.capture(), any());
+    verify(mockImageProxy).close();
+
+    ImageInformation imageInformation = imageInformationCaptor.getValue();
+    assertEquals(imageInformation.getWidth(), Long.valueOf(width));
+    assertEquals(imageInformation.getHeight(), Long.valueOf(height));
+    assertEquals(imageInformation.getFormat(), Long.valueOf(format));
+    List<ImagePlaneInformation> imagePlanesInformation =
+        imageInformation.getImagePlanesInformation();
+    ImagePlaneInformation imagePlaneInformation = imagePlanesInformation.get(0);
+    assertEquals(imagePlaneInformation.getBytesPerRow(), Long.valueOf(rowStride));
+    assertEquals(imagePlaneInformation.getBytesPerPixel(), Long.valueOf(pixelStride));
+    // We expect one (remainingBytes) bye. This byte should equal the byte contained by the mock ByteBuffer.
+    assertEquals(imagePlaneInformation.getBytes().length, remainingBytes);
+    assertEquals(imagePlaneInformation.getBytes()[0], mockByteBuffer.get());
+  }
+
+  @Test
+  public void clearAnalyzer_makesCallToClearAnalyzer() {
+    final ImageAnalysisHostApiImpl imageAnalysisHostApiImpl =
+        new ImageAnalysisHostApiImpl(mockBinaryMessenger, testInstanceManager);
+    final Long mockImageAnalysisIdentifier = 12L;
+
+    testInstanceManager.addDartCreatedInstance(mockImageAnalysis, mockImageAnalysisIdentifier);
+
+    imageAnalysisHostApiImpl.clearAnalyzer(mockImageAnalysisIdentifier);
+
+    verify(mockImageAnalysis).clearAnalyzer();
+  }
+
+  @Test
+  public void sendOnImageAnalyzedEvent_callsOnImageAnalyzed() {
+    final ImageAnalysisFlutterApiImpl spyFlutterApi =
+        spy(new ImageAnalysisFlutterApiImpl(mockBinaryMessenger));
+    final ImageInformation mockImageInformation = mock(ImageInformation.class);
+
+    spyFlutterApi.sendOnImageAnalyzedEvent(mockImageInformation, reply -> {});
+
+    verify(spyFlutterApi).onImageAnalyzed(eq(mockImageInformation), any());
+  }
+}

packages/camera/camera_android_camerax/example/lib/main.dart

@@ -277,16 +277,19 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
             IconButton(
               icon: const Icon(Icons.flash_on),
               color: Colors.blue,
-              onPressed: () {controller?.startImageStream((CameraImage image) {}); }, // TODO(camsim99): Add functionality back here.
+              onPressed: () {
+                controller?.startImageStream((CameraImage image) {});
+              }, // TODO(camsim99): Add functionality back here.
             ),
             // The exposure and focus mode are currently not supported on the web.
             ...!kIsWeb
                 ? <Widget>[
                     IconButton(
                       icon: const Icon(Icons.exposure),
                       color: Colors.blue,
-                      onPressed:
-                          () {controller?.stopImageStream(); }, // TODO(camsim99): Add functionality back here.
+                      onPressed: () {
+                        controller?.stopImageStream();
+                      }, // TODO(camsim99): Add functionality back here.
                     ),
                     IconButton(
                       icon: const Icon(Icons.filter_center_focus),