@@ -68,52 +68,54 @@ [OFNumber numberWithBool: false], [OFNumber numberWithFloat: 12.25], [OFNumber numberWithInt: -10], nil]; - TEST(@"-[propertyListValue:] #1", - [PLIST1.propertyListValue isEqual: @"Hello"]) - - TEST(@"-[propertyListValue:] #2", - [PLIST2.propertyListValue isEqual: array]) - - TEST(@"-[propertyListValue:] #3", - [PLIST3.propertyListValue isEqual: + TEST(@"-[objectByParsingPropertyList:] #1", + [PLIST1.objectByParsingPropertyList isEqual: @"Hello"]) + + TEST(@"-[objectByParsingPropertyList:] #2", + [PLIST2.objectByParsingPropertyList isEqual: array]) + + TEST(@"-[objectByParsingPropertyList:] #3", + [PLIST3.objectByParsingPropertyList isEqual: [OFDictionary dictionaryWithKeysAndObjects: @"array", array, @"foo", @"bar", nil]]) - EXPECT_EXCEPTION(@"-[propertyListValue] detecting unsupported version", + EXPECT_EXCEPTION(@"Detecting unsupported version", OFUnsupportedVersionException, [[PLIST(@"") stringByReplacingOccurrencesOfString: @"1.0" withString: @"1.1"] - propertyListValue]) - - EXPECT_EXCEPTION( - @"-[propertyListValue] detecting invalid format #1", - OFInvalidFormatException, - [PLIST(@"") propertyListValue]) - - EXPECT_EXCEPTION( - @"-[propertyListValue] detecting invalid format #2", - OFInvalidFormatException, - [PLIST(@"") propertyListValue]) - - EXPECT_EXCEPTION( - @"-[propertyListValue] detecting invalid format #3", - OFInvalidFormatException, - [PLIST(@"") propertyListValue]) - - EXPECT_EXCEPTION( - @"-[propertyListValue] detecting invalid format #4", - OFInvalidFormatException, - [PLIST(@"") propertyListValue]) - - EXPECT_EXCEPTION( - @"-[propertyListValue] detecting invalid format #5", - OFInvalidFormatException, - [PLIST(@"") propertyListValue]) + objectByParsingPropertyList]) + + EXPECT_EXCEPTION( + @"-[objectByParsingPropertyList] detecting invalid format #1", + OFInvalidFormatException, + [PLIST(@"") objectByParsingPropertyList]) + + EXPECT_EXCEPTION( + @"-[objectByParsingPropertyList] detecting invalid format #2", + OFInvalidFormatException, + [PLIST(@"") objectByParsingPropertyList]) + + EXPECT_EXCEPTION( + @"-[objectByParsingPropertyList] detecting invalid format #3", + OFInvalidFormatException, + [PLIST(@"") objectByParsingPropertyList]) + + EXPECT_EXCEPTION( + @"-[objectByParsingPropertyList] detecting invalid format #4", + OFInvalidFormatException, + [PLIST(@"") + objectByParsingPropertyList]) + + EXPECT_EXCEPTION( + @"-[objectByParsingPropertyList] detecting invalid format #5", + OFInvalidFormatException, + [PLIST(@"") + objectByParsingPropertyList]) objc_autoreleasePoolPop(pool); } @end