Changeset 319 for trunk/t

Timestamp:

06/01/10 10:48:29 (14 years ago)

Author:

nanardon

Message:

• support of several poll type
• remove static result storage

Location:

trunk/t

Files:

• 10Epoll_DB.t (modified) (6 diffs)
• 15ImportV.t (modified) (2 diffs)
• 20Epoll_Web.t (modified) (2 diffs)

trunk/t/10Epoll_DB.t

@@ -25 +25 @@
             my ($r) = @_;
             is($r->absolute_majority, 1, "Can get absolute_majority");
-            is($r->ballot_count, 0, "can get ballot count");
+            is($r->ballots_count, 0, "can get ballot count");
             is($r->voting_count, 0, "can get voting count");
             is($r->signing_count, 0, "can get signing count");
@@ -44 +44 @@
             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->ballots_count, 4, "can get ballot count");
+            is($r->_voices_ballot_count, 3, "can get ballot count");
             is($r->voting_count, 6, "can get voting count");
             is($r->signing_count, 4, "can get signing count");
@@ -63 +63 @@
             f => {},
         },
+        map_values => sub {
+            my ($r) = @_;
+            $r->map_value('ch10', 'ch1');
+        },
         test_count => 14,
         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->ballots_count, 4, "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");
@@ -102 +105 @@
             my ($r) = @_;
             is($r->absolute_majority, 3, "Can get absolute_majority");
-            is($r->ballot_count, 5, "can get ballot count");
+            is($r->ballots_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");
@@ -121 +124 @@
 plan tests => 
     3                          # Fixed test 
-    + scalar(@$test_polls) * 7 # number of tested polls scenario
-    + $poll_test_count * 2;    # poll test
+    + scalar(@$test_polls) * 8 # number of tested polls scenario
+    + $poll_test_count;    # poll test
 
 use_ok 'Epoll', 'Epoll';
@@ -160 +163 @@
         );
     }
+
+    if ($tpoll->{map_values}) {
+        $tpoll->{map_values}->($poll);
+    }
     
     isa_ok(my $results = $vote->results($pollid), 'Epoll::DB::Poll');
 
-    $tpoll->{tests}->($results);
-
-    ok($results->delete_ballots, "Can switch to static results");
+    ok($results->decrypted_ballots(), "Can decrypt ballot");
+    ok($results->compute_results(), "Can compute results");
 
     $tpoll->{tests}->($results);

trunk/t/15ImportV.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 1;
+use Test::More tests => 2;
 
 use_ok('Epoll::DB::ImportV');
@@ -8 +8 @@
     "Can instanciate dummy import");
 
-warn $import->auth_type;
-warn $import->can_authenticate;
-
 $import->{params}{foo} = 1;
 $import->{params}{bar} = 1;
 
-warn $import->xml_params;
-$import->load_xml_params($import->xml_params);
-$import->load_xml_params($import->xml_params);
-
-warn join ' ', keys %{$import->{params}};

trunk/t/20Epoll_Web.t

@@ -36 +36 @@
     "Request /admin/$pollid/ballot should succeed" );
 
-ok( request("/ballot/$pollid")->is_success, "Request /admin/$pollid should succeed" );
+ok( request("/admin/$pollid?vpass$pollid=password")->is_success, "Request /admin/$pollid should succeed" );
 ok( request("/ballot/$pollid?mail=user@;password=$votingpass")->is_success,
-    "Request /admin/$pollid should succeed" );
+    "Request /ballot/$pollid should succeed" );
 
 # Be sure today is included:
@@ -56 +56 @@
     "Request /admin/$pollid/ballot should succeed" );
 
-ok( request("/ballot/$pollid")->is_success, "Request /admin/$pollid should succeed" );
-ok( request("/ballot/$vote_uid")->is_success, "Request /admin/$vote_uid should succeed" );
+ok( request("/ballot/$pollid")->is_success, "Request /ballot/$pollid should succeed" );
+ok( request("/ballot/$vote_uid")->is_success, "Request /ballot/$vote_uid should succeed" );
 ok( request("/ballot/$pollid?mail=user@;password=$votingpass")->is_success,
-    "Request /admin/$pollid should succeed" );
+    "Request /ballot/$pollid should succeed" );