Changeset 213 for trunk/t

Timestamp:

04/16/09 20:47:17 (15 years ago)

Author:

nanardon

Message:

• more tests and the fix need to have it passing

File:

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

trunk/t/10Vote_DB.t

@@ -5 +5 @@
 # $Id$
 
-my $test_polls = [
-# Structure:
+# Tpoll Structure:
 #    {
 #        poll => { var => $val },
@@ -18 +17 @@
 #        results => { var => $val }, # wanted results 
 #    }
+my $test_polls = [
     { # an empty poll
         poll => { label => 'empty poll' },
         choices => [ qw(ch1 ch2) ],
-        results => {
-            ballot_count => 0,
-            absolute_majority => 1,
+        test_count => 4,
+        tests => sub {
+            my ($r) = @_;
+            is($r->absolute_majority, 1, "Can get absolute_majority");
+            is($r->ballot_count, 0, "can get ballot count");
+            is($r->voting_count, 0, "can get voting count");
+            is($r->signing_count, 0, "can get signing count");
+        }
+    },
+    {
+        poll => { label => 'some vals' },
+        choices => [ qw(ch1 ch2) ],
+        voting => [ qw(a b c d e f) ],
+        ballot => {
+            a => { sbal => [ 'ch1' ] },
+            b => { sbal => [ 'ch1', 'ch10' ] },
+            d => { sbal => [ 'ch1', 'ch2' ] },
+            f => {},
+        },
+        test_count => 7,
+        tests => sub {
+            my ($r) = @_;
+            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->voting_count, 6, "can get voting count");
+            is($r->signing_count, 4, "can get signing count");
+            my $res = $r->results_nonull;
+            is($res->[0]->{value}, 'ch1', "winner is ch1");
+            is($res->[0]->{count}, 3, "winner has 3 voices");
+        }
+    },
+    {
+        poll => { label => 'some vals with mapped values' },
+        choices => [ qw(ch1 ch2 ch3) ],
+        voting => [ qw(a b c d e f) ],
+        ballot => {
+            a => { sbal => [ 'ch1' ] },
+            b => { sbal => [ 'ch1', 'ch10' ] },
+            d => { sbal => [ 'ch1', 'ch2' ] },
+            f => {},
+        },
+        test_count => 9,
+        tests => sub {
+            my ($r) = @_;
+            $r->map_value('ch10', 'ch1');
+            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->voting_count, 6, "can get voting count");
+            is($r->signing_count, 4, "can get signing count");
+            my $res = $r->results_nonull;
+            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");
         }
     },
 ];
 
+my $poll_test_count = 0;
+$poll_test_count += ($_->{test_count} || 0) foreach(@$test_polls);
+
 plan tests => 
-    3                        # Fixed test 
-    + scalar(@$test_polls) * # number of tested polls scenario
-    6;                       # per poll number of tests
+    3                          # Fixed test 
+    + scalar(@$test_polls) * 4 # number of tested polls scenario
+    + $poll_test_count;        # poll test
 
 use_ok 'Vote', 'Vote';
 use_ok 'Vote::DB';
-
 $ENV{EPOLL_NO_COMMIT} = 1;
-
 isa_ok(my $vote = Vote::DB->new(Vote->config->{db}), 'Vote::DB');
 
@@ -65 +119 @@
     foreach my $name (keys %{ $tpoll->{ballot} || {} }) {
         $poll->register_ballot(
-            $name, $tpoll->{ballot}{$name}{sbal}, $tpoll->{ballot}{$name}{sbal}, "localtest"
+            $name, $tpoll->{ballot}{$name}{sbal}, $tpoll->{ballot}{$name}{fsbal}, 'localhost'
         );
     }
@@ -71 +125 @@
     isa_ok(my $results = $vote->results($pollid), 'Vote::DB::Poll');
 
-    is($results->ballot_count, $tpoll->{results}{ballot_count} || 0,
-        "can get ballot count");
-    is($results->absolute_majority, $tpoll->{results}{absolute_majority},
-        "can get absolute majority");
+    $tpoll->{tests}->($results);
 
-    my $res = $results->results_count;
+    $vote->db->rollback; # really rollback
+}
 
-    $vote->rollback;
-}