From 04d6b34bfebd5fc582fcfb499e3ef6fec6b946fe Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Sat, 6 Apr 2013 08:49:33 -0400 Subject: [PATCH] Fixed: tests broke because of change in CGRect/CGSize/CGPoint description. --- Tests/Foundation/CPArrayTest.j | 9 +++------ Tests/Foundation/CPDictionaryTest.j | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Tests/Foundation/CPArrayTest.j b/Tests/Foundation/CPArrayTest.j index 2bdfe3129..d15aa52cb 100644 --- a/Tests/Foundation/CPArrayTest.j +++ b/Tests/Foundation/CPArrayTest.j @@ -636,12 +636,9 @@ var array = [CGRectMake(1, 2, 3, 4), CGPointMake(5, 6)], d = [array description]; - [self assertTrue:d.indexOf("x:1") !== -1 message:"Can't find 'x:1' in description of array " + d]; - [self assertTrue:d.indexOf("y:2") !== -1 message:"Can't find 'y:2' in description of array " + d]; - [self assertTrue:d.indexOf("width:3") !== -1 message:"Can't find 'width:3' in description of array " + d]; - [self assertTrue:d.indexOf("height:4") !== -1 message:"Can't find 'height:4' in description of array " + d]; - [self assertTrue:d.indexOf("x:5") !== -1 message:"Can't find 'x:5' in description of array " + d]; - [self assertTrue:d.indexOf("y:6") !== -1 message:"Can't find 'y:6' in description of array " + d]; + [self assertTrue:d.indexOf("(1, 2)") !== -1 message:"Can't find '(1, 2)' in description of array " + d]; + [self assertTrue:d.indexOf("(3, 4)") !== -1 message:"Can't find '(3, 4)' in description of array " + d]; + [self assertTrue:d.indexOf("(5, 6)") !== -1 message:"Can't find '(5, 6)' in description of array " + d]; } - (void)testSortUsingDescriptorsWithDifferentSelectors diff --git a/Tests/Foundation/CPDictionaryTest.j b/Tests/Foundation/CPDictionaryTest.j index 7795a7414..78352a65a 100644 --- a/Tests/Foundation/CPDictionaryTest.j +++ b/Tests/Foundation/CPDictionaryTest.j @@ -392,12 +392,9 @@ var dict = [[CPDictionary alloc] initWithObjects:[CGRectMake(1, 2, 3, 4), CGPointMake(5, 6)] forKeys:[@"key1", @"key2"]], d = [dict description]; - [self assertTrue:d.indexOf("x:1") !== -1 message:"Can't find 'x: 1' in description of dictionary " + d]; - [self assertTrue:d.indexOf("y:2") !== -1 message:"Can't find 'y: 2' in description of dictionary " + d]; - [self assertTrue:d.indexOf("width:3") !== -1 message:"Can't find 'width: 3' in description of dictionary " + d]; - [self assertTrue:d.indexOf("height:4") !== -1 message:"Can't find 'height: 4' in description of dictionary " + d]; - [self assertTrue:d.indexOf("x:5") !== -1 message:"Can't find 'x: 5' in description of dictionary " + d]; - [self assertTrue:d.indexOf("y:6") !== -1 message:"Can't find 'y: 6' in description of dictionary " + d]; + [self assertTrue:d.indexOf("(1, 2)") !== -1 message:"Can't find '(1, 2)' in description of dictionary " + d]; + [self assertTrue:d.indexOf("(3, 4)") !== -1 message:"Can't find '(3, 4)' in description of dictionary " + d]; + [self assertTrue:d.indexOf("(5, 6)") !== -1 message:"Can't find '(5, 6)' in description of dictionary " + d]; [self assert:'@{\n @"key1": @[\n @"1",\n @"2",\n @"3"\n ],\n @"key2": @"This is a string",\n @"key3": @{\n @"another": @"object"\n }\n}' equals:[json_dict description]]; }