Fix java tests

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

@@ -114,7 +114,8 @@ public void setUp(
         binaryMessenger, new FallbackStrategyHostApiImpl(instanceManager));
     GeneratedCameraXLibrary.QualitySelectorHostApi.setup(
         binaryMessenger, new QualitySelectorHostApiImpl(instanceManager));
-    cameraControlHostApiImpl = new CameraControlHostApiImpl(binaryMessenger, instanceManager, context);
+    cameraControlHostApiImpl =
+        new CameraControlHostApiImpl(binaryMessenger, instanceManager, context);
     GeneratedCameraXLibrary.CameraControlHostApi.setup(binaryMessenger, cameraControlHostApiImpl);
   }
 

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

@@ -8,7 +8,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.camera.core.CameraControl;
-import androidx.camera.core.CameraInfo;
 import androidx.camera.core.FocusMeteringAction;
 import androidx.camera.core.FocusMeteringResult;
 import androidx.core.content.ContextCompat;
@@ -165,7 +164,9 @@ public void onFailure(Throwable t) {
    * @param instanceManager maintains instances stored to communicate with attached Dart objects
    */
   public CameraControlHostApiImpl(
-       @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager, @NonNull Context context) {
+      @NonNull BinaryMessenger binaryMessenger,
+      @NonNull InstanceManager instanceManager,
+      @NonNull Context context) {
     this(binaryMessenger, instanceManager, new CameraControlProxy(), context);
   }
 

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

@@ -41,9 +41,10 @@ public static class FocusMeteringActionProxy {
       MeteringPoint firstMeteringPoint = meteringPoints.get(0);
       Integer firstMeteringPointMode = meteringPointModes.get(0);
       if (firstMeteringPointMode == null) {
-          focusMeteringActionBuilder = getFocusMeteringActionBuilder(firstMeteringPoint);
+        focusMeteringActionBuilder = getFocusMeteringActionBuilder(firstMeteringPoint);
       } else {
-          focusMeteringActionBuilder = getFocusMeteringActionBuilder(firstMeteringPoint, firstMeteringPointMode);
+        focusMeteringActionBuilder =
+            getFocusMeteringActionBuilder(firstMeteringPoint, firstMeteringPointMode);
       }
 
       // Add any additional metering points in order as specified by input lists.
@@ -103,7 +104,8 @@ public void create(
     final List<Integer> meteringPointModes = new ArrayList<Integer>();
     for (MeteringPointInfo meteringPointInfo : meteringPointInfos) {
       meteringPoints.add(instanceManager.getInstance(meteringPointInfo.getMeteringPointId()));
-      meteringPointModes.add(meteringPointInfo.getMeteringMode().intValue());
+      Long meteringPointMode = meteringPointInfo.getMeteringMode();
+      meteringPointModes.add(meteringPointMode == null ? null : meteringPointMode.intValue());
     }
 
     instanceManager.addDartCreatedInstance(

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

@@ -53,7 +53,8 @@ public void tearDown() {
   public void enableTorch_turnsTorchModeOnAndOffAsExpected() {
     try (MockedStatic<Futures> mockedFutures = Mockito.mockStatic(Futures.class)) {
       final CameraControlHostApiImpl cameraControlHostApiImpl =
-          new CameraControlHostApiImpl(mockBinaryMessenger, testInstanceManager, mock(Context.class));
+          new CameraControlHostApiImpl(
+              mockBinaryMessenger, testInstanceManager, mock(Context.class));
       final Long cameraControlIdentifier = 88L;
       final boolean enableTorch = true;
 
@@ -103,7 +104,8 @@ public void enableTorch_turnsTorchModeOnAndOffAsExpected() {
   public void setZoomRatio_setsZoomAsExpected() {
     try (MockedStatic<Futures> mockedFutures = Mockito.mockStatic(Futures.class)) {
       final CameraControlHostApiImpl cameraControlHostApiImpl =
-          new CameraControlHostApiImpl(mockBinaryMessenger, testInstanceManager, mock(Context.class));
+          new CameraControlHostApiImpl(
+              mockBinaryMessenger, testInstanceManager, mock(Context.class));
       final Long cameraControlIdentifier = 33L;
       final Double zoomRatio = 0.2D;
 
@@ -154,7 +156,8 @@ public void setZoomRatio_setsZoomAsExpected() {
   public void startFocusAndMetering_startsFocusAndMeteringAsExpected() {
     try (MockedStatic<Futures> mockedFutures = Mockito.mockStatic(Futures.class)) {
       final CameraControlHostApiImpl cameraControlHostApiImpl =
-          new CameraControlHostApiImpl(mockBinaryMessenger, testInstanceManager, mock(Context.class));
+          new CameraControlHostApiImpl(
+              mockBinaryMessenger, testInstanceManager, mock(Context.class));
       final Long cameraControlIdentifier = 90L;
       final FocusMeteringAction mockAction = mock(FocusMeteringAction.class);
       final Long mockActionId = 44L;
@@ -216,7 +219,8 @@ public void startFocusAndMetering_startsFocusAndMeteringAsExpected() {
   public void cancelFocusAndMetering_cancelFocusAndMeteringAsExpected() {
     try (MockedStatic<Futures> mockedFutures = Mockito.mockStatic(Futures.class)) {
       final CameraControlHostApiImpl cameraControlHostApiImpl =
-          new CameraControlHostApiImpl(mockBinaryMessenger, testInstanceManager, mock(Context.class));
+          new CameraControlHostApiImpl(
+              mockBinaryMessenger, testInstanceManager, mock(Context.class));
       final Long cameraControlIdentifier = 8L;
 
       @SuppressWarnings("unchecked")
@@ -269,7 +273,8 @@ public void cancelFocusAndMetering_cancelFocusAndMeteringAsExpected() {
   public void setExposureCompensationIndex_setsExposureCompensationIndexAsExpected() {
     try (MockedStatic<Futures> mockedFutures = Mockito.mockStatic(Futures.class)) {
       final CameraControlHostApiImpl cameraControlHostApiImpl =
-          new CameraControlHostApiImpl(mockBinaryMessenger, testInstanceManager, mock(Context.class));
+          new CameraControlHostApiImpl(
+              mockBinaryMessenger, testInstanceManager, mock(Context.class));
       final Long cameraControlIdentifier = 53L;
       final Long index = 2L;
 

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

@@ -43,11 +43,11 @@ public void tearDown() {
   }
 
   @Test
-  public void create_createsExpectedFocusMeteringActionWithInitialPointThatHasMode() {
+  public void hostApiCreatecreatesExpectedFocusMeteringActionWithInitialPointThatHasMode() {
     FocusMeteringActionHostApiImpl.FocusMeteringActionProxy proxySpy =
         spy(new FocusMeteringActionHostApiImpl.FocusMeteringActionProxy());
     FocusMeteringActionHostApiImpl hostApi =
-        new FocusMeteringActionHostApiImpl(testInstanceManager);
+        new FocusMeteringActionHostApiImpl(testInstanceManager, proxySpy);
     final Long focusMeteringActionIdentifier = 43L;
 
     FocusMeteringAction.Builder mockFocusMeteringActionBuilder =
@@ -65,13 +65,13 @@ public void create_createsExpectedFocusMeteringActionWithInitialPointThatHasMode
         new MeteringPointInfo.Builder()
             .setMeteringPointId(mockMeteringPoint1Id)
             .setMeteringMode(mockMeteringPoint1Mode.longValue())
-                        .build();
+            .build();
 
     MeteringPointInfo fakeMeteringPointInfo2 =
         new MeteringPointInfo.Builder()
             .setMeteringPointId(mockMeteringPoint2Id)
             .setMeteringMode(mockMeteringPoint2Mode.longValue())
-                        .build();
+            .build();
 
     MeteringPointInfo fakeMeteringPointInfo3 =
         new MeteringPointInfo.Builder()
@@ -83,7 +83,8 @@ public void create_createsExpectedFocusMeteringActionWithInitialPointThatHasMode
     testInstanceManager.addDartCreatedInstance(mockMeteringPoint2, mockMeteringPoint2Id);
     testInstanceManager.addDartCreatedInstance(mockMeteringPoint3, mockMeteringPoint3Id);
 
-    when(proxySpy.getFocusMeteringActionBuilder(mockMeteringPoint1, mockMeteringPoint1Id.intValue()))
+    when(proxySpy.getFocusMeteringActionBuilder(
+            mockMeteringPoint1, mockMeteringPoint1Mode.intValue()))
         .thenReturn(mockFocusMeteringActionBuilder);
     when(mockFocusMeteringActionBuilder.build()).thenReturn(focusMeteringAction);
 
@@ -92,18 +93,18 @@ public void create_createsExpectedFocusMeteringActionWithInitialPointThatHasMode
 
     hostApi.create(focusMeteringActionIdentifier, mockMeteringPointInfos);
 
-    verify(mockFocusMeteringActionBuilder.addPoint(mockMeteringPoint2, mockMeteringPoint2Mode));
-    verify(mockFocusMeteringActionBuilder.addPoint(mockMeteringPoint3));
-    assertEquals(testInstanceManager.getInstance(focusMeteringActionIdentifier), focusMeteringAction);
+    verify(mockFocusMeteringActionBuilder).addPoint(mockMeteringPoint2, mockMeteringPoint2Mode);
+    verify(mockFocusMeteringActionBuilder).addPoint(mockMeteringPoint3);
+    assertEquals(
+        testInstanceManager.getInstance(focusMeteringActionIdentifier), focusMeteringAction);
   }
 
   @Test
-  public void
-      create_createsExpectedFocusMeteringActionWithInitialPointThatDoesNotHaveMode() {
+  public void hostApiCreatecreatesExpectedFocusMeteringActionWithInitialPointThatDoesNotHaveMode() {
     FocusMeteringActionHostApiImpl.FocusMeteringActionProxy proxySpy =
         spy(new FocusMeteringActionHostApiImpl.FocusMeteringActionProxy());
     FocusMeteringActionHostApiImpl hostApi =
-        new FocusMeteringActionHostApiImpl(testInstanceManager);
+        new FocusMeteringActionHostApiImpl(testInstanceManager, proxySpy);
     final Long focusMeteringActionIdentifier = 43L;
 
     FocusMeteringAction.Builder mockFocusMeteringActionBuilder =
@@ -120,7 +121,7 @@ public void create_createsExpectedFocusMeteringActionWithInitialPointThatHasMode
         new MeteringPointInfo.Builder()
             .setMeteringPointId(mockMeteringPoint1Id)
             .setMeteringMode(null)
-                        .build();
+            .build();
 
     MeteringPointInfo fakeMeteringPointInfo2 =
         new MeteringPointInfo.Builder()
@@ -131,8 +132,7 @@ public void create_createsExpectedFocusMeteringActionWithInitialPointThatHasMode
         new MeteringPointInfo.Builder()
             .setMeteringPointId(mockMeteringPoint3Id)
             .setMeteringMode(null)
-                        .build();
-
+            .build();
 
     testInstanceManager.addDartCreatedInstance(mockMeteringPoint1, mockMeteringPoint1Id);
     testInstanceManager.addDartCreatedInstance(mockMeteringPoint2, mockMeteringPoint2Id);
@@ -147,8 +147,9 @@ public void create_createsExpectedFocusMeteringActionWithInitialPointThatHasMode
 
     hostApi.create(focusMeteringActionIdentifier, mockMeteringPointInfos);
 
-    verify(mockFocusMeteringActionBuilder.addPoint(mockMeteringPoint2, mockMeteringPoint2Mode));
-    verify(mockFocusMeteringActionBuilder.addPoint(mockMeteringPoint3));
-    assertEquals(testInstanceManager.getInstance(focusMeteringActionIdentifier), focusMeteringAction);
+    verify(mockFocusMeteringActionBuilder).addPoint(mockMeteringPoint2, mockMeteringPoint2Mode);
+    verify(mockFocusMeteringActionBuilder).addPoint(mockMeteringPoint3);
+    assertEquals(
+        testInstanceManager.getInstance(focusMeteringActionIdentifier), focusMeteringAction);
   }
 }

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

@@ -7,12 +7,9 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.content.Context;
 import androidx.camera.core.FocusMeteringResult;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.FocusMeteringResultFlutterApi;

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

@@ -47,7 +47,7 @@ public void tearDown() {
   public void hostApiCreate_createsExpectedMeteringPointWithSizeSpecified() {
     MeteringPointHostApiImpl.MeteringPointProxy proxySpy =
         spy(new MeteringPointHostApiImpl.MeteringPointProxy());
-    MeteringPointHostApiImpl hostApi = new MeteringPointHostApiImpl(testInstanceManager);
+    MeteringPointHostApiImpl hostApi = new MeteringPointHostApiImpl(testInstanceManager, proxySpy);
     final Long meteringPointIdentifier = 78L;
     final Float x = 0.3f;
     final Float y = 0.2f;
@@ -59,21 +59,19 @@ public void hostApiCreate_createsExpectedMeteringPointWithSizeSpecified() {
 
     when(proxySpy.getSurfaceOrientedMeteringPointFactory(surfaceWidth, surfaceHeight))
         .thenReturn(mockSurfaceOrientedMeteringPointFactory);
-    when(mockSurfaceOrientedMeteringPointFactory.createPoint(
-            x, y, size))
-        .thenReturn(meteringPoint);
+    when(mockSurfaceOrientedMeteringPointFactory.createPoint(x, y, size)).thenReturn(meteringPoint);
 
     hostApi.create(meteringPointIdentifier, x.doubleValue(), y.doubleValue(), size.doubleValue());
 
-    verify(mockSurfaceOrientedMeteringPointFactory.createPoint(x, y, size));
+    verify(mockSurfaceOrientedMeteringPointFactory).createPoint(x, y, size);
     assertEquals(testInstanceManager.getInstance(meteringPointIdentifier), meteringPoint);
   }
 
   @Test
   public void hostApiCreate_createsExpectedMeteringPointWithoutSizeSpecified() {
     MeteringPointHostApiImpl.MeteringPointProxy proxySpy =
         spy(new MeteringPointHostApiImpl.MeteringPointProxy());
-    MeteringPointHostApiImpl hostApi = new MeteringPointHostApiImpl(testInstanceManager);
+    MeteringPointHostApiImpl hostApi = new MeteringPointHostApiImpl(testInstanceManager, proxySpy);
     final Long meteringPointIdentifier = 78L;
     final Float x = 0.3f;
     final Float y = 0.2f;
@@ -84,12 +82,11 @@ public void hostApiCreate_createsExpectedMeteringPointWithoutSizeSpecified() {
 
     when(proxySpy.getSurfaceOrientedMeteringPointFactory(surfaceWidth, surfaceHeight))
         .thenReturn(mockSurfaceOrientedMeteringPointFactory);
-    when(mockSurfaceOrientedMeteringPointFactory.createPoint(x, y))
-        .thenReturn(meteringPoint);
+    when(mockSurfaceOrientedMeteringPointFactory.createPoint(x, y)).thenReturn(meteringPoint);
 
     hostApi.create(meteringPointIdentifier, x.doubleValue(), y.doubleValue(), null);
 
-    verify(mockSurfaceOrientedMeteringPointFactory.createPoint(x, y));
+    verify(mockSurfaceOrientedMeteringPointFactory).createPoint(x, y);
     assertEquals(testInstanceManager.getInstance(meteringPointIdentifier), meteringPoint);
   }