Changeset 285961 in webkit

Timestamp:

Nov 17, 2021, 3:43:39 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Enable adattributiond testing on iOS simulator
​https://bugs.webkit.org/show_bug.cgi?id=233285

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-11-17
Reviewed by Brady Eidson.

• TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:

(TestWebKitAPI::testDaemonPList):
(TestWebKitAPI::cleanUpDaemon):
(TestWebKitAPI::TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-17  Alex Christensen  <achristensen@webkit.org>
+
+        Enable adattributiond testing on iOS simulator
+        https://bugs.webkit.org/show_bug.cgi?id=233285
+
+        Reviewed by Brady Eidson.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
+        (TestWebKitAPI::testDaemonPList):
+        (TestWebKitAPI::cleanUpDaemon):
+        (TestWebKitAPI::TEST):
+
 2021-11-17  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm

@@ -408 +408 @@
 }
 
-// FIXME: Get this working in the iOS simulator.
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(IOS)
 
 static RetainPtr<NSURL> testPCMDaemonLocation()
@@ -423 +422 @@
     xpc_dictionary_set_string(plist.get(), "_ManagedBy", "TestWebKitAPI");
     xpc_dictionary_set_string(plist.get(), "Label", "org.webkit.pcmtestdaemon");
+    xpc_dictionary_set_bool(plist.get(), "RootedSimulatorPath", true);
     xpc_dictionary_set_bool(plist.get(), "LaunchOnlyOnce", true);
     xpc_dictionary_set_string(plist.get(), "StandardErrorPath", [storageLocation URLByAppendingPathComponent:@"daemon_stderr"].path.fileSystemRepresentation);
@@ -480 +480 @@
     EXPECT_NULL(error);
 
-    system("killall adattributiond -9 2> /dev/null");
+    killFirstInstanceOfDaemon(@"adattributiond");
 
     auto plist = testDaemonPList(tempDir);
@@ -497 +497 @@
 static void cleanUpDaemon(NSURL *tempDir)
 {
-    system("killall adattributiond -9");
+    killFirstInstanceOfDaemon(@"adattributiond");
 
     EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:tempDir.path]);
@@ -531 +531 @@
 }
 
+#if PLATFORM(MAC)
 static void setInjectedBundleClient(WKWebView *webView, Vector<String>& consoleMessages)
 {
@@ -587 +588 @@
     EXPECT_WK_STREQ(consoleMessages[1], "[Private Click Measurement] Turned Debug Mode off.");
 }
-
 #endif // PLATFORM(MAC)
+
+#endif // PLATFORM(MAC) || PLATFORM(IOS)
 
 #if HAVE(UI_EVENT_ATTRIBUTION)