Next up: the gdl2 testsuite was failing for some files with nested
TEST_SET's, with errors for "message sent to deallocated instance". Is
it obvious why the nesting does this?
If we remove the nested sets, then we resolve the "deallocated instance"
errors. Proposed patch attached.
-- Mark
On 06/06/2017 05:34 PM, Mark Clements wrote:
> See attached for an improved patch on quoting. This gives similar tests
> successes for both quoted and unquoted external names.
>
> -- Mark
>
> On 06/05/2017 10:00 PM, Mark Clements wrote:
>> Please see attached for a patch to fix quoting of column names and
>> Postgresql sequences. I have also included a few formatting changes.
>>
>> Kindly, Mark.
>>
>>
Index: EOAdaptor/test00.m
===================================================================
--- EOAdaptor/test00.m (revision 40502)
+++ EOAdaptor/test00.m (working copy)
@@ -60,8 +60,6 @@
result = [adaptorNamesArr containsObject:currAdaptorName];
END_TEST(result, "+[EOAdaptor availableAdaptorNames:]" );
- START_SET("EOAdaptor")
-
START_TEST(YES);
currAdaptor = [EOAdaptor adaptorWithName: currAdaptorName];
result = ([currAdaptor isKindOfClass: [EOAdaptor class]]
@@ -154,8 +152,6 @@
[currAdaptorChannel closeChannel];
- END_SET("EOAdaptor")
-
entities = [model entities];
tmp1 = [NSDictionary dictionaryWithObjectsAndKeys:
@"NO", @"EODropTablesKey",
@@ -164,8 +160,6 @@
START_TEST(YES);
tmp = [currAdaptorExprClass schemaCreationStatementsForEntities: entities
options: tmp1];
- START_SET("-[EOSQLExpression schemaCreationStatementsForEntities:options:]"
- " result evaluation");
{
BOOL local = NO;
result = NO;
@@ -181,8 +175,6 @@
tmp3 = [tmp1 filteredArrayUsingQualifier: tmp2];
result = local && ([tmp3 count] == 1);
}
- END_SET("-[EOSQLExpression schemaCreationStatementsForEntities:options:]"
- " result evaluation");
END_TEST(result,
"-[EOSQLExpression schemaCreationStatementsForEntities:options:]"
" create tables");
@@ -227,8 +219,6 @@
START_TEST(YES);
tmp = [currAdaptorExprClass schemaCreationStatementsForEntities: entities
options: tmp1];
- START_SET("-[EOSQLExpression schemaCreationStatementsForEntities:options:]"
- " result evaluation");
{
BOOL local = NO;
result = NO;
@@ -244,8 +234,6 @@
tmp3 = [tmp1 filteredArrayUsingQualifier: tmp2];
result = local && ([tmp3 count] == 1);
}
- END_SET("-[EOSQLExpression schemaCreationStatementsForEntities:options:]"
- " result evaluation");
END_TEST(result,
"-[EOSQLExpression schemaCreationStatementsForEntities:options:]"
" drop tables");
Index: EODataSource/test00.m
===================================================================
--- EODataSource/test00.m (revision 40502)
+++ EODataSource/test00.m (working copy)
@@ -105,8 +105,7 @@
[detailDS qualifyWithRelationshipKey:@"orderPos" ofObject: tmp1];
START_SET("-[EODetailDataSource qualifyWithRelationshipKey:ofObject:]");
result = ([detailDS masterObject] == tmp1);
- END_SET("-[EODetailDataSource qualifyWithRelationshipKey:ofObject:]"
- "result evaluation");
+ END_SET("-[EODetailDataSource qualifyWithRelationshipKey:ofObject:]");
END_TEST(result,
"-[EODetailDataSource qualifyWithRelationshipKey:ofObject:]");
Index: EOGlobalID/EOKeyGlobalID00.m
===================================================================
--- EOGlobalID/EOKeyGlobalID00.m (revision 40502)
+++ EOGlobalID/EOKeyGlobalID00.m (working copy)
@@ -49,7 +49,6 @@
START_SET("EOGlobalID/EOKeyGlobalID00.m");
- START_SET("+[EOKeyGlobalID globalIDWithEntityName:keys:keyCount:zone:]");
{
NSArray *keyValArr1 = [NSArray arrayWithObjects:
@"keyVal1", @"keyVal2", nil];
@@ -126,7 +125,6 @@
"-[EOKeyGlobalID keyValuesArray] 2");
}
- END_SET("+[EOKeyGlobalID globalIDWithEntityName:keys:keyCount:zone:]");
START_TEST(YES);
result = [gid1 hash] == [gid2 hash];
Index: EOModel/test00.m
===================================================================
--- EOModel/test00.m (revision 40502)
+++ EOModel/test00.m (working copy)
@@ -264,8 +264,7 @@
@"EOGenericRecord"];
result = local;
}
- END_SET("-[EOModel encodeTableOfContentsIntoPropertyList:]"
- " result evaluation");
+ END_SET("-[EOModel encodeTableOfContentsIntoPropertyList:]");
}
END_TEST(result, "-[EOModel encodeTableOfContentsIntoPropertyList:]");
@@ -297,7 +296,7 @@
isEqual: [[model description] propertyList]];
}
- END_TEST(result, "-[EOModel initWithConentsOfFile:]");
+ END_TEST(result, "-[EOModel initWithContentsOfFile:]");
END_SET("EOModel/test00.m");
[pool release];
Index: EOModel/test02.m
===================================================================
--- EOModel/test02.m (revision 40502)
+++ EOModel/test02.m (working copy)
@@ -44,7 +44,7 @@
filePath = @"test02.eomodel";
model = [[EOModel alloc] initWithContentsOfFile: filePath];
result = model != nil;
- END_TEST(result, "-[EOModel initWithConentsOfFile:]" __FILE__);
+ END_TEST(result, "-[EOModel initWithContentsOfFile:]" __FILE__);
/* Save as eomodeld file. */
START_TEST(YES);
Index: EOQualifier/EOAndQualifier00.m
===================================================================
--- EOQualifier/EOAndQualifier00.m (revision 40502)
+++ EOQualifier/EOAndQualifier00.m (working copy)
@@ -44,7 +44,6 @@
EOKeyValueQualifier *keyValQual2 = nil;
EOKeyValueQualifier *keyValQual3 = nil;
- START_SET("Prepare: -[EOAndQualifier initWithQualifierArray:]");
result = NO;
keyValQual1
= [[EOKeyValueQualifier alloc] initWithKey: @"name"
@@ -58,11 +57,9 @@
value: @"PostgresSQL"];
setQualArr
= [NSArray arrayWithObjects: keyValQual1, keyValQual2, nil];
- END_SET("Prepare: -[EOAndQualifier initWithQualifierArray:]");
qual = [[EOAndQualifier alloc] initWithQualifierArray: setQualArr];
- START_SET("Evaluate: -[EOAndQualifier initWithQualifierArray:]");
{
BOOL local;
NSSet *setQualSet;
@@ -77,7 +74,6 @@
local = local && [getQualSet containsObject: keyValQual2];
result = local;
}
- END_SET("Evaluate: -[EOAndQualifier initWithQualifierArray:]");
}
END_TEST(result, "-[EOAndQualifier initWithQualifierArray:]");
START_TEST(YES);
_______________________________________________
Discuss-gnustep mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/discuss-gnustep
