Add filter for cameras and corresponding test

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java

@@ -19,7 +19,8 @@
 /** Provides various utilities for camera. */
 public final class CameraUtils {
 
-  private CameraUtils() {}
+  private CameraUtils() {
+  }
 
   /**
    * Gets the {@link CameraManager} singleton.
@@ -36,8 +37,8 @@ static CameraManager getCameraManager(Context context) {
    *
    * @param orientation The orientation to serialize.
    * @return The serialized orientation.
-   * @throws UnsupportedOperationException when the provided orientation not have a corresponding
-   *     string value.
+   * @throws UnsupportedOperationException when the provided orientation not have
+   *                                       a corresponding string value.
    */
   static String serializeDeviceOrientation(PlatformChannel.DeviceOrientation orientation) {
     if (orientation == null)
@@ -52,19 +53,19 @@ static String serializeDeviceOrientation(PlatformChannel.DeviceOrientation orien
       case LANDSCAPE_RIGHT:
         return "landscapeRight";
       default:
-        throw new UnsupportedOperationException(
-            "Could not serialize device orientation: " + orientation.toString());
+        throw new UnsupportedOperationException("Could not serialize device orientation: " + orientation.toString());
     }
   }
 
   /**
-   * Deserializes a string value to its corresponding {@link PlatformChannel.DeviceOrientation}
-   * value.
+   * Deserializes a string value to its corresponding
+   * {@link PlatformChannel.DeviceOrientation} value.
    *
    * @param orientation The string value to deserialize.
    * @return The deserialized orientation.
-   * @throws UnsupportedOperationException when the provided string value does not have a
-   *     corresponding {@link PlatformChannel.DeviceOrientation}.
+   * @throws UnsupportedOperationException when the provided string value does not
+   *                                       have a corresponding
+   *                                       {@link PlatformChannel.DeviceOrientation}.
    */
   static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String orientation) {
     if (orientation == null)
@@ -79,8 +80,7 @@ static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String ori
       case "landscapeRight":
         return PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT;
       default:
-        throw new UnsupportedOperationException(
-            "Could not deserialize device orientation: " + orientation);
+        throw new UnsupportedOperationException("Could not deserialize device orientation: " + orientation);
     }
   }
 
@@ -91,31 +91,32 @@ static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String ori
    * @return A map of all the available cameras, with their name as their key.
    * @throws CameraAccessException when the camera could not be accessed.
    */
-  public static List<Map<String, Object>> getAvailableCameras(Activity activity)
-      throws CameraAccessException {
+  public static List<Map<String, Object>> getAvailableCameras(Activity activity) throws CameraAccessException {
     CameraManager cameraManager = (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE);
     String[] cameraNames = cameraManager.getCameraIdList();
     List<Map<String, Object>> cameras = new ArrayList<>();
     for (String cameraName : cameraNames) {
-      HashMap<String, Object> details = new HashMap<>();
-      CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraName);
-      details.put("name", cameraName);
-      int sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
-      details.put("sensorOrientation", sensorOrientation);
+      if (Integer.parseInt(cameraName, 10) >= 0) {
+        HashMap<String, Object> details = new HashMap<>();
+        CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraName);
+        details.put("name", cameraName);
+        int sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
+        details.put("sensorOrientation", sensorOrientation);
 
-      int lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
-      switch (lensFacing) {
-        case CameraMetadata.LENS_FACING_FRONT:
-          details.put("lensFacing", "front");
-          break;
-        case CameraMetadata.LENS_FACING_BACK:
-          details.put("lensFacing", "back");
-          break;
-        case CameraMetadata.LENS_FACING_EXTERNAL:
-          details.put("lensFacing", "external");
-          break;
+        int lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
+        switch (lensFacing) {
+          case CameraMetadata.LENS_FACING_FRONT:
+            details.put("lensFacing", "front");
+            break;
+          case CameraMetadata.LENS_FACING_BACK:
+            details.put("lensFacing", "back");
+            break;
+          case CameraMetadata.LENS_FACING_EXTERNAL:
+            details.put("lensFacing", "external");
+            break;
+        }
+        cameras.add(details);
       }
-      cameras.add(details);
     }
     return cameras;
   }

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/CameraUtilsTest.java

@@ -5,25 +5,33 @@
 package io.flutter.plugins.camera;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import android.app.Activity;
+import android.content.Context;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraMetadata;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
+import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 
 public class CameraUtilsTest {
 
   @Test
   public void serializeDeviceOrientation_serializesCorrectly() {
-    assertEquals(
-        "portraitUp",
-        CameraUtils.serializeDeviceOrientation(PlatformChannel.DeviceOrientation.PORTRAIT_UP));
-    assertEquals(
-        "portraitDown",
+    assertEquals("portraitUp", CameraUtils.serializeDeviceOrientation(PlatformChannel.DeviceOrientation.PORTRAIT_UP));
+    assertEquals("portraitDown",
         CameraUtils.serializeDeviceOrientation(PlatformChannel.DeviceOrientation.PORTRAIT_DOWN));
-    assertEquals(
-        "landscapeLeft",
+    assertEquals("landscapeLeft",
         CameraUtils.serializeDeviceOrientation(PlatformChannel.DeviceOrientation.LANDSCAPE_LEFT));
-    assertEquals(
-        "landscapeRight",
+    assertEquals("landscapeRight",
         CameraUtils.serializeDeviceOrientation(PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT));
   }
 
@@ -34,22 +42,44 @@ public void serializeDeviceOrientation_throws_for_null() {
 
   @Test
   public void deserializeDeviceOrientation_deserializesCorrectly() {
-    assertEquals(
-        PlatformChannel.DeviceOrientation.PORTRAIT_UP,
-        CameraUtils.deserializeDeviceOrientation("portraitUp"));
-    assertEquals(
-        PlatformChannel.DeviceOrientation.PORTRAIT_DOWN,
+    assertEquals(PlatformChannel.DeviceOrientation.PORTRAIT_UP, CameraUtils.deserializeDeviceOrientation("portraitUp"));
+    assertEquals(PlatformChannel.DeviceOrientation.PORTRAIT_DOWN,
         CameraUtils.deserializeDeviceOrientation("portraitDown"));
-    assertEquals(
-        PlatformChannel.DeviceOrientation.LANDSCAPE_LEFT,
+    assertEquals(PlatformChannel.DeviceOrientation.LANDSCAPE_LEFT,
         CameraUtils.deserializeDeviceOrientation("landscapeLeft"));
-    assertEquals(
-        PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT,
+    assertEquals(PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT,
         CameraUtils.deserializeDeviceOrientation("landscapeRight"));
   }
 
   @Test(expected = UnsupportedOperationException.class)
   public void deserializeDeviceOrientation_throwsForNull() {
     CameraUtils.deserializeDeviceOrientation(null);
   }
+
+  @Test
+  public void getAvailableCameras_retrievesValidCameras() throws CameraAccessException {
+    final Activity mockActivity = mock(Activity.class);
+    final CameraManager mockCameraManager = mock(CameraManager.class);
+    final CameraCharacteristics mockCameraCharacteristics = mock(CameraCharacteristics.class);
+    final String[] mockCameraIds = {"1394902", "-192930", "0283835"};
+    final int mockSensorOrientation = 270;
+    final int mockLensFacing = CameraMetadata.LENS_FACING_FRONT;
+
+    when(mockActivity.getSystemService(Context.CAMERA_SERVICE)).thenReturn(mockCameraManager);
+    when(mockCameraManager.getCameraIdList()).thenReturn(mockCameraIds);
+    when(mockCameraManager.getCameraCharacteristics(anyString())).thenReturn(mockCameraCharacteristics);
+    when(mockCameraCharacteristics.get(CameraCharacteristics.SENSOR_ORIENTATION)).thenReturn(mockSensorOrientation);
+    when(mockCameraCharacteristics.get(CameraCharacteristics.LENS_FACING)).thenReturn(mockLensFacing);
+
+    List<Map<String, Object>> availableCameras = CameraUtils.getAvailableCameras(mockActivity);
+
+    System.out.println(availableCameras);
+    assertEquals(availableCameras.size(), 2);
+    assertEquals(availableCameras.get(0).get("name"), "1394902");
+    assertEquals(availableCameras.get(0).get("sensorOrientation"), 0);
+    assertEquals(availableCameras.get(0).get("lensFacing"), "front");
+    assertEquals(availableCameras.get(1).get("name"), "0283835");
+    assertEquals(availableCameras.get(1).get("sensorOrientation"), 0);
+    assertEquals(availableCameras.get(1).get("lensFacing"), "front");
+  }
 }