From f85cf9d7e5315e23e60859e090aea7ea61e9df0a Mon Sep 17 00:00:00 2001 From: Tong Mu Date: Tue, 16 May 2023 13:41:13 -0700 Subject: [PATCH 1/3] Fix --- .../darwin/ios/framework/Source/FlutterPlatformViewsTest.mm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm index 6f205b88c5d2f..bf78062ca4b8a 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm @@ -2654,8 +2654,10 @@ - (void)testFlutterClippingMaskViewPoolReuseViewsAfterRecycle { CGRect newRect = CGRectMake(0, 0, 10, 10); FlutterClippingMaskView* view3 = [pool getMaskViewWithFrame:newRect]; FlutterClippingMaskView* view4 = [pool getMaskViewWithFrame:newRect]; - XCTAssertEqual(view1, view3); - XCTAssertEqual(view2, view4); + // view3 and view4 should randomly get either of view1 and view2. + XCTAssertTrue((view1 == view3) || (view1 == view4)); + XCTAssertTrue((view2 == view3) || (view2 == view4)); + XCTAssertNotEqual(view3, view4); XCTAssertTrue(CGRectEqualToRect(view3.frame, newRect)); XCTAssertTrue(CGRectEqualToRect(view4.frame, newRect)); } From 1d3797a3941ac0e6d88334d34eae2d800298638e Mon Sep 17 00:00:00 2001 From: Tong Mu Date: Wed, 17 May 2023 13:39:47 -0700 Subject: [PATCH 2/3] Use set --- .../darwin/ios/framework/Source/FlutterPlatformViewsTest.mm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm index bf78062ca4b8a..1037a75ff8060 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm @@ -2655,9 +2655,8 @@ - (void)testFlutterClippingMaskViewPoolReuseViewsAfterRecycle { FlutterClippingMaskView* view3 = [pool getMaskViewWithFrame:newRect]; FlutterClippingMaskView* view4 = [pool getMaskViewWithFrame:newRect]; // view3 and view4 should randomly get either of view1 and view2. - XCTAssertTrue((view1 == view3) || (view1 == view4)); - XCTAssertTrue((view2 == view3) || (view2 == view4)); - XCTAssertNotEqual(view3, view4); + XCTAssertEqual(std::set({view1, view2}), + std::set({view3, view4})); XCTAssertTrue(CGRectEqualToRect(view3.frame, newRect)); XCTAssertTrue(CGRectEqualToRect(view4.frame, newRect)); } From 27c4910dbe5d219aa004ae3fa602bec0ac8e2027 Mon Sep 17 00:00:00 2001 From: Tong Mu Date: Thu, 18 May 2023 12:33:48 -0700 Subject: [PATCH 3/3] NSSet --- .../darwin/ios/framework/Source/FlutterPlatformViewsTest.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm index 1037a75ff8060..7e3404482e5d7 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm @@ -2655,8 +2655,7 @@ - (void)testFlutterClippingMaskViewPoolReuseViewsAfterRecycle { FlutterClippingMaskView* view3 = [pool getMaskViewWithFrame:newRect]; FlutterClippingMaskView* view4 = [pool getMaskViewWithFrame:newRect]; // view3 and view4 should randomly get either of view1 and view2. - XCTAssertEqual(std::set({view1, view2}), - std::set({view3, view4})); + XCTAssertEqual([NSSet setWithObjects:view1, view2], [NSSet setWithObjects:view3, view4]); XCTAssertTrue(CGRectEqualToRect(view3.frame, newRect)); XCTAssertTrue(CGRectEqualToRect(view4.frame, newRect)); }