From 32195e6a8332ac426358355db28aeee9e1052186 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Mon, 5 Jun 2023 13:39:44 +0530 Subject: [PATCH] Updated MPPGestureRecognizerTests to use generics for file path dicts --- .../MPPGestureRecognizerTests.m | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/mediapipe/tasks/ios/test/vision/gesture_recognizer/MPPGestureRecognizerTests.m b/mediapipe/tasks/ios/test/vision/gesture_recognizer/MPPGestureRecognizerTests.m index 43d4b6e72..4331c5561 100644 --- a/mediapipe/tasks/ios/test/vision/gesture_recognizer/MPPGestureRecognizerTests.m +++ b/mediapipe/tasks/ios/test/vision/gesture_recognizer/MPPGestureRecognizerTests.m @@ -19,20 +19,25 @@ #import "mediapipe/tasks/ios/test/vision/utils/sources/MPPImage+TestUtils.h" #import "mediapipe/tasks/ios/vision/gesture_recognizer/sources/MPPGestureRecognizer.h" + +static NSString *const kPbFileExtension = @"pbtxt"; + +typedef NSDictionary ResourceFileInfo; + static NSDictionary *const kGestureRecognizerBundleAssetFile = @{@"name" : @"gesture_recognizer", @"type" : @"task"}; -static NSDictionary *const kTwoHandsImage = @{@"name" : @"right_hands", @"type" : @"jpg"}; -static NSDictionary *const kFistImage = @{@"name" : @"fist", @"type" : @"jpg"}; -static NSDictionary *const kNoHandsImage = @{@"name" : @"cats_and_dogs", @"type" : @"jpg"}; -static NSDictionary *const kThumbUpImage = @{@"name" : @"thumb_up", @"type" : @"jpg"}; -static NSDictionary *const kPointingUpRotatedImage = +static ResourceFileInfo *const kTwoHandsImage = @{@"name" : @"right_hands", @"type" : @"jpg"}; +static ResourceFileInfo *const kFistImage = @{@"name" : @"fist", @"type" : @"jpg"}; +static ResourceFileInfo *const kNoHandsImage = @{@"name" : @"cats_and_dogs", @"type" : @"jpg"}; +static ResourceFileInfo *const kThumbUpImage = @{@"name" : @"thumb_up", @"type" : @"jpg"}; +static ResourceFileInfo *const kPointingUpRotatedImage = @{@"name" : @"pointing_up_rotated", @"type" : @"jpg"}; -static NSDictionary *const kExpectedFistLandmarksFile = - @{@"name" : @"fist_landmarks", @"type" : @"pbtxt"}; -static NSDictionary *const kExpectedThumbUpLandmarksFile = - @{@"name" : @"thumb_up_landmarks", @"type" : @"pbtxt"}; +static ResourceFileInfo *const kExpectedFistLandmarksFile = + @{@"name" : @"fist_landmarks", @"type" : kPbFileExtension}; +static ResourceFileInfo *const kExpectedThumbUpLandmarksFile = + @{@"name" : @"thumb_up_landmarks", @"type" : kPbFileExtension}; static NSString *const kFistLabel = @"Closed_Fist"; static NSString *const kExpectedThumbUpLabel = @"Thumb_Up";