Data::Dumper is not used here at all

[dbsrgits/DBIx-Class-Journal.git] / t / 01test.t

diff --git a/t/01test.t b/t/01test.t
index 7b5b4f1..d47c639 100644 (file)
--- a/t/01test.t
+++ b/t/01test.t
@@ -1,16 +1,15 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
 use lib qw(t/lib);
 use DBICTest;
-use Data::Dumper;
 
 BEGIN {
-    eval "use DBD::SQLite";
+    eval "use DBD::SQLite; use SQL::Translator";
     plan $@
-        ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 12 );
+        ? ( skip_all => 'needs DBD::SQLite and SQL::Translator for testing' )
+        : ( tests => 21 );
 }
 
 my $schema = DBICTest->init_schema(no_populate => 1);
@@ -22,17 +21,28 @@ isa_ok($schema->_journal_schema->source('ArtistAuditLog'), 'DBIx::Class::ResultS
 
 my $artist;
 my $new_cd = $schema->txn_do( sub {
+    my $current_changeset = $schema->_journal_schema->_current_changeset;
+    ok( $current_changeset, "have a current changeset" );
+
     $artist = $schema->resultset('Artist')->create({
         name => 'Fred Bloggs',
     });
-    return  $schema->resultset('CD')->create({
-        title => 'Angry young man',
-        artist => $artist,
-        year => 2000,
+
+    $schema->txn_do(sub {
+        is( $current_changeset, $schema->_journal_schema->_current_changeset, "nested txn doesn't create a new changeset" );
+        return $schema->resultset('CD')->create({
+            title => 'Angry young man',
+            artist => $artist,
+            year => 2000,
+        });
     });
 });
 isa_ok($new_cd, 'DBIx::Class::Journal', 'Created CD object');
 
+is( $schema->_journal_schema->_current_changeset, undef, "no current changeset" );
+eval { $schema->_journal_schema->current_changeset };
+ok( $@, "causes error" );
+
 my $search = $schema->_journal_schema->resultset('CDAuditLog')->search();
 ok($search->count, 'Created an entry in the CD audit log');
 
@@ -53,12 +63,35 @@ $schema->txn_do( sub {
     });
 } );
 
+
+my %id = map { $_ => $new_cd->get_column($_) } $new_cd->primary_columns;
+
 $schema->txn_do( sub {
     $new_cd->delete;
-} );
+});
+
+{
+    my $alentry = $search->find(\%id);
+    ok($alentry, "got log entry");
+    ok(defined($alentry->deleted), 'Deleted set in audit_log');
+    cmp_ok( $alentry->deleted->id, ">", $alentry->created->id, "deleted is after created" );
+}
 
-my $alentry = $search->find({ ID => $new_cd->get_column($new_cd->primary_columns) });
-ok(defined($alentry->deleted), 'Deleted set in audit_log');
+$new_cd = $schema->txn_do( sub {
+    $schema->resultset('CD')->create({
+        %id,
+        title => 'lalala',
+        artist => $artist,
+        year => 2000,
+    });
+});
+
+{
+    my $alentry = $search->find(\%id);
+    ok($alentry, "got log entry");
+    ok(defined($alentry->deleted), 'Deleted set in audit_log');
+    cmp_ok( $alentry->deleted->id, "<", $alentry->created->id, "deleted is before created (recreated)" );
+}
 
 $schema->changeset_user(1);
 $schema->txn_do( sub {
@@ -67,12 +100,12 @@ $schema->txn_do( sub {
         artist => $artist,
         year => 1999,
     });
-} );
+});
 
 ok($search->count > 1, 'Created an second entry in the CD audit history');
 
-my $cset = $schema->_journal_schema->resultset('ChangeSet')->find(5);
-is($cset->user_id, 1, 'Set user id for 5th changeset');
+my $cset = $schema->_journal_schema->resultset('ChangeSet')->find(6);
+is($cset->user_id, 1, 'Set user id for 6th changeset');
 
 $schema->changeset_session(1);
 $schema->txn_do( sub {
@@ -83,6 +116,8 @@ $schema->txn_do( sub {
     });
 } );
 
-my $cset2 = $schema->_journal_schema->resultset('ChangeSet')->find(6);
-is($cset2->session_id, 1, 'Set session id for 6th changeset');
+my $cset2 = $schema->_journal_schema->resultset('ChangeSet')->find(7);
+is($cset2->session_id, 1, 'Set session id for 7th changeset');
+
+