From 92ad842ab857181183a5b42ada50f53398514ef5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 11 Aug 2011 18:13:46 -0400
Subject: [PATCH] Unit Tests

- Fixed sorting errors, which were in the tests, not the code.
---
 test/sorting.t | 194 +++++++++++++++++++++++++------------------------
 1 file changed, 99 insertions(+), 95 deletions(-)

diff --git a/test/sorting.t b/test/sorting.t
index b937933ab..aeaab56f1 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 97;
+use Test::More tests => 103;
 
 # Create the rc file.
 if (open my $fh, '>', 'sorting.rc')
@@ -45,133 +45,137 @@ qx{../src/task rc:sorting.rc add priority:M project:B due:today     two};
 qx{../src/task rc:sorting.rc add priority:L project:C due:tomorrow  three};
 qx{../src/task rc:sorting.rc add priority:H project:C due:today     four};
 
-qx{../src/task rc:sorting.rc 2 start};
 qx{../src/task rc:sorting.rc 2 start};
 
 my %tests =
 (
   # Single sort column.
-  'priority-'                       => '(?:one.+four|four.+one).+two.+three.+zero',
-  'priority+'                       => 'zero.+three.+two.+(?:one.+four|four.+one)',
-  'project-'                        => '(?:three.+four|four.+three).+two.+one.+zero',
-  'project+'                        => 'zero.+one.+two.+(?:three.+four|four.+three)',
-  'start-'                          => '(?:one.+three|three.+one).+(?:zero.+two.+four|zero.+four.+two|two.+zero.+four|two.+four.+zero|four.+zero.+two|four.+two.+zero)',
-  'start+'                          => '(?:zero.+two.+four|zero.+four.+two|two.+zero.+four|two.+four.+zero|four.+zero.+two|four.+two.+zero).+(?:one.+three|three.+one)',
-  'due-'                            => 'three.+(?:two.+four|four.+two).+one.+zero',
-  'due+'                            => 'one.+(?:two.+four|four.+two).+three.+zero',
-  'description-'                    => 'zero.+two.+three.+one.+four',
-  'description+'                    => 'four.+one.+three.+two.+zero',
+  'priority-'                       => ['(?:one.+four|four.+one).+two.+three.+zero'],
+  'priority+'                       => ['zero.+three.+two.+(?:one.+four|four.+one)'],
+  'project-'                        => ['(?:three.+four|four.+three).+two.+one.+zero'],
+  'project+'                        => ['zero.+one.+two.+(?:three.+four|four.+three)'],
+  'start-'                          => ['one.+zero', 'one.+two', 'one.+three', 'one.+four'],
+  'start+'                          => ['zero.+one', 'two.+one', 'three.+one', 'four.+one'],
+  'due-'                            => ['three.+(?:two.+four|four.+two).+one.+zero'],
+  'due+'                            => ['one.+(?:two.+four|four.+two).+three.+zero'],
+  'description-'                    => ['zero.+two.+three.+one.+four'],
+  'description+'                    => ['four.+one.+three.+two.+zero'],
 
   # Two sort columns.
-  'priority-,project-'              => 'four.+one.+two.+three.+zero',
-  'priority-,project+'              => 'one.+four.+two.+three.+zero',
-  'priority+,project-'              => 'zero.+three.+two.+four.+one',
-  'priority+,project+'              => 'zero.+three.+two.+one.+four',
+  'priority-,project-'              => ['four.+one.+two.+three.+zero'],
+  'priority-,project+'              => ['one.+four.+two.+three.+zero'],
+  'priority+,project-'              => ['zero.+three.+two.+four.+one'],
+  'priority+,project+'              => ['zero.+three.+two.+one.+four'],
 
-  'priority-,start-'                => 'one.+four.+two.+three.+zero',
-  'priority-,start+'                => 'four.+one.+two.+three.+zero',
-  'priority+,start-'                => 'zero.+three.+two.+one.+four',
-  'priority+,start+'                => 'zero.+three.+two.+four.+one',
+  'priority-,start-'                => ['one.+four.+two.+three.+zero'],
+  'priority-,start+'                => ['four.+one.+two.+three.+zero'],
+  'priority+,start-'                => ['zero.+three.+two.+one.+four'],
+  'priority+,start+'                => ['zero.+three.+two.+four.+one'],
 
-  'priority-,due-'                  => 'four.+one.+two.+three.+zero',
-  'priority-,due+'                  => 'one.+four.+two.+three.+zero',
-  'priority+,due-'                  => 'zero.+three.+two.+four.+one',
-  'priority+,due+'                  => 'zero.+three.+two.+one.+four',
+  'priority-,due-'                  => ['four.+one.+two.+three.+zero'],
+  'priority-,due+'                  => ['one.+four.+two.+three.+zero'],
+  'priority+,due-'                  => ['zero.+three.+two.+four.+one'],
+  'priority+,due+'                  => ['zero.+three.+two.+one.+four'],
 
-  'priority-,description-'          => 'one.+four.+two.+three.+zero',
-  'priority-,description+'          => 'four.+one.+two.+three.+zero',
-  'priority+,description-'          => 'zero.+three.+two.+one.+four',
-  'priority+,description+'          => 'zero.+three.+two.+four.+one',
+  'priority-,description-'          => ['one.+four.+two.+three.+zero'],
+  'priority-,description+'          => ['four.+one.+two.+three.+zero'],
+  'priority+,description-'          => ['zero.+three.+two.+one.+four'],
+  'priority+,description+'          => ['zero.+three.+two.+four.+one'],
 
-  'project-,priority-'              => 'four.+three.+two.+one.+zero',
-  'project-,priority+'              => 'three.+four.+two.+one.+zero',
-  'project+,priority-'              => 'zero.+one.+two.+four.+three',
-  'project+,priority+'              => 'zero.+one.+two.+three.+four',
+  'project-,priority-'              => ['four.+three.+two.+one.+zero'],
+  'project-,priority+'              => ['three.+four.+two.+one.+zero'],
+  'project+,priority-'              => ['zero.+one.+two.+four.+three'],
+  'project+,priority+'              => ['zero.+one.+two.+three.+four'],
 
-  'project-,start-'                 => 'three.+four.+two.+one.+zero',
-  'project-,start+'                 => 'four.+three.+two.+one.+zero',
-  'project+,start-'                 => 'zero.+one.+two.+three.+four',
-  'project+,start+'                 => 'zero.+one.+two.+four.+three',
+  'project-,start-'                 => ['three.+four.+two.+one.+zero'],
+  'project-,start+'                 => ['(?:four.+three|three.+four).+two.+one.+zero'],
+  'project+,start-'                 => ['zero.+one.+two.+three.+four'],
+  'project+,start+'                 => ['zero.+one.+two.+(?:four.+three|three.+four)'],
 
-  'project-,due-'                   => 'three.+four.+two.+one.+zero',
-  'project-,due+'                   => 'four.+three.+two.+one.+zero',
-  'project+,due-'                   => 'zero.+one.+two.+three.+four',
-  'project+,due+'                   => 'zero.+one.+two.+four.+three',
+  'project-,due-'                   => ['three.+four.+two.+one.+zero'],
+  'project-,due+'                   => ['four.+three.+two.+one.+zero'],
+  'project+,due-'                   => ['zero.+one.+two.+three.+four'],
+  'project+,due+'                   => ['zero.+one.+two.+four.+three'],
 
-  'project-,description-'           => 'three.+four.+two.+one.+zero',
-  'project-,description+'           => 'four.+three.+two.+one.+zero',
-  'project+,description-'           => 'zero.+one.+two.+three.+four',
-  'project+,description+'           => 'zero.+one.+two.+four.+three',
+  'project-,description-'           => ['three.+four.+two.+one.+zero'],
+  'project-,description+'           => ['four.+three.+two.+one.+zero'],
+  'project+,description-'           => ['zero.+one.+two.+three.+four'],
+  'project+,description+'           => ['zero.+one.+two.+four.+three'],
 
-  'start-,priority-'                => 'one.+three.+four.+two.+zero',
-  'start-,priority+'                => 'three.+one.+zero.+two.+four',
-  'start+,priority-'                => 'four.+two.+zero.+one.+three',
-  'start+,priority+'                => 'zero.+two.+four.+three.+one',
+  'start-,priority-'                => ['one.+four.+two.+three.+zero'],
+  'start-,priority+'                => ['one.+zero.+three.+two.+four'],
+  'start+,priority-'                => ['four.+two.+three.+zero.+one'],
+  'start+,priority+'                => ['zero.+three.+two.+four.+one'],
 
-  'start-,project-'                 => 'three.+one.+four.+two.+zero',
-  'start-,project+'                 => 'one.+three.+zero.+two.+four',
-  'start+,project-'                 => 'four.+two.+zero.+three.+one',
-  'start+,project+'                 => 'zero.+two.+four.+one.+three',
+  'start-,project-'                 => ['one.+(?:three.+four|four.+three).+two.+zero'],
+  'start-,project+'                 => ['one.+zero.+two.+(?:three.+four|four.+three)'],
+  'start+,project-'                 => ['(?:three.+four|four.+three).+two.+zero.+one'],
+  'start+,project+'                 => ['zero.+two.+(?:three.+four|four.+three).+one'],
 
-  'start-,due-'                     => 'three.+one.+(?:four.+two|two.+four).+zero',
-  'start-,due+'                     => 'one.+three.+(?:four.+two|two.+four).+zero',
-  'start+,due-'                     => '(?:four.+two|two.+four).+zero.+three.+one',
-  'start+,due+'                     => '(?:four.+two|two.+four).+zero.+one.+three',
+  'start-,due-'                     => ['one.+three.+(?:four.+two|two.+four).+zero'],
+  'start-,due+'                     => ['one.+(?:four.+two|two.+four).+three.+zero'],
+  'start+,due-'                     => ['three.+(?:four.+two|two.+four).+zero.+one'],
+  'start+,due+'                     => ['(?:four.+two|two.+four).+three.+zero.+one'],
 
-  'start-,description-'             => 'three.+one.+zero.+two.+four',
-  'start-,description+'             => 'one.+three.+four.+two.+zero',
-  'start+,description-'             => 'zero.+two.+four.+three.+one',
-  'start+,description+'             => 'four.+two.+zero.+one.+three',
+  'start-,description-'             => ['one.+zero.+two.+three.+four'],
+  'start-,description+'             => ['one.+four.+three.+two.+zero'],
+  'start+,description-'             => ['zero.+two.+three.+four.+one'],
+  'start+,description+'             => ['four.+three.+two.+zero.+one'],
 
-  'due-,priority-'                  => 'three.+four.+two.+one.+zero',
-  'due-,priority+'                  => 'three.+two.+four.+one.+zero',
-  'due+,priority-'                  => 'one.+four.+two.+three.+zero',
-  'due+,priority+'                  => 'one.+two.+four.+three.+zero',
+  'due-,priority-'                  => ['three.+four.+two.+one.+zero'],
+  'due-,priority+'                  => ['three.+two.+four.+one.+zero'],
+  'due+,priority-'                  => ['one.+four.+two.+three.+zero'],
+  'due+,priority+'                  => ['one.+two.+four.+three.+zero'],
 
-  'due-,project-'                   => 'three.+four.+two.+one.+zero',
-  'due-,project+'                   => 'three.+two.+four.+one.+zero',
-  'due+,project-'                   => 'one.+four.+two.+three.+zero',
-  'due+,project+'                   => 'one.+two.+four.+three.+zero',
+  'due-,project-'                   => ['three.+four.+two.+one.+zero'],
+  'due-,project+'                   => ['three.+two.+four.+one.+zero'],
+  'due+,project-'                   => ['one.+four.+two.+three.+zero'],
+  'due+,project+'                   => ['one.+two.+four.+three.+zero'],
 
-  'due-,start-'                     => 'three.+(?:four.+two|two.+four).+one.+zero',
-  'due-,start+'                     => 'three.+(?:four.+two|two.+four).+one.+zero',
-  'due+,start-'                     => 'one.+(?:four.+two|two.+four).+three.+zero',
-  'due+,start+'                     => 'one.+(?:four.+two|two.+four).+three.+zero',
+  'due-,start-'                     => ['three.+(?:four.+two|two.+four).+one.+zero'],
+  'due-,start+'                     => ['three.+(?:four.+two|two.+four).+one.+zero'],
+  'due+,start-'                     => ['one.+(?:four.+two|two.+four).+three.+zero'],
+  'due+,start+'                     => ['one.+(?:four.+two|two.+four).+three.+zero'],
 
-  'due-,description-'               => 'three.+two.+four.+one.+zero',
-  'due-,description+'               => 'three.+four.+two.+one.+zero',
-  'due+,description-'               => 'one.+two.+four.+three.+zero',
-  'due+,description+'               => 'one.+four.+two.+three.+zero',
+  'due-,description-'               => ['three.+two.+four.+one.+zero'],
+  'due-,description+'               => ['three.+four.+two.+one.+zero'],
+  'due+,description-'               => ['one.+two.+four.+three.+zero'],
+  'due+,description+'               => ['one.+four.+two.+three.+zero'],
 
-  'description-,priority-'          => 'zero.+two.+three.+one.+four',
-  'description-,priority+'          => 'zero.+two.+three.+one.+four',
-  'description+,priority-'          => 'four.+one.+three.+two.+zero',
-  'description+,priority+'          => 'four.+one.+three.+two.+zero',
+  'description-,priority-'          => ['zero.+two.+three.+one.+four'],
+  'description-,priority+'          => ['zero.+two.+three.+one.+four'],
+  'description+,priority-'          => ['four.+one.+three.+two.+zero'],
+  'description+,priority+'          => ['four.+one.+three.+two.+zero'],
 
-  'description-,project-'           => 'zero.+two.+three.+one.+four',
-  'description-,project+'           => 'zero.+two.+three.+one.+four',
-  'description+,project-'           => 'four.+one.+three.+two.+zero',
-  'description+,project+'           => 'four.+one.+three.+two.+zero',
+  'description-,project-'           => ['zero.+two.+three.+one.+four'],
+  'description-,project+'           => ['zero.+two.+three.+one.+four'],
+  'description+,project-'           => ['four.+one.+three.+two.+zero'],
+  'description+,project+'           => ['four.+one.+three.+two.+zero'],
 
-  'description-,start-'             => 'zero.+two.+three.+one.+four',
-  'description-,start+'             => 'zero.+two.+three.+one.+four',
-  'description+,start-'             => 'four.+one.+three.+two.+zero',
-  'description+,start+'             => 'four.+one.+three.+two.+zero',
+  'description-,start-'             => ['zero.+two.+three.+one.+four'],
+  'description-,start+'             => ['zero.+two.+three.+one.+four'],
+  'description+,start-'             => ['four.+one.+three.+two.+zero'],
+  'description+,start+'             => ['four.+one.+three.+two.+zero'],
 
-  'description-,due-'               => 'zero.+two.+three.+one.+four',
-  'description-,due+'               => 'zero.+two.+three.+one.+four',
-  'description+,due-'               => 'four.+one.+three.+two.+zero',
-  'description+,due+'               => 'four.+one.+three.+two.+zero',
+  'description-,due-'               => ['zero.+two.+three.+one.+four'],
+  'description-,due+'               => ['zero.+two.+three.+one.+four'],
+  'description+,due-'               => ['four.+one.+three.+two.+zero'],
+  'description+,due+'               => ['four.+one.+three.+two.+zero'],
 
   # Four sort columns.
-  'start+,project+,due+,priority+'  => 'zero.+two.+four.+one.+three',
-  'project+,due+,priority+,start+'  => 'zero.+one.+two.+four.+three',
+  'start+,project+,due+,priority+'  => ['zero.+two.+four.+three.+one'],
+  'project+,due+,priority+,start+'  => ['zero.+one.+two.+four.+three'],
 );
 
 for my $sort (sort keys %tests)
 {
   my $output = qx{../src/task rc:sorting.rc rc.report.list.sort:${sort} list};
-  like ($output, qr/$tests{$sort}/ms, "sort:${sort}");
+#  like ($output, qr/$tests{$sort}/ms, "sort:${sort}");
+
+  for my $expectation (@{$tests{$sort}})
+  {
+    like ($output, qr/$expectation/ms, "sort:${sort}");
+  }
 }
 
 # Cleanup.