Changeset 92513 in webkit

Timestamp:

Aug 5, 2011 2:07:50 PM (13 years ago)

Author:

andersca@apple.com

Message:

Future proof an Objective-C test
​https://bugs.webkit.org/show_bug.cgi?id=65788

Tools:

Reviewed by Dan Bernstein.

Add isObjectInstanceOf to ObjCController.

• DumpRenderTree/mac/ObjCController.m:

(+[ObjCController isSelectorExcludedFromWebScript:]):
(+[ObjCController webScriptNameForSelector:]):
(-[ObjCController isObject:instanceOf:]):

LayoutTests:

Don't check explicitly for class names; just check that the objects are instances of the right classes.

• platform/mac/fast/dom/wrapper-classes-objc-expected.txt:
• platform/mac/fast/dom/wrapper-classes-objc.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/dom/wrapper-classes-objc-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/ObjCController.m (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-05  Anders Carlsson  <andersca@apple.com>
+
+        Future proof an Objective-C test
+        https://bugs.webkit.org/show_bug.cgi?id=65788
+
+        Don't check explicitly for class names; just check that the objects are instances of the right classes.
+
+        * platform/mac/fast/dom/wrapper-classes-objc-expected.txt:
+        * platform/mac/fast/dom/wrapper-classes-objc.html:
+
 2011-08-05  Anders Carlsson  <andersca@apple.com>
 

trunk/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc-expected.txt

@@ -176 +176 @@
 JavaScript types
 
-PASS objCWrapperClass(null) is 'nil'
-PASS objCWrapperClass(undefined) is 'WebUndefined'
-PASS objCWrapperClass(0) is 'NSCFNumber'
-PASS objCWrapperClass(1) is 'NSCFNumber'
-PASS objCWrapperClass(false) is 'NSCFBoolean'
-PASS objCWrapperClass(true) is 'NSCFBoolean'
-PASS objCWrapperClass('') is 'NSCFString'
-PASS objCWrapperClass({ }) is 'WebScriptObject'
-PASS objCWrapperClass([ ]) is 'WebScriptObject'
+PASS objCWrapperIsInstanceOf(null, 'nil') is true
+PASS objCWrapperIsInstanceOf(undefined, 'WebUndefined') is true
+PASS objCWrapperIsInstanceOf(0, 'NSNumber') is true
+PASS objCWrapperIsInstanceOf(1, 'NSNumber') is true
+PASS objCWrapperIsInstanceOf(false, 'NSNumber') is true
+PASS objCWrapperIsInstanceOf(true, 'NSNumber') is true
+PASS objCWrapperIsInstanceOf('', 'NSString') is true
+PASS objCWrapperIsInstanceOf({ }, 'WebScriptObject') is true
+PASS objCWrapperIsInstanceOf([ ], 'WebScriptObject') is true
 PASS objCObjectOfClass('NSNull') is null
 PASS typeof objCObjectOfClass('') is 'undefined'

trunk/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html

@@ -17 +17 @@
 if (window.layoutTestController)
     layoutTestController.waitUntilDone();
+
+function objCWrapperIsInstanceOf(node, className)
+{
+    if (!window.objCController)
+        return "only works under DumpRenderTree";
+    return !!objCController.isObjectInstanceOf(node, className);
+}
 
 function objCWrapperClass(node)
@@ -266 +273 @@
     debug('');
 
-    shouldBe("objCWrapperClass(null)", "'nil'");
-    shouldBe("objCWrapperClass(undefined)", "'WebUndefined'");
-    shouldBe("objCWrapperClass(0)", "'NSCFNumber'");
-    shouldBe("objCWrapperClass(1)", "'NSCFNumber'");
-    shouldBe("objCWrapperClass(false)", "'NSCFBoolean'");
-    shouldBe("objCWrapperClass(true)", "'NSCFBoolean'");
-    shouldBe("objCWrapperClass('')", "'NSCFString'");
-    shouldBe("objCWrapperClass({ })", "'WebScriptObject'");
-    shouldBe("objCWrapperClass([ ])", "'WebScriptObject'");
+    shouldBeTrue("objCWrapperIsInstanceOf(null, 'nil')");
+    shouldBeTrue("objCWrapperIsInstanceOf(undefined, 'WebUndefined')");
+    shouldBeTrue("objCWrapperIsInstanceOf(0, 'NSNumber')");
+    shouldBeTrue("objCWrapperIsInstanceOf(1, 'NSNumber')");
+    shouldBeTrue("objCWrapperIsInstanceOf(false, 'NSNumber')");
+    shouldBeTrue("objCWrapperIsInstanceOf(true, 'NSNumber')");
+    shouldBeTrue("objCWrapperIsInstanceOf('', 'NSString')");
+    shouldBeTrue("objCWrapperIsInstanceOf({ }, 'WebScriptObject')");
+    shouldBeTrue("objCWrapperIsInstanceOf([ ], 'WebScriptObject')");
 
     shouldBe("objCObjectOfClass('NSNull')", "null"); // can't test with typeof because typeof null is 'object'

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-05  Anders Carlsson  <andersca@apple.com>
+
+        Future proof an Objective-C test
+        https://bugs.webkit.org/show_bug.cgi?id=65788
+
+        Reviewed by Dan Bernstein.
+
+        Add isObjectInstanceOf to ObjCController.
+
+        * DumpRenderTree/mac/ObjCController.m:
+        (+[ObjCController isSelectorExcludedFromWebScript:]):
+        (+[ObjCController webScriptNameForSelector:]):
+        (-[ObjCController isObject:instanceOf:]):
+
 2011-08-05  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/DumpRenderTree/mac/ObjCController.m

@@ -67 +67 @@
     if (0
             || aSelector == @selector(classNameOf:)
+            || aSelector == @selector(isObject:instanceOf:)
             || aSelector == @selector(objectOfClass:)
             || aSelector == @selector(arrayOfString)
@@ -88 +89 @@
     if (aSelector == @selector(classNameOf:))
         return @"className";
+    if (aSelector == @selector(isObject:instanceOf:))
+        return @"isObjectInstanceOf";
     if (aSelector == @selector(objectOfClass:))
         return @"objectOfClass";
@@ -114 +117 @@
 }
 
+- (BOOL)isObject:(id)object instanceOf:(NSString *)aClass
+{
+    if (!object)
+        return [aClass isEqualToString:@"nil"];
+
+    return [object isKindOfClass:NSClassFromString(aClass)];
+}
+            
 - (NSString *)classNameOf:(id)object
 {