[Bps-public-commit] r14767 - Prophet/branches/creator/t

[sartak at bestpractical.com]

Author: sartak
Date: Mon Aug  4 16:50:57 2008
New Revision: 14767

Modified:
   Prophet/branches/creator/t/real-conflicting-merge.t
   Prophet/branches/creator/t/simple-conflicting-merge.t
   Prophet/branches/creator/t/simple-push.t

Log:
Fix the tests with what I think the creator ought to be for each changeset we compare with is_deeply

Modified: Prophet/branches/creator/t/real-conflicting-merge.t
==============================================================================
--- Prophet/branches/creator/t/real-conflicting-merge.t	(original)
+++ Prophet/branches/creator/t/real-conflicting-merge.t	Mon Aug  4 16:50:57 2008
@@ -172,6 +172,7 @@
                         }
                     }
                 },
+                creator              => 'bob',
                 is_nullification     => 1,
                 is_resolution        => undef,
                 sequence_no          => ( replica_last_rev() - 2 ),
@@ -180,6 +181,7 @@
                 original_source_uuid => replica_uuid(),
             },
             {
+                creator              => 'alice',
                 is_nullification     => undef,
                 is_resolution        => undef,
                 sequence_no          => ( replica_last_rev() - 1 ),
@@ -213,6 +215,7 @@
             },
 
             {
+                creator              => 'bob',
                 is_nullification     => undef,
                 is_resolution        => 1,
                 sequence_no          => replica_last_rev(),

Modified: Prophet/branches/creator/t/simple-conflicting-merge.t
==============================================================================
--- Prophet/branches/creator/t/simple-conflicting-merge.t	(original)
+++ Prophet/branches/creator/t/simple-conflicting-merge.t	Mon Aug  4 16:50:57 2008
@@ -113,7 +113,7 @@
     is_deeply(
         $null_as_hash,
         {
-
+            creator              => undef,
             is_nullification     => 1,
             is_resolution        => undef,
             original_sequence_no => undef,
@@ -152,6 +152,7 @@
     is_deeply(
         $from_alice_as_hash,
         {
+            creator              => 'alice',
             is_nullification     => undef,
             is_resolution        => undef,
             source_uuid          => undef,

Modified: Prophet/branches/creator/t/simple-push.t
==============================================================================
--- Prophet/branches/creator/t/simple-push.t	(original)
+++ Prophet/branches/creator/t/simple-push.t	Mon Aug  4 16:50:57 2008
@@ -56,6 +56,7 @@
     [ 
         {   #'sequence_no'          => 3,
             #'original_sequence_no' => 3, # the number is different on different replica types
+            'creator'              => 'bob',
             'original_source_uuid' => replica_uuid_for('bob'),
             'is_resolution'        => undef,
             'source_uuid'          => replica_uuid_for('bob'),
@@ -113,6 +114,7 @@
         
         #     'sequence_no'          => 4,  # the number varies based on replica type
         #    'original_sequence_no' => 4,
+            'creator'              => 'bob',
             'original_source_uuid' => replica_uuid_for('bob'),
             'is_resolution'        => undef,
             'source_uuid'          => replica_uuid_for('bob'),