From 523a4334f8bf80a0c441871db93ae83eaaa2a5ed Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Wed, 18 Jul 2012 11:24:06 +0000 Subject: Rework QueryKit's tests to accept parameters allowing use to run them with different data sets. --- Frameworks/QueryKit/Tests/QKUpdateQueryTests.m | 75 +++++++++++++------------- 1 file changed, 39 insertions(+), 36 deletions(-) (limited to 'Frameworks/QueryKit/Tests/QKUpdateQueryTests.m') diff --git a/Frameworks/QueryKit/Tests/QKUpdateQueryTests.m b/Frameworks/QueryKit/Tests/QKUpdateQueryTests.m index 4c585aee..afeb9434 100644 --- a/Frameworks/QueryKit/Tests/QKUpdateQueryTests.m +++ b/Frameworks/QueryKit/Tests/QKUpdateQueryTests.m @@ -28,33 +28,54 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. +#import "QKUpdateQueryTests.h" #import "QKTestConstants.h" -#import -#import +@implementation QKUpdateQueryTests + +#pragma mark - +#pragma mark Initialisation -@interface QKUpdateQueryTests : SenTestCase ++ (id)defaultTestSuite { - QKQuery *_query; + SenTestSuite *testSuite = [[SenTestSuite alloc] initWithName:NSStringFromClass(self)]; + + [self addTestForDatabase:QKDatabaseUnknown withIdentifierQuote:EMPTY_STRING toTestSuite:testSuite]; + [self addTestForDatabase:QKDatabaseMySQL withIdentifierQuote:QKMySQLIdentifierQuote toTestSuite:testSuite]; + [self addTestForDatabase:QKDatabasePostgreSQL withIdentifierQuote:QKPostgreSQLIdentifierQuote toTestSuite:testSuite]; + + return [testSuite autorelease]; } -@end - -@implementation QKUpdateQueryTests ++ (void)addTestForDatabase:(QKQueryDatabase)database withIdentifierQuote:(NSString *)quote toTestSuite:(SenTestSuite *)testSuite +{ + for (NSInvocation *invocation in [self testInvocations]) + { + SenTestCase *test = [[NSClassFromString(@"QKUpdateQueryTests") alloc] initWithInvocation:invocation database:database identifierQuote:quote]; + + [testSuite addTest:test]; + + [test release]; + } +} #pragma mark - #pragma mark Setup - (void)setUp { - _query = [QKQuery queryTable:QKTestTableName]; + QKQuery *query = [QKQuery queryTable:QKTestTableName]; + + [query setQueryType:QKUpdateQuery]; + [query setQueryDatabase:[self database]]; + [query setUseQuotedIdentifiers:[self identifierQuote] && [[self identifierQuote] length] > 0]; - [_query setQueryType:QKUpdateQuery]; + [query addFieldToUpdate:QKTestFieldOne toValue:QKTestUpdateValueOne]; + [query addFieldToUpdate:QKTestFieldTwo toValue:QKTestUpdateValueTwo]; - [_query addFieldToUpdate:QKTestFieldOne toValue:QKTestUpdateValueOne]; - [_query addFieldToUpdate:QKTestFieldTwo toValue:QKTestUpdateValueTwo]; + [query addParameter:QKTestFieldOne operator:QKEqualityOperator value:[NSNumber numberWithUnsignedInteger:QKTestParameterOne]]; - [_query addParameter:QKTestFieldOne operator:QKEqualityOperator value:[NSNumber numberWithUnsignedInteger:QKTestParameterOne]]; + [self setQuery:query]; } #pragma mark - @@ -62,39 +83,21 @@ - (void)testUpdateQueryTypeIsCorrect { - STAssertTrue([[_query query] hasPrefix:@"UPDATE"], @"update query type"); + STAssertTrue([[[self query] query] hasPrefix:@"UPDATE"], nil); } - (void)testUpdateQueryFieldsAreCorrect { - NSString *query = [NSString stringWithFormat:@"UPDATE `%@` SET `%@` = '%@', `%@` = '%@'", QKTestTableName, QKTestFieldOne, QKTestUpdateValueOne, QKTestFieldTwo, QKTestUpdateValueTwo]; + NSString *query = [NSString stringWithFormat:@"UPDATE %1$@%2$@%1$@ SET %1$@%3$@%1$@ = '%4$@', %1$@%5$@%1$@ = '%6$@'", [self identifierQuote], QKTestTableName, QKTestFieldOne, QKTestUpdateValueOne, QKTestFieldTwo, QKTestUpdateValueTwo]; - STAssertTrue([[_query query] hasPrefix:query], @"update query fields"); -} - -- (void)testUpdateQueryFieldsWithoutQuotesAreCorrect -{ - [_query setUseQuotedIdentifiers:NO]; - - NSString *query = [NSString stringWithFormat:@"UPDATE %@ SET %@ = '%@', %@ = '%@'", QKTestTableName, QKTestFieldOne, QKTestUpdateValueOne, QKTestFieldTwo, QKTestUpdateValueTwo]; - - STAssertTrue([[_query query] hasPrefix:query], @"update query fields without quotes"); + STAssertTrue([[[self query] query] hasPrefix:query], nil); } - (void)testUpdateQueryConstraintIsCorrect { - NSString *query = [NSString stringWithFormat:@"WHERE `%@` %@ %@", QKTestFieldOne, [QKQueryUtilities stringRepresentationOfQueryOperator:QKEqualityOperator], [NSNumber numberWithUnsignedInteger:QKTestParameterOne]]; - - STAssertTrue(([[_query query] rangeOfString:query].location != NSNotFound), @"update query constraint"); -} - -- (void)testUpdateQueryConstraintWithoutQuotesIsCorrect -{ - [_query setUseQuotedIdentifiers:NO]; - - NSString *query = [NSString stringWithFormat:@"WHERE %@ %@ %@", QKTestFieldOne, [QKQueryUtilities stringRepresentationOfQueryOperator:QKEqualityOperator], [NSNumber numberWithUnsignedInteger:QKTestParameterOne]]; - - STAssertTrue(([[_query query] rangeOfString:query].location != NSNotFound), @"update query constraint without quotes"); + NSString *query = [NSString stringWithFormat:@"WHERE %1$@%2$@%1$@ %3$@ %4$@", [self identifierQuote], QKTestFieldOne, [QKQueryUtilities stringRepresentationOfQueryOperator:QKEqualityOperator], [NSNumber numberWithUnsignedInteger:QKTestParameterOne]]; + + STAssertTrue(([[[self query] query] rangeOfString:query].location != NSNotFound), nil); } @end -- cgit v1.2.3