Archived
1

Cleaned Code

This commit is contained in:
Kim Wittenburg
2014-04-20 23:28:42 +02:00
parent 1daec37a25
commit 6f32672b40
2 changed files with 28 additions and 13 deletions

View File

@@ -18,19 +18,32 @@
@implementation MPExpressionTests @implementation MPExpressionTests
- (void)testInitialization { - (void)testInitialization {
MPExpression *emptyExpression = [[MPExpression alloc] init]; // Test empty expression
MPExpression *stringExpression = [[MPExpression alloc] initWithString:@"1234+5678"]; MPExpression *testExpression = [[MPExpression alloc] init];
MPExpression *functionExpression = [[MPExpression alloc] initWithFunction:[[MPFunction alloc] init]]; XCTAssertEqual([testExpression numberOfSymbols], 0);
MPExpression *complexExpression = [[MPExpression alloc] initWithSymbols:@[@"1234", [[MPFunction alloc] init], @"17", [[MPFunction alloc] init]]];
// Test expression with string
testExpression = [[MPExpression alloc] initWithString:@"1234+5678"];
XCTAssertEqual([testExpression numberOfSymbols], 1);
XCTAssertEqualObjects([testExpression symbolAtIndex:0], @"1234+5678");
XCTAssertEqual([emptyExpression numberOfSymbols], 0); // Test expression with function
XCTAssertEqual([stringExpression numberOfSymbols], 1); testExpression = [[MPExpression alloc] initWithFunction:[[MPFunction alloc] init]];
XCTAssertEqual([functionExpression numberOfSymbols], 1); XCTAssertEqual([testExpression numberOfSymbols], 1);
XCTAssertEqual([complexExpression numberOfSymbols], 4); XCTAssertEqualObjects([testExpression symbolAtIndex:0], [[MPFunction alloc] init]);
XCTAssertEqualObjects([stringExpression symbolAtIndex:0], @"1234+5678"); testExpression = [[MPExpression alloc] initWithSymbols:@[@"1234", [[MPFunction alloc] init], @"17", [[MPFunction alloc] init]]];
XCTAssertEqualObjects([functionExpression symbolAtIndex:0], [[MPFunction alloc] init]); XCTAssertEqual([testExpression numberOfSymbols], 4);
XCTAssertEqualObjects([complexExpression symbolAtIndex:2], @"17"); XCTAssertEqualObjects([testExpression symbolAtIndex:2], @"17");
// Test expression with subsequent strings
testExpression = [[MPExpression alloc] initWithSymbols:@[@"1234", @"5678"]];
XCTAssertEqual([testExpression numberOfSymbols], 1);
XCTAssertEqualObjects([testExpression symbolAtIndex:0], @"12345678");
// Test expression with only empty string
testExpression = [[MPExpression alloc] initWithString:@""];
XCTAssertEqual([testExpression numberOfSymbols], 0);
} }
- (void)testSubexpressions { - (void)testSubexpressions {

View File

@@ -27,11 +27,13 @@
XCTAssertEqual([testExpression numberOfSymbols], 3); XCTAssertEqual([testExpression numberOfSymbols], 3);
// 12678 [] 90 // 12678 [] 90
[testExpression insertFunction:[[MPFunction alloc] init] atIndex:2]; [testExpression insertFunction:[[MPFunction alloc] init]
atIndex:2];
XCTAssertEqual([testExpression numberOfSymbols], 5); XCTAssertEqual([testExpression numberOfSymbols], 5);
// 12 [] 678 [] 90 // 12 [] 678 [] 90
[testExpression replaceSymbolsInRange:NSMakeRange(2, 5) withSymbols:@[[[MPFunction alloc] init]]]; [testExpression replaceSymbolsInRange:NSMakeRange(2, 5)
withSymbols:@[[[MPFunction alloc] init]]];
XCTAssertEqual([testExpression numberOfSymbols], 3); XCTAssertEqual([testExpression numberOfSymbols], 3);
// 12 [] 90 // 12 [] 90