Skip to content

[camera] Remove OCMock from permission tests #8350

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.

Sign up for GitHub

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
auto-submit merged 7 commits into from
Dec 30, 2024
Merged

[camera] Remove OCMock from permission tests #8350

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0babbd5
Refactor permissions logic and remove OCMock from tests
mchudy Dec 4, 2024
ab78a67
Update tests file
mchudy Dec 27, 2024
5dbee5a
Fix formatting
mchudy Dec 27, 2024
34089f7
Change naming and fix comment
mchudy Dec 28, 2024
27d62d4
Update version
mchudy Dec 28, 2024
8cb2172
Fix formatting
mchudy Dec 28, 2024
b377094
Fix imports
mchudy Dec 28, 2024
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
Prev Previous commit
Next Next commit
Change naming and fix comment
  • Loading branch information
@mchudy
mchudy committed Dec 30, 2024
commit 34089f721c9039c35ff16419e80bcfaff9e0e5bf
6 changes: 3 additions & 3 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPermissionTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

#import "CameraTestUtils.h"
#import "FLTCameraPermissionManager.h"
#import "FLTPermissionService.h"
#import "FLTPermissionServicing.h"

@interface MockPermissionService : NSObject <FLTPermissionService>
@interface MockPermissionService : NSObject <FLTPermissionServicing>
@property(nonatomic, copy) AVAuthorizationStatus (^authorizationStatusStub)(AVMediaType mediaType);
@property(nonatomic, copy) void (^requestAccessStub)(AVMediaType mediaType, void (^handler)(BOOL));
@end
Expand Down Expand Up @@ -143,7 +143,7 @@ - (void)testRequestCameraPermission_completeWithErrorIfUserDenyAccess {
return AVAuthorizationStatusNotDetermined;
};

// Mimic user choosing "allow" in permission dialog.
// Mimic user choosing "deny" in permission dialog.
self.mockService.requestAccessStub = ^(AVMediaType mediaType, void (^handler)(BOOL)) {
XCTAssertEqualObjects(mediaType, AVMediaTypeVideo);
handler(NO);
Expand Down
2 changes: 1 addition & 1 deletion ...ra/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/CameraPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ - (instancetype)initWithRegistry:(NSObject<FlutterTextureRegistry> *)registry
_globalEventAPI = globalAPI;
_captureSessionQueue = dispatch_queue_create("io.flutter.camera.captureSessionQueue", NULL);

id<FLTPermissionService> permissionService = [[FLTDefaultPermissionService alloc] init];
id<FLTPermissionServicing> permissionService = [[FLTDefaultPermissionService alloc] init];
_permissionManager =
[[FLTCameraPermissionManager alloc] initWithPermissionService:permissionService];

Expand Down
4 changes: 2 additions & 2 deletions ...undation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCameraPermissionManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

@import AVFoundation;
#import "./include/camera_avfoundation/FLTCameraPermissionManager.h"
#import "./include/camera_avfoundation/FLTPermissionService.h"
#import "./include/camera_avfoundation/FLTPermissionServicing.h"

@implementation FLTCameraPermissionManager

- (instancetype)initWithPermissionService:(id<FLTPermissionService>)service {
- (instancetype)initWithPermissionService:(id<FLTPermissionServicing>)service {
self = [super init];
if (self) {
_permissionService = service ?: [[FLTDefaultPermissionService alloc] init];
Expand Down
2 changes: 1 addition & 1 deletion ...amera_avfoundation/FLTPermissionService.m → ...era_avfoundation/FLTPermissionServicing.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#import "./include/camera_avfoundation/FLTPermissionService.h"
#import "./include/camera_avfoundation/FLTPermissionServicing.h"

@implementation FLTDefaultPermissionService
- (AVAuthorizationStatus)authorizationStatusForMediaType:(AVMediaType)mediaType {
Expand Down
2 changes: 1 addition & 1 deletion ...dation/ios/camera_avfoundation/Sources/camera_avfoundation/include/CameraPlugin.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ framework module camera_avfoundation {
header "FLTCam_Test.h"
header "FLTSavePhotoDelegate_Test.h"
header "FLTThreadSafeEventChannel.h"
header "FLTPermissionService.h"
header "FLTPermissionServicing.h"
header "FLTCameraPermissionManager.h"
header "QueueUtils.h"
}
Expand Down
6 changes: 3 additions & 3 deletions ...tion/Sources/camera_avfoundation/include/camera_avfoundation/FLTCameraPermissionManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
@import Foundation;
#import <Flutter/Flutter.h>

#import "FLTPermissionService.h"
#import "FLTPermissionServicing.h"

NS_ASSUME_NONNULL_BEGIN

typedef void (^FLTCameraPermissionRequestCompletionHandler)(FlutterError *_Nullable);

@interface FLTCameraPermissionManager : NSObject
@property(nonatomic, strong) id<FLTPermissionService> permissionService;
@property(nonatomic, strong) id<FLTPermissionServicing> permissionService;

- (instancetype)initWithPermissionService:(id<FLTPermissionService>)service;
- (instancetype)initWithPermissionService:(id<FLTPermissionServicing>)service;

/// Requests camera access permission.
///
Expand Down
4 changes: 2 additions & 2 deletions ...amera_avfoundation/FLTPermissionService.h → ...era_avfoundation/FLTPermissionServicing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

NS_ASSUME_NONNULL_BEGIN

@protocol FLTPermissionService <NSObject>
@protocol FLTPermissionServicing <NSObject>
- (AVAuthorizationStatus)authorizationStatusForMediaType:(AVMediaType)mediaType;
- (void)requestAccessForMediaType:(AVMediaType)mediaType
completionHandler:(void (^)(BOOL granted))handler;
@end

@interface FLTDefaultPermissionService : NSObject <FLTPermissionService>
@interface FLTDefaultPermissionService : NSObject <FLTPermissionServicing>
@end

NS_ASSUME_NONNULL_END