Changeset 214 for trunk/t

Timestamp:

04/17/09 15:32:47 (15 years ago)

Author:

nanardon

Message:

• more results function, support empty ballots in voices count

File:

• trunk/t/10Vote_DB.t (modified) (2 diffs)

trunk/t/10Vote_DB.t

@@ -60 +60 @@
             a => { sbal => [ 'ch1' ] },
             b => { sbal => [ 'ch1', 'ch10' ] },
-            d => { sbal => [ 'ch1', 'ch2' ] },
+            d => { sbal => [ 'ch1', 'ch2', 'ch4' ] },
             f => {},
         },
-        test_count => 9,
+        test_count => 10,
         tests => sub {
             my ($r) = @_;
@@ -69 +69 @@
             is($r->absolute_majority, 2, "Can get absolute_majority");
             is($r->ballot_count, 4, "can get ballot count");
-            is($r->ballot_count_nonull, 3, "can get ballot count");
+            is($r->not_empty_ballot_count, 3, "can get ballot count");
+            is($r->empty_ballot_count, 1, "can get empty ballot count");
             is($r->voting_count, 6, "can get voting count");
             is($r->signing_count, 4, "can get signing count");
-            my $res = $r->results_nonull;
+            my $res = $r->results;
             is($res->[0]->{value}, 'ch1', "winner is ch1");
             is($res->[0]->{count}, 3, "winner has 3 voices");
-            is(@$res, 3, "count of winners");
-            is($res->[2]->{count}, 0, "last has 0 voices");
+            is(@$res, 4, "count of winners");
+            is($res->[3]->{count}, 0, "last has 0 voices");
+        }
+    },
+    {
+        poll => {
+            label => 'empty ballot count',
+            empty_ballot_has_voice => 1,
+        },
+        choices => [ qw(ch1 ch2 ch3) ],
+        voting => [ qw(a b c d e f) ],
+        ballot => {
+            a => { sbal => [ 'ch1' ] },
+            b => { sbal => [ 'ch1', 'ch2' ] },
+            d => { sbal => [ 'ch1', 'ch2' ] },
+            e => {},
+            f => {},
+        },
+        test_count => 10,
+        tests => sub {
+            my ($r) = @_;
+            is($r->absolute_majority, 3, "Can get absolute_majority");
+            is($r->ballot_count, 5, "can get ballot count");
+            is($r->not_empty_ballot_count, 3, "can get ballot count");
+            is($r->empty_ballot_count, 2, "can get empty ballot count");
+            is($r->voting_count, 6, "can get voting count");
+            is($r->signing_count, 5, "can get signing count");
+            my $res = $r->results;
+            is($res->[0]->{value}, 'ch1', "winner is ch1");
+            is($res->[0]->{count}, 3, "winner has 3 voices");
+            is(@$res, 4, "count of winners");
+            is($res->[3]->{count}, 0, "last has 0 voices");
         }
     },