[Bps-public-commit] r11749 - in Prophet/trunk: .

[jesse at bestpractical.com]

Author: jesse
Date: Wed Apr 16 10:53:35 2008
New Revision: 11749

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/t/canonicalize.t
   Prophet/trunk/t/create.t
   Prophet/trunk/t/real-conflicting-merge.t
   Prophet/trunk/t/simple-conflicting-merge.t
   Prophet/trunk/t/validate.t

Log:
 r29752 at 31b:  jesse | 2008-04-16 09:59:40 -0400
 * Cleaning up tests toward being able to run them with different replica types


Modified: Prophet/trunk/t/canonicalize.t
==============================================================================
--- Prophet/trunk/t/canonicalize.t	(original)
+++ Prophet/trunk/t/canonicalize.t	Wed Apr 16 10:53:35 2008
@@ -1,14 +1,11 @@
 use warnings;
 use strict;
-use Test::More 'no_plan';
+use Test::More  tests => 7;
 use File::Temp qw'tempdir';
 use lib 't/lib';
 
 use_ok('Prophet::Replica');
 my $REPO = tempdir( CLEANUP => 0 ) . '/repo-' . $$;
-ok( !-d $REPO );
-`svnadmin create $REPO`;
-ok( -d $REPO, "The repo exists ater svnadmin create" );
 my $cxn = Prophet::Replica->new( {url  => "svn:file://$REPO"} );
 isa_ok( $cxn, 'Prophet::Replica', "Got the cxn" );
 use_ok('TestApp::Bug');

Modified: Prophet/trunk/t/create.t
==============================================================================
--- Prophet/trunk/t/create.t	(original)
+++ Prophet/trunk/t/create.t	Wed Apr 16 10:53:35 2008
@@ -1,15 +1,12 @@
 use warnings;
 use strict;
-use Test::More tests => 25;
+use Test::More tests => 23;
 
 use File::Temp qw'tempdir';
 
 use_ok('Prophet::Replica');
 my $REPO = tempdir( CLEANUP => 0 ) . '/repo-' . $$;
-ok( !-d $REPO );
 diag($REPO);
-`svnadmin create $REPO`;
-ok( -d $REPO, "The repo exists ater svnadmin create" );
 my $cxn = Prophet::Replica->new({ url => "svn:file://$REPO" });
 isa_ok( $cxn, 'Prophet::Replica', "Got the cxn" );
 use_ok('Prophet::Record');

Modified: Prophet/trunk/t/real-conflicting-merge.t
==============================================================================
--- Prophet/trunk/t/real-conflicting-merge.t	(original)
+++ Prophet/trunk/t/real-conflicting-merge.t	Wed Apr 16 10:53:35 2008
@@ -51,8 +51,7 @@
 # This conflict, we can autoresolve
 
 as_bob {
-    use_ok('Prophet::Replica::SVN');
-
+    use_ok('Prophet::Replica');
     my $source = Prophet::Replica->new( { url => repo_uri_for('alice') } );
     my $target = Prophet::Replica->new( { url => repo_uri_for('bob') } );
 

Modified: Prophet/trunk/t/simple-conflicting-merge.t
==============================================================================
--- Prophet/trunk/t/simple-conflicting-merge.t	(original)
+++ Prophet/trunk/t/simple-conflicting-merge.t	Wed Apr 16 10:53:35 2008
@@ -55,7 +55,7 @@
     # XXX TODO: this should actually fail right now.
     # in perl code, we're going to run the merge (just as prophet-merge does)
 
-    use_ok('Prophet::Replica::SVN');
+    use_ok('Prophet::Replica');
 
     my $source = Prophet::Replica->new( { url => repo_uri_for('alice') } );
     my $target = Prophet::Replica->new( { url => repo_uri_for('bob') } );

Modified: Prophet/trunk/t/validate.t
==============================================================================
--- Prophet/trunk/t/validate.t	(original)
+++ Prophet/trunk/t/validate.t	Wed Apr 16 10:53:35 2008
@@ -1,16 +1,13 @@
 use warnings;
 use strict;
 
-use Test::More 'no_plan';
+use Test::More tests => 7;
 use File::Temp qw'tempdir';
 use lib 't/lib';
 use Test::Exception;
 
 use_ok('Prophet::Replica');
 my $REPO = tempdir( CLEANUP => 0 ) . '/repo-' . $$;
-ok( !-d $REPO );
-`svnadmin create $REPO`;
-ok( -d $REPO, "The repo exists ater svnadmin create" );
 my $cxn = Prophet::Replica->new( { url => "svn:file://$REPO" });
 isa_ok( $cxn, 'Prophet::Replica', "Got the cxn" );
 use_ok('TestApp::Bug');