Skip to content

[camera_web] Remove mocktail dependency. #9195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packages/camera/camera_web/example/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
targets:
$default:
sources:
- integration_test/**
- lib/$lib$
- $package$
builders:
mockito|mockBuilder:
generate_for:
- integration_test/**
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import 'package:camera_web/src/camera.dart';
import 'package:camera_web/src/types/types.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import 'package:mocktail/mocktail.dart';
import 'package:mockito/mockito.dart';
import 'package:web/web.dart';

import 'helpers/helpers.dart';
Expand Down Expand Up @@ -45,10 +45,6 @@ void main() {
}
}

setUpAll(() {
registerFallbackValue(MockCameraOptions());
});

testWidgets('Camera allows to control video bitrate',
(WidgetTester tester) async {
//const String supportedVideoType = 'video/webm';
Expand Down Expand Up @@ -97,14 +93,11 @@ void main() {
final int cameraId = videoBitrate;

when(
() {
return cameraService.getMediaStreamForOptions(
options,
cameraId: cameraId,
);
},
).thenAnswer(
(_) => Future<MediaStream>.value(canvasElement.captureStream()));
cameraService.getMediaStreamForOptions(
options,
cameraId: cameraId,
),
).thenAnswer((_) async => canvasElement.captureStream());

final Camera camera = Camera(
textureId: cameraId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ import 'dart:js_interop_unsafe';

import 'package:camera_platform_interface/camera_platform_interface.dart';
// ignore_for_file: implementation_imports
import 'package:camera_web/src/camera.dart';
import 'package:camera_web/src/camera_service.dart';
import 'package:camera_web/src/shims/dart_js_util.dart';
import 'package:camera_web/src/types/types.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import 'package:mocktail/mocktail.dart';
import 'package:mockito/mockito.dart';
import 'package:web/web.dart' as web;

import 'helpers/helpers.dart';
Expand All @@ -35,7 +33,7 @@ void main() {
late web.Navigator navigator;
late web.MediaDevices mediaDevices;

late JsUtil jsUtil;
late MockJsUtil jsUtil;

late CameraService cameraService;

Expand All @@ -54,10 +52,8 @@ void main() {

jsUtil = MockJsUtil();

registerFallbackValue(createJSInteropWrapper(MockWindow()));

// Mock JsUtil to return the real getProperty from dart:js_util.
when<dynamic>(() => jsUtil.getProperty(any(), any())).thenAnswer(
when(jsUtil.getProperty(any, any)).thenAnswer(
(Invocation invocation) =>
(invocation.positionalArguments[0] as JSObject)
.getProperty(invocation.positionalArguments[1] as JSAny),
Expand Down Expand Up @@ -427,7 +423,7 @@ void main() {
});

group('getZoomLevelCapabilityForCamera', () {
late Camera camera;
late MockCamera camera;
late MockMediaStreamTrack mockVideoTrack;
late List<web.MediaStreamTrack> videoTracks;

Expand All @@ -440,8 +436,8 @@ void main() {
as web.MediaStreamTrack,
];

when(() => camera.textureId).thenReturn(0);
when(() => camera.stream).thenReturn(
when(camera.textureId).thenReturn(0);
when(camera.stream).thenReturn(
createJSInteropWrapper(FakeMediaStream(videoTracks))
as web.MediaStream,
);
Expand Down Expand Up @@ -512,7 +508,7 @@ void main() {
}.toJS;

// Create a camera stream with no video tracks.
when(() => camera.stream).thenReturn(
when(camera.stream).thenReturn(
createJSInteropWrapper(FakeMediaStream(<web.MediaStreamTrack>[]))
as web.MediaStream,
);
Expand Down Expand Up @@ -566,7 +562,7 @@ void main() {
videoTrack =
createJSInteropWrapper(mockVideoTrack) as web.MediaStreamTrack;

when(() => jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS))
when(jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS))
.thenReturn(true);

mockMediaDevices.getSupportedConstraints = () {
Expand Down Expand Up @@ -601,7 +597,7 @@ void main() {
);
}.toJS;

when(() => jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS))
when(jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS))
.thenReturn(true);

final String? facingMode =
Expand Down Expand Up @@ -636,7 +632,7 @@ void main() {
return web.MediaTrackSettings(facingMode: '');
}.toJS;

when(() => jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS))
when(jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS))
.thenReturn(false);

final String? facingMode =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import 'package:async/async.dart';
import 'package:camera_platform_interface/camera_platform_interface.dart';
// ignore_for_file: implementation_imports
import 'package:camera_web/src/camera.dart';
import 'package:camera_web/src/camera_service.dart';
import 'package:camera_web/src/types/types.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import 'package:mocktail/mocktail.dart';
import 'package:mockito/mockito.dart';
import 'package:web/web.dart';

import 'helpers/helpers.dart';
Expand All @@ -35,7 +34,7 @@ void main() {
late MediaDevices mediaDevices;

late MediaStream mediaStream;
late CameraService cameraService;
late MockCameraService cameraService;

setUp(() {
mockWindow = MockWindow();
Expand All @@ -56,17 +55,13 @@ void main() {
mediaStream = videoElement.captureStream();

when(
() => cameraService.getMediaStreamForOptions(
any(),
cameraId: any(named: 'cameraId'),
cameraService.getMediaStreamForOptions(
any,
cameraId: anyNamed('cameraId'),
),
).thenAnswer((_) => Future<MediaStream>.value(mediaStream));
});

setUpAll(() {
registerFallbackValue(MockCameraOptions());
});

group('initialize', () {
testWidgets(
'calls CameraService.getMediaStreamForOptions '
Expand All @@ -87,7 +82,7 @@ void main() {
await camera.initialize();

verify(
() => cameraService.getMediaStreamForOptions(
cameraService.getMediaStreamForOptions(
options,
cameraId: textureId,
),
Expand Down Expand Up @@ -189,8 +184,12 @@ void main() {
final Exception exception =
Exception('A media stream exception occured.');

when(() => cameraService.getMediaStreamForOptions(any(),
cameraId: any(named: 'cameraId'))).thenThrow(exception);
when(
cameraService.getMediaStreamForOptions(
any,
cameraId: anyNamed('cameraId'),
),
).thenThrow(exception);

final Camera camera = Camera(
textureId: textureId,
Expand Down Expand Up @@ -253,7 +252,7 @@ void main() {

// Should be called twice: for initialize and play.
verify(
() => cameraService.getMediaStreamForOptions(
cameraService.getMediaStreamForOptions(
options,
cameraId: textureId,
),
Expand Down Expand Up @@ -697,12 +696,12 @@ void main() {
as MediaStreamTrack,
);

when(() => cameraService.getZoomLevelCapabilityForCamera(camera))
when(cameraService.getZoomLevelCapabilityForCamera(camera))
.thenReturn(zoomLevelCapability);

final double maximumZoomLevel = camera.getMaxZoomLevel();

verify(() => cameraService.getZoomLevelCapabilityForCamera(camera))
verify(cameraService.getZoomLevelCapabilityForCamera(camera))
.called(1);

expect(
Expand All @@ -729,12 +728,12 @@ void main() {
as MediaStreamTrack,
);

when(() => cameraService.getZoomLevelCapabilityForCamera(camera))
when(cameraService.getZoomLevelCapabilityForCamera(camera))
.thenReturn(zoomLevelCapability);

final double minimumZoomLevel = camera.getMinZoomLevel();

verify(() => cameraService.getZoomLevelCapabilityForCamera(camera))
verify(cameraService.getZoomLevelCapabilityForCamera(camera))
.called(1);

expect(
Expand Down Expand Up @@ -775,7 +774,7 @@ void main() {
return Future<JSAny?>.value().toJS;
}.toJS;

when(() => cameraService.getZoomLevelCapabilityForCamera(camera))
when(cameraService.getZoomLevelCapabilityForCamera(camera))
.thenReturn(zoomLevelCapability);

const double zoom = 75.0;
Expand Down Expand Up @@ -803,7 +802,7 @@ void main() {
as MediaStreamTrack,
);

when(() => cameraService.getZoomLevelCapabilityForCamera(camera))
when(cameraService.getZoomLevelCapabilityForCamera(camera))
.thenReturn(zoomLevelCapability);

expect(
Expand Down Expand Up @@ -839,7 +838,7 @@ void main() {
as MediaStreamTrack,
);

when(() => cameraService.getZoomLevelCapabilityForCamera(camera))
when(cameraService.getZoomLevelCapabilityForCamera(camera))
.thenReturn(zoomLevelCapability);

expect(
Expand Down Expand Up @@ -893,7 +892,7 @@ void main() {
return MediaTrackSettings(facingMode: 'environment');
}.toJS;

when(() => cameraService.mapFacingModeToLensDirection('environment'))
when(cameraService.mapFacingModeToLensDirection('environment'))
.thenReturn(CameraLensDirection.external);

expect(
Expand Down Expand Up @@ -1439,7 +1438,7 @@ void main() {
..isVideoTypeSupported = isVideoTypeSupported
..mediaRecorderOnErrorProvider = provider;

when(() => provider.forTarget(mediaRecorder))
when(provider.forTarget(mediaRecorder))
.thenAnswer((_) => onErrorStreamController.stream);

await camera.initialize();
Expand Down Expand Up @@ -1681,7 +1680,7 @@ void main() {
..mediaRecorder = mediaRecorder
..mediaRecorderOnErrorProvider = provider;

when(() => provider.forTarget(mediaRecorder))
when(provider.forTarget(mediaRecorder))
.thenAnswer((_) => errorController.stream);

final StreamQueue<ErrorEvent> streamQueue =
Expand Down
Loading