[webkit-changes] [166050] trunk/Tools

Fri, 21 Mar 2014 00:39:07 -0700

Title: [166050] trunk/Tools
Revision
166050
Author
[email protected]
Date
2014-03-21 00:38:53 -0700 (Fri, 21 Mar 2014)

Log Message

RetainPtr API test should use CFArray instead of CFString for testing.
<rdar://problem/16384899>

Unreviewed bot fix.

* TestWebKitAPI/Tests/WTF/cf/RetainPtr.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WTF/cf/RetainPtrHashing.cpp:
(TestWebKitAPI::TEST):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (166049 => 166050)


--- trunk/Tools/ChangeLog	2014-03-21 07:31:39 UTC (rev 166049)
+++ trunk/Tools/ChangeLog	2014-03-21 07:38:53 UTC (rev 166050)
@@ -1,3 +1,15 @@
+2014-03-21  Andreas Kling  <[email protected]>
+
+        RetainPtr API test should use CFArray instead of CFString for testing.
+        <rdar://problem/16384899>
+
+        Unreviewed bot fix.
+
+        * TestWebKitAPI/Tests/WTF/cf/RetainPtr.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WTF/cf/RetainPtrHashing.cpp:
+        (TestWebKitAPI::TEST):
+
 2014-03-20  Hyowon Kim  <[email protected]>
 
         Move to using std::unique_ptr for EFL objects.

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/cf/RetainPtr.cpp (166049 => 166050)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/cf/RetainPtr.cpp	2014-03-21 07:31:39 UTC (rev 166049)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/cf/RetainPtr.cpp	2014-03-21 07:38:53 UTC (rev 166050)
@@ -34,7 +34,7 @@
 
 TEST(RetainPtr, AdoptCF)
 {
-    RetainPtr<CFStringRef> foo = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, "foo", kCFStringEncodingUTF8));
+    RetainPtr<CFArrayRef> foo = adoptCF(CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr));
 
     EXPECT_EQ(1, CFGetRetainCount(foo.get()));
 }

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/cf/RetainPtrHashing.cpp (166049 => 166050)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/cf/RetainPtrHashing.cpp	2014-03-21 07:31:39 UTC (rev 166049)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/cf/RetainPtrHashing.cpp	2014-03-21 07:38:53 UTC (rev 166050)
@@ -36,15 +36,15 @@
 
 TEST(RetainPtrHashing, HashSet)
 {
-    HashSet<RetainPtr<CFStringRef> > set;
+    HashSet<RetainPtr<CFArrayRef>> set;
 
-    RetainPtr<CFStringRef> foo = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, "foo", kCFStringEncodingUTF8));
+    RetainPtr<CFArrayRef> foo = adoptCF(CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr));
 
     EXPECT_FALSE(set.contains(foo));
     set.add(foo);
     EXPECT_TRUE(set.contains(foo));
 
-    RetainPtr<CFStringRef> foo2 = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, "foo", kCFStringEncodingUTF8));
+    RetainPtr<CFArrayRef> foo2 = adoptCF(CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr));
     EXPECT_FALSE(set.contains(foo2));
     set.add(foo2);
     EXPECT_TRUE(set.contains(foo2));
@@ -55,15 +55,15 @@
 
 TEST(RetainPtrHashing, HashMapKey)
 {
-    HashMap<RetainPtr<CFStringRef>, int> map;
+    HashMap<RetainPtr<CFArrayRef>, int> map;
 
-    RetainPtr<CFStringRef> foo = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, "foo", kCFStringEncodingUTF8));
+    RetainPtr<CFArrayRef> foo = adoptCF(CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr));
 
     EXPECT_FALSE(map.contains(foo));
     map.add(foo, 1);
     EXPECT_EQ(1, map.get(foo));
 
-    RetainPtr<CFStringRef> foo2 = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, "foo", kCFStringEncodingUTF8));
+    RetainPtr<CFArrayRef> foo2 = adoptCF(CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr));
     EXPECT_FALSE(map.contains(foo2));
     map.add(foo2, 2);
     EXPECT_EQ(2, map.get(foo2));
@@ -74,15 +74,15 @@
 
 TEST(RetainPtrHashing, HashMapValue)
 {
-    HashMap<int, RetainPtr<CFStringRef> > map;
+    HashMap<int, RetainPtr<CFArrayRef>> map;
 
-    RetainPtr<CFStringRef> foo = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, "foo", kCFStringEncodingUTF8));
+    RetainPtr<CFArrayRef> foo = adoptCF(CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr));
 
     EXPECT_FALSE(map.contains(1));
     map.add(1, foo);
     EXPECT_EQ(foo, map.get(1));
 
-    RetainPtr<CFStringRef> foo2 = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, "foo", kCFStringEncodingUTF8));
+    RetainPtr<CFArrayRef> foo2 = adoptCF(CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr));
     EXPECT_FALSE(map.contains(2));
     map.add(2, foo2);
     EXPECT_EQ(foo2, map.get(2));

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to