[Rt-commit] r5035 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Mon Apr 17 09:01:55 2006
New Revision: 5035

Removed:
   rt/branches/3.7-EXPERIMENTAL/lib/t/regression/10merge.t
Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/t/regression/14merge.t

Log:
 r2384 at cubic-pc:  cubic | 2006-04-17 14:40:28 +0400
 * merge 'merge' tests into one file


Modified: rt/branches/3.7-EXPERIMENTAL/lib/t/regression/14merge.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/t/regression/14merge.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/t/regression/14merge.t	Mon Apr 17 09:01:55 2006
@@ -1,31 +1,93 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More  tests => '17';
 
-use Test::More  tests => '6';
 use RT;
 RT::LoadConfig();
 RT::Init();
 
-# when you try to merge duplicate links on postgres, eveyrything goes to hell due to referential integrity constraints.
-
+# validate that when merging two tickets, the comments from both tickets
+# are integrated into the new ticket
+{
+    my $queue = RT::Queue->new($RT::SystemUser);
+    my ($id,$msg) = $queue->Create(Name => 'MergeTest-'.rand(25));
+    ok ($id,$msg);
+
+    my $t1 = RT::Ticket->new($RT::SystemUser);
+    my ($tid,$transid, $t1msg) =$t1->Create ( Queue => $queue->Name, Subject => 'Merge test. orig');
+    ok ($tid, $t1msg);
+    ($id, $msg) = $t1->Comment(Content => 'This is a Comment on the original');
+    ok($id,$msg);
+
+    my $txns = $t1->Transactions;
+    my $Comments = 0;
+    while (my $txn = $txns->Next) {
+    $Comments++ if ($txn->Type eq 'Comment');
+    }
+    is($Comments,1, "our first ticket has only one Comment");
+
+    my $t2 = RT::Ticket->new($RT::SystemUser);
+    my ($t2id,$t2transid, $t2msg) =$t2->Create ( Queue => $queue->Name, Subject => 'Merge test. duplicate');
+    ok ($t2id, $t2msg);
 
-my $t = RT::Ticket->new($RT::SystemUser);
-$t->Create(Subject => 'Main', Queue => 'general');
 
-ok ($t->id);
-my $t2 = RT::Ticket->new($RT::SystemUser);
-$t2->Create(Subject => 'Second', Queue => 'general');
-ok ($t2->id);
 
-my $t3 = RT::Ticket->new($RT::SystemUser);
-$t3->Create(Subject => 'Third', Queue => 'general');
+    ($id, $msg) = $t2->Comment(Content => 'This is a commet on the duplicate');
+    ok($id,$msg);
+
+
+    $txns = $t2->Transactions;
+     $Comments = 0;
+    while (my $txn = $txns->Next) {
+        $Comments++ if ($txn->Type eq 'Comment');
+    }
+    is($Comments,1, "our second ticket has only one Comment");
+
+    ($id, $msg) = $t1->Comment(Content => 'This is a second  Comment on the original');
+    ok($id,$msg);
+
+    $txns = $t1->Transactions;
+    $Comments = 0;
+    while (my $txn = $txns->Next) {
+        $Comments++ if ($txn->Type eq 'Comment');
+    }
+    is($Comments,2, "our first ticket now has two Comments");
+
+    ($id,$msg) = $t2->MergeInto($t1->id);
+
+    ok($id,$msg);
+    $txns = $t1->Transactions;
+    $Comments = 0;
+    while (my $txn = $txns->Next) {
+        $Comments++ if ($txn->Type eq 'Comment');
+    }
+    is($Comments,3, "our first ticket now has three Comments - we merged safely");
+}
 
-ok ($t3->id);
-
-my ($id,$val);
-($id,$val) = $t->AddLink(Type => 'DependsOn', Target => $t3->id);
-ok($id,$val);
-($id,$val) = $t2->AddLink(Type => 'DependsOn', Target => $t3->id);
-ok($id,$val);
-
-
-($id,$val) = $t->MergeInto($t2->id);
-ok($id,$val);
+# when you try to merge duplicate links on postgres, eveyrything goes to hell due to referential integrity constraints.
+{
+    my $t = RT::Ticket->new($RT::SystemUser);
+    $t->Create(Subject => 'Main', Queue => 'general');
+
+    ok ($t->id);
+    my $t2 = RT::Ticket->new($RT::SystemUser);
+    $t2->Create(Subject => 'Second', Queue => 'general');
+    ok ($t2->id);
+
+    my $t3 = RT::Ticket->new($RT::SystemUser);
+    $t3->Create(Subject => 'Third', Queue => 'general');
+
+    ok ($t3->id);
+
+    my ($id,$val);
+    ($id,$val) = $t->AddLink(Type => 'DependsOn', Target => $t3->id);
+    ok($id,$val);
+    ($id,$val) = $t2->AddLink(Type => 'DependsOn', Target => $t3->id);
+    ok($id,$val);
+
+    ($id,$val) = $t->MergeInto($t2->id);
+    ok($id,$val);
+}