Author: ericwa
Date: Thu Mar 20 22:23:09 2014
New Revision: 10600
URL: http://svn.gna.org/viewcvs/etoile?rev=10600&view=rev
Log:
Fix CoreObject test break
Modified:
trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizer.m
trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizerMultiUser.m
trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m
Modified:
trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizer.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizer.m?rev=10600&r1=10599&r2=10600&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizer.m
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizer.m
Thu Mar 20 22:23:09 2014
@@ -40,7 +40,7 @@
UKObjectKindOf([self clientMessages][0],
COSynchronizerResponseToClientForSentRevisionsMessage);
UKIntsEqual(1, [[[serverBranch rootObject] contents] count]);
- UKObjectsEqual(S(clientChild1), [[serverBranch rootObject] contents]);
+ UKObjectsEqual(S(clientChild1.UUID), [[serverBranch rootObject]
valueForKeyPath: @"contents.UUID"]);
// Deliver the response to the client
[transport deliverMessagesToClient];
@@ -62,7 +62,7 @@
[transport deliverMessagesToClient];
UKIntsEqual(1, [[[clientBranch rootObject] contents] count]);
- UKObjectsEqual(S(serverChild1), [[clientBranch rootObject] contents]);
+ UKObjectsEqual(S(serverChild1.UUID), [[clientBranch rootObject]
valueForKeyPath: @"contents.UUID"]);
// No more messages
UKIntsEqual(0, [[self clientMessages] count]);
@@ -97,7 +97,7 @@
UKObjectKindOf([self clientMessages][0],
COSynchronizerResponseToClientForSentRevisionsMessage);
UKIntsEqual(2, [[[serverBranch rootObject] contents] count]);
- UKObjectsEqual(S(clientChild1, serverChild1), [[serverBranch
rootObject] contents]);
+ UKObjectsEqual(S(clientChild1.UUID, serverChild1.UUID), [[serverBranch
rootObject] valueForKeyPath: @"contents.UUID"]);
// Deliver the response to the client
[transport deliverMessagesToClient];
@@ -107,7 +107,7 @@
UKIntsEqual(0, [[self clientMessages] count]);
UKIntsEqual(2, [[[clientBranch rootObject] contents] count]);
- UKObjectsEqual(S(clientChild1, serverChild1), [[clientBranch
rootObject] contents]);
+ UKObjectsEqual(S(clientChild1.UUID, serverChild1.UUID), [[clientBranch
rootObject] valueForKeyPath: @"contents.UUID"]);
}
- (void) testServerAndClientEdit
@@ -143,7 +143,7 @@
[transport deliverMessagesToServer];
UKIntsEqual(2, [[[serverBranch rootObject] contents] count]);
- UKObjectsEqual(S(clientChild1, serverChild1), [[serverBranch
rootObject] contents]);
+ UKObjectsEqual(S(clientChild1.UUID, serverChild1.UUID), [[serverBranch
rootObject] valueForKeyPath: @"contents.UUID"]);
UKIntsEqual(0, [[self serverMessages] count]);
@@ -173,7 +173,7 @@
UKIntsEqual(0, [[self clientMessages] count]);
UKIntsEqual(2, [[[clientBranch rootObject] contents] count]);
- UKObjectsEqual(S(clientChild1, serverChild1), [[clientBranch
rootObject] contents]);
+ UKObjectsEqual(S(clientChild1.UUID, serverChild1.UUID), [[clientBranch
rootObject] valueForKeyPath: @"contents.UUID"]);
}
- (void) testLocalClientCommitsAfterPushingToServer
@@ -197,7 +197,7 @@
UKObjectKindOf([self clientMessages][1],
COSynchronizerResponseToClientForSentRevisionsMessage);
UKIntsEqual(2, [[[serverBranch rootObject] contents] count]);
- UKObjectsEqual(S(clientChild1, serverChild1), [[serverBranch
rootObject] contents]);
+ UKObjectsEqual(S(clientChild1.UUID, serverChild1.UUID), [[serverBranch
rootObject] valueForKeyPath: @"contents.UUID"]);
// Before the merged changes arrives at the client, make another commit
on the client
Modified:
trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizerMultiUser.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizerMultiUser.m?rev=10600&r1=10599&r2=10600&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizerMultiUser.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizerMultiUser.m
Thu Mar 20 22:23:09 2014
@@ -157,7 +157,7 @@
UKIntsEqual(2, [[self client2Messages] count]);
UKIntsEqual(2, [[[client1Branch rootObject] contents] count]);
- UKObjectsEqual(S(client1Child, client2Child), SA([[client1Branch
rootObject] contents]));
+ UKObjectsEqual(S(client1Child.UUID, client2Child.UUID),
SA([[client1Branch rootObject] valueForKeyPath: @"contents.UUID"]));
[transport deliverMessagesToClient: @"client2"];
@@ -166,7 +166,7 @@
UKIntsEqual(0, [[self client2Messages] count]);
UKIntsEqual(2, [[[client2Branch rootObject] contents] count]);
- UKObjectsEqual(S(client1Child, client2Child), SA([[client2Branch
rootObject] contents]));
+ UKObjectsEqual(S(client1Child.UUID, client2Child.UUID),
SA([[client2Branch rootObject] valueForKeyPath: @"contents.UUID"]));
}
@end
Modified: trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m?rev=10600&r1=10599&r2=10600&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m (original)
+++ trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m Thu Mar 20
22:23:09 2014
@@ -661,7 +661,7 @@
// Since the diffs will be [] -> [ child1 ] + [] -> [ child2 ], we
can
// get either [ child2, child1 ] or [ child1, child2 ]
//
- UKObjectsEqual(S(child1, child2), SA([root contents]));
+ UKObjectsEqual(S(child1.UUID, child2.UUID), SA([root valueForKeyPath:
@"contents.UUID"]));
UKObjectsEqual(@"org.etoile.CoreObject.selective-redo",
[[_testTrack.nodes[4] commitDescriptor] identifier]);
}
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
