WKWebExtensionTab and WKWebExtensionWindow tests are failing after 27…

…5651@main.

https://webkit.org/b/270502
rdar://problem/124049994

Unreviewed test gardening.

* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionTab.mm:
(TestWebKitAPI::TEST): Updated expected results.
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionWindow.mm:
(TestWebKitAPI::TEST): Updated expected results.

Canonical link: https://commits.webkit.org/275672@main

Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionTab.mm

@@ -100,23 +100,23 @@
 
     [testController unloadExtensionContext:testContextOne.get() error:nullptr];
 
-    EXPECT_NS_EQUAL(testContextOne.get().openTabs, ([NSSet setWithObjects:testTabTwo.get(), testTabThree.get(), testTabFour.get(), nil]));
+    EXPECT_NS_EQUAL(testContextOne.get().openTabs, [NSSet set]);
     EXPECT_NS_EQUAL(testContextTwo.get().openTabs, ([NSSet setWithObjects:testTabTwo.get(), testTabThree.get(), testTabFour.get(), nil]));
 
     testWindowOne.get().tabs = @[ testTabOne.get() ];
     [testController didOpenTab:testTabOne.get()];
 
-    EXPECT_NS_EQUAL(testContextOne.get().openTabs, ([NSSet setWithObjects:testTabTwo.get(), testTabThree.get(), testTabFour.get(), nil]));
+    EXPECT_NS_EQUAL(testContextOne.get().openTabs, [NSSet set]);
     EXPECT_NS_EQUAL(testContextTwo.get().openTabs, ([NSSet setWithObjects:testTabOne.get(), testTabTwo.get(), testTabThree.get(), testTabFour.get(), nil]));
 
     [testController didCloseWindow:testWindowOne.get()];
 
-    EXPECT_NS_EQUAL(testContextOne.get().openTabs, ([NSSet setWithObjects:testTabTwo.get(), testTabThree.get(), testTabFour.get(), nil]));
+    EXPECT_NS_EQUAL(testContextOne.get().openTabs, [NSSet set]);
     EXPECT_NS_EQUAL(testContextTwo.get().openTabs, ([NSSet setWithObjects:testTabTwo.get(), testTabThree.get(), testTabFour.get(), nil]));
 
     [testController didCloseWindow:testWindowTwo.get()];
 
-    EXPECT_NS_EQUAL(testContextOne.get().openTabs, ([NSSet setWithObjects:testTabTwo.get(), testTabThree.get(), testTabFour.get(), nil]));
+    EXPECT_NS_EQUAL(testContextOne.get().openTabs, [NSSet set]);
     EXPECT_NS_EQUAL(testContextTwo.get().openTabs, [NSSet set]);
 }
 

Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionWindow.mm

@@ -93,22 +93,22 @@
 
     [testController unloadExtensionContext:testContextOne.get() error:nullptr];
 
-    EXPECT_NS_EQUAL(testContextOne.get().openWindows, openWindows);
+    EXPECT_NS_EQUAL(testContextOne.get().openWindows, @[ ]);
     EXPECT_NS_EQUAL(testContextTwo.get().openWindows, openWindows);
 
     [testController didFocusWindow:testWindowTwo.get()];
 
-    EXPECT_NS_EQUAL(testContextOne.get().openWindows, openWindows);
+    EXPECT_NS_EQUAL(testContextOne.get().openWindows, @[ ]);
     EXPECT_NS_EQUAL(testContextTwo.get().openWindows, reversedOpenWindows);
 
     [testController didCloseWindow:testWindowTwo.get()];
 
-    EXPECT_NS_EQUAL(testContextOne.get().openWindows, openWindows);
+    EXPECT_NS_EQUAL(testContextOne.get().openWindows, @[ ]);
     EXPECT_NS_EQUAL(testContextTwo.get().openWindows, @[ testWindowOne.get() ]);
 
     [testController didOpenWindow:testWindowTwo.get()];
 
-    EXPECT_NS_EQUAL(testContextOne.get().openWindows, openWindows);
+    EXPECT_NS_EQUAL(testContextOne.get().openWindows, @[ ]);
     EXPECT_NS_EQUAL(testContextTwo.get().openWindows, reversedOpenWindows);
 }
 
@@ -166,17 +166,17 @@
 
     [testController unloadExtensionContext:testContextOne.get() error:nullptr];
 
-    EXPECT_NS_EQUAL(testContextOne.get().focusedWindow, testWindowOne.get());
+    EXPECT_NULL(testContextOne.get().focusedWindow);
     EXPECT_NS_EQUAL(testContextTwo.get().focusedWindow, testWindowOne.get());
 
     [testController didFocusWindow:testWindowTwo.get()];
 
-    EXPECT_NS_EQUAL(testContextOne.get().focusedWindow, testWindowOne.get());
+    EXPECT_NULL(testContextOne.get().focusedWindow);
     EXPECT_NS_EQUAL(testContextTwo.get().focusedWindow, testWindowTwo.get());
 
     [testController didCloseWindow:testWindowTwo.get()];
 
-    EXPECT_NS_EQUAL(testContextOne.get().focusedWindow, testWindowOne.get());
+    EXPECT_NULL(testContextOne.get().focusedWindow);
     EXPECT_NULL(testContextTwo.get().focusedWindow);
 }