X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Ft%2Fticket%2Fcfsort-freeform-single.t;h=262f84a229de35fcd0464169485773f0052b33cb;hb=1c538bfabc2cd31f27067505f0c3d1a46cba6ef0;hp=35a53fb54fe6f80049f4c754b14db7529b385652;hpb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7;p=freeside.git

diff --git a/rt/t/ticket/cfsort-freeform-single.t b/rt/t/ticket/cfsort-freeform-single.t
index 35a53fb54..262f84a22 100644
--- a/rt/t/ticket/cfsort-freeform-single.t
+++ b/rt/t/ticket/cfsort-freeform-single.t
@@ -1,159 +1,169 @@
-#!/usr/bin/perl
-
-use RT::Test nodata => 1, tests => 89;
 
 use strict;
 use warnings;
 
-use RT::Tickets;
-use RT::Queue;
-use RT::CustomField;
-
-# Test Sorting by FreeformSingle custom field.
+use RT::Test nodata => 1, tests => undef;
 
-diag "Create a queue to test with.";
-my $queue_name = "CFSortQueue-$$";
-my $queue;
-{
-    $queue = RT::Queue->new( RT->SystemUser );
-    my ($ret, $msg) = $queue->Create(
-        Name => $queue_name,
-        Description => 'queue for custom field sort testing'
-    );
-    ok($ret, "$queue test queue creation. $msg");
-}
+my $queue = RT::Test->load_or_create_queue( Name => "sorting" );
+ok $queue && $queue->id, "Created queue";
+my $queue_name = $queue->Name;
 
 # CFs for testing, later we create another one
-my %CF;
-my $cf_name;
-
+my $cf;
+my $cf_name = "ordering";
 diag "create a CF";
 {
-    $cf_name = $CF{'CF'}{'name'} = "Order$$";
-    $CF{'CF'}{'obj'} = RT::CustomField->new( RT->SystemUser );
-    my ($ret, $msg) = $CF{'CF'}{'obj'}->Create(
-        Name  => $CF{'CF'}{'name'},
+    $cf = RT::CustomField->new( RT->SystemUser );
+    my ($ret, $msg) = $cf->Create(
+        Name  => $cf_name,
         Queue => $queue->id,
         Type  => 'FreeformSingle',
     );
-    ok($ret, "Custom Field $CF{'CF'}{'name'} created");
-}
-
-my ($total, @data, @tickets, @test) = (0, ());
-
-sub run_tests {
-    my $query_prefix = join ' OR ', map 'id = '. $_->id, @tickets;
-    foreach my $test ( @test ) {
-        my $query = join " AND ", map "( $_ )", grep defined && length,
-            $query_prefix, $test->{'Query'};
-
-        foreach my $order (qw(ASC DESC)) {
-            my $error = 0;
-            my $tix = RT::Tickets->new( RT->SystemUser );
-            $tix->FromSQL( $query );
-            $tix->OrderBy( FIELD => $test->{'Order'}, ORDER => $order );
-
-            ok($tix->Count, "found ticket(s)")
-                or $error = 1;
-
-            my ($order_ok, $last) = (1, $order eq 'ASC'? '-': 'zzzzzz');
-            my $last_id = $tix->Last->id;
-            while ( my $t = $tix->Next ) {
-                my $tmp;
-                next if $t->id == $last_id and $t->Subject eq "-"; # Nulls are allowed to come last, in Pg
-
-                if ( $order eq 'ASC' ) {
-                    $tmp = ((split( /,/, $last))[0] cmp (split( /,/, $t->Subject))[0]);
-                } else {
-                    $tmp = -((split( /,/, $last))[-1] cmp (split( /,/, $t->Subject))[-1]);
-                }
-                if ( $tmp > 0 ) {
-                    $order_ok = 0; last;
-                }
-                $last = $t->Subject;
-            }
-
-            ok( $order_ok, "$order order of tickets is good" )
-                or $error = 1;
-
-            if ( $error ) {
-                diag "Wrong SQL query:". $tix->BuildSelectQuery;
-                $tix->GotoFirstItem;
-                while ( my $t = $tix->Next ) {
-                    diag sprintf "%02d - %s", $t->id, $t->Subject;
-                }
-            }
-        }
-    }
+    ok($ret, "Custom Field created");
 }
 
-@data = (
-    { Subject => '-' },
-    { Subject => 'a', 'CustomField-' . $CF{CF}{obj}->id => 'a' },
-    { Subject => 'b', 'CustomField-' . $CF{CF}{obj}->id => 'b' },
-);
-
-@tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @data);
-@test = (
-    { Order => "CF.{$cf_name}" },
-    { Order => "CF.$queue_name.{$cf_name}" },
-);
-run_tests();
-
-@data = (
-    { Subject => '-' },
-    { Subject => 'aa', 'CustomField-' . $CF{CF}{obj}->id => 'aa' },
-    { Subject => 'bb', 'CustomField-' . $CF{CF}{obj}->id => 'bb' },
-);
-@tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @data);
-@test = (
-    { Query => "CF.{$cf_name} LIKE 'a'", Order => "CF.{$cf_name}" },
-    { Query => "CF.{$cf_name} LIKE 'a'", Order => "CF.$queue_name.{$cf_name}" },
-);
-run_tests();
-
-@data = (
-    { Subject => '-', },
-    { Subject => 'a', CF => 'a' },
-    { Subject => 'b', CF => 'b' },
-    { Subject => 'c', CF => 'c' },
-);
-@tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @data);
-@test = (
-    { Query => "CF.{$cf_name} != 'c'", Order => "CF.{$cf_name}" },
-    { Query => "CF.{$cf_name} != 'c'", Order => "CF.$queue_name.{$cf_name}" },
+run_tests(
+    [
+        { Subject => '-' },
+        { Subject => 'aa', 'CustomField-' . $cf->id => 'aa' },
+        { Subject => 'bb', 'CustomField-' . $cf->id => 'bb' },
+        { Subject => 'cc', 'CustomField-' . $cf->id => 'cc' },
+    ],
+    {                                    Count => 4, Order => "CF.{$cf_name}"             },
+    {                                    Count => 4, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.{$cf_name} LIKE 'a'", Count => 1, Order => "CF.{$cf_name}"             },
+    { Query => "CF.{$cf_name} LIKE 'a'", Count => 1, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.{$cf_name} != 'cc'",  Count => 3, Order => "CF.{$cf_name}"             },
+    { Query => "CF.{$cf_name} != 'cc'",  Count => 3, Order => "CF.$queue_name.{$cf_name}" },
 );
-run_tests();
 
 
 
+my $other_cf;
+my $other_name = "othercf";
 diag "create another CF";
 {
-    $CF{'AnotherCF'}{'name'} = "OrderAnother$$";
-    $CF{'AnotherCF'}{'obj'} = RT::CustomField->new( RT->SystemUser );
-    my ($ret, $msg) = $CF{'AnotherCF'}{'obj'}->Create(
-        Name  => $CF{'AnotherCF'}{'name'},
+    $other_cf = RT::CustomField->new( RT->SystemUser );
+    my ($ret, $msg) = $other_cf->Create(
+        Name  => $other_name,
         Queue => $queue->id,
         Type  => 'FreeformSingle',
     );
-    ok($ret, "Custom Field $CF{'AnotherCF'}{'name'} created");
+    ok($ret, "Other Custom Field created");
 }
 
-# test that order is not affect by other fields (had such problem)
-@data = (
-    { Subject => '-', },
-    { Subject => 'a', CF => 'a', AnotherCF => 'za' },
-    { Subject => 'b', CF => 'b', AnotherCF => 'ya' },
-    { Subject => 'c', CF => 'c', AnotherCF => 'xa' },
+# Test that order is not affected by other CFs
+run_tests(
+    [
+        { Subject => '-', },
+        { Subject => 'aa', "CustomField-" . $cf->id => 'aa', "CustomField-" . $other_cf->id => 'za' },
+        { Subject => 'bb', "CustomField-" . $cf->id => 'bb', "CustomField-" . $other_cf->id => 'ya' },
+        { Subject => 'cc', "CustomField-" . $cf->id => 'cc', "CustomField-" . $other_cf->id => 'xa' },
+    ],
+    {                                      Count => 4, Order => "CF.{$cf_name}"             },
+    {                                      Count => 4, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.{$cf_name} LIKE 'a'",   Count => 1, Order => "CF.{$cf_name}"             },
+    { Query => "CF.{$cf_name} LIKE 'a'",   Count => 1, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.{$cf_name} != 'cc'",    Count => 3, Order => "CF.{$cf_name}"             },
+    { Query => "CF.{$cf_name} != 'cc'",    Count => 3, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.{$other_name} != 'za'", Count => 3, Order => "CF.{$cf_name}"             },
+    { Query => "CF.{$other_name} != 'za'", Count => 3, Order => "CF.$queue_name.{$cf_name}" },
 );
-@tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @data);
-@test = (
-    { Order => "CF.{$cf_name}" },
-    { Order => "CF.$queue_name.{$cf_name}" },
-    { Query => "CF.{$cf_name} != 'c'", Order => "CF.{$cf_name}" },
-    { Query => "CF.{$cf_name} != 'c'", Order => "CF.$queue_name.{$cf_name}" },
+
+# And then add a CF with a duplicate name, on a different queue
+{
+    my $other_queue = RT::Test->load_or_create_queue( Name => "other_queue" );
+    ok $other_queue && $other_queue->id, "Created queue";
+
+    my $dup = RT::CustomField->new( RT->SystemUser );
+    my ($ret, $msg) = $dup->Create(
+        Name  => $cf_name,
+        Queue => $other_queue->id,
+        Type  => 'FreeformSingle',
+    );
+    ok($ret, "Custom Field created");
+}
+
+my $cf_id = $cf->id;
+run_tests(
+    [
+        { Subject => '-', },
+        { Subject => 'aa', "CustomField-" . $cf->id => 'aa', "CustomField-" . $other_cf->id => 'za' },
+        { Subject => 'bb', "CustomField-" . $cf->id => 'bb', "CustomField-" . $other_cf->id => 'ya' },
+        { Subject => 'cc', "CustomField-" . $cf->id => 'cc', "CustomField-" . $other_cf->id => 'xa' },
+    ],
+    {                                                Count => 4, Order => "CF.{$cf_name}"             },
+    {                                                Count => 4, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.{$cf_id} LIKE 'a'",               Count => 1, Order => "CF.{$cf_name}"             },
+    { Query => "CF.{$cf_id} LIKE 'a'",               Count => 1, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.{$cf_id} != 'cc'",                Count => 3, Order => "CF.{$cf_name}"             },
+    { Query => "CF.{$cf_id} != 'cc'",                Count => 3, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.$queue_name.{$cf_name} LIKE 'a'", Count => 1, Order => "CF.{$cf_name}"             },
+    { Query => "CF.$queue_name.{$cf_name} LIKE 'a'", Count => 1, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.$queue_name.{$cf_name} != 'cc'",  Count => 3, Order => "CF.{$cf_name}"             },
+    { Query => "CF.$queue_name.{$cf_name} != 'cc'",  Count => 3, Order => "CF.$queue_name.{$cf_name}" },
+    { Query => "CF.{$other_name} != 'za'",           Count => 3, Order => "CF.{$cf_name}"             },
+    { Query => "CF.{$other_name} != 'za'",           Count => 3, Order => "CF.$queue_name.{$cf_name}" },
+
+    { Query => "CF.{$cf_id} != 'cc'",                Count => 3, Order => "CF.{$cf_id}"               },
+    { Query => "CF.{$cf_id} != 'cc'",                Count => 3, Order => "CF.$queue_name.{$cf_id}"   },
+    { Query => "CF.$queue_name.{$cf_name} != 'cc'",  Count => 3, Order => "CF.{$cf_id}"               },
+    { Query => "CF.$queue_name.{$cf_name} != 'cc'",  Count => 3, Order => "CF.$queue_name.{$cf_id}"   },
+    { Query => "CF.{$other_name} != 'za'",           Count => 3, Order => "CF.{$cf_id}"               },
+    { Query => "CF.{$other_name} != 'za'",           Count => 3, Order => "CF.$queue_name.{$cf_id}"   },
 );
-run_tests();
 
-@tickets = ();
+sub run_tests {
+    my $tickets = shift;
+    my @tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @{ $tickets });
+    my $base_query = join(" OR ", map {"id = ".$_->id} @tickets) || "id > 0";
+
+    my @tests = @_;
+    for my $test ( @tests ) {
+        $test->{'Query'} ||= "id > 0";
+        my $query = "( $base_query ) AND " . $test->{'Query'};
+        for my $order (qw(ASC DESC)) {
+            subtest $test->{'Query'} . " ORDER BY ".$test->{'Order'}. " $order" => sub {
+                my $error = 0;
+                my $tix = RT::Tickets->new( RT->SystemUser );
+                $tix->FromSQL( $query );
+                $tix->OrderBy( FIELD => $test->{'Order'}, ORDER => $order );
+
+                is($tix->Count, $test->{'Count'}, "found right number of tickets (".$test->{Count}.")")
+                    or $error = 1;
+
+                my ($order_ok, $last) = (1, $order eq 'ASC'? '-': 'zzzzzz');
+                if ($tix->Count) {
+                    my $last_id = $tix->Last->id;
+                    while ( my $t = $tix->Next ) {
+                        my $tmp;
+                        next if $t->id == $last_id and $t->Subject eq "-"; # Nulls are allowed to come last, in Pg
+
+                        if ( $order eq 'ASC' ) {
+                            $tmp = ((split( /,/, $last))[0] cmp (split( /,/, $t->Subject))[0]);
+                        } else {
+                            $tmp = -((split( /,/, $last))[-1] cmp (split( /,/, $t->Subject))[-1]);
+                        }
+                        if ( $tmp > 0 ) {
+                            $order_ok = 0; last;
+                        }
+                        $last = $t->Subject;
+                    }
+                }
+
+                ok( $order_ok, "$order order of tickets is good" )
+                    or $error = 1;
+
+                if ( $error ) {
+                    diag "Wrong SQL query:". $tix->BuildSelectQuery;
+                    $tix->GotoFirstItem;
+                    while ( my $t = $tix->Next ) {
+                        diag sprintf "%02d - %s", $t->id, $t->Subject;
+                    }
+                }
+            };
+        }
+    }
+}
 
+done_testing;