Add assert_cast_quickvote_succeeds/fails helper, and changed the fails helpers to...

diff --git a/test/unit/selectricityservice_test.rb b/test/unit/selectricityservice_test.rb
index 74b26d45913d25ff52aec6224879d2814a272299..4fd616fdecf7bf56d3bc144cb71617732d3e1d01 100644 (file)
--- a/test/unit/selectricityservice_test.rb
+++ b/test/unit/selectricityservice_test.rb
@@ -21,20 +21,15 @@ class SelectricityServiceTest < Test::Unit::TestCase
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"
     casted_vote = election.candidate_ids.sort_by {rand} #Shuffles
-    invoke_delegated :vote, :cast_quickvote, "TestVote", 42, [casted_vote]
-    quickvote_votes= invoke_delegated :vote, :get_quickvote_votes, "TestVote"
-    assert_equal quickvote_votes.length, 1
-    assert_equal quickvote_votes[0].vote, casted_vote
+    assert_cast_quickvote_succeeds "TestVote", 42, [casted_vote]
   end
   def test_cast_mass_quickvote
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"
     20.times do |t|
       casted_vote = election.candidate_ids.sort_by {rand}
-      invoke_delegated :vote, :cast_quickvote, "TestVote", t, [casted_vote]
+      assert_cast_quickvote_succeeds "TestVote", t, [casted_vote]
     end
-    quickvote_votes= invoke_delegated :vote, :get_quickvote_votes, "TestVote"
-    assert_equal quickvote_votes.length, 20
   end
   def test_create_mass_quickvote
     10.times do |t|
@@ -110,15 +105,15 @@ class SelectricityServiceTest < Test::Unit::TestCase
     end
     25.times do |t|
       vote = [candidates["jdong"], candidates["mako"], candidates["justin"]]
-      invoke_delegated :vote, :cast_quickvote, "favdev", "1:#{t}", [vote]
+      assert_cast_quickvote_succeeds "favdev", "1:#{t}", [vote]
     end
     5.times do |t|
       vote = [candidates["mako"], candidates["justin"], candidates["jdong"]]
-      invoke_delegated :vote, :cast_quickvote, "favdev", "2:#{t}", [vote]
+      assert_cast_quickvote_succeeds "favdev", "2:#{t}", [vote]
     end
     10.times do |t|
       vote = [candidates["justin"], candidates["mako"], candidates["jdong"]]
-      invoke_delegated :vote, :cast_quickvote, "favdev", "3:#{t}", [vote]
+      assert_cast_quickvote_succeeds "favdev", "3:#{t}", [vote]
     end
     results=invoke_delegated(:vote, :get_quickvote_results, "favdev")
     assert_equal results.approval_winners, [candidates["mako"]]
@@ -129,10 +124,29 @@ class SelectricityServiceTest < Test::Unit::TestCase
     assert_equal results.errors.length, 0
   end
   private
+  def assert_cast_quickvote_succeeds(shortname, id, vote)
+    old_votes = invoke_delegated :vote, :get_quickvote_votes, shortname
+    assert_nothing_raised do
+      invoke_delegated :vote, :cast_quickvote, shortname, id, vote
+    end
+    new_votes = invoke_delegated :vote, :get_quickvote_votes, shortname
+    assert_equal old_votes.length, new_votes.length-1
+    assert_not_nil(reflection = new_votes.find_all { |v| v.voter_session_id == "XMLRPC:#{id}" })
+    assert_equal reflection.length, 1
+    assert_equal reflection[0].vote, vote[0]
+  end
+  def assert_cast_quickvote_fails(shortname, id, vote)
+    assert_raises Test::Unit::AssertionFailedError do 
+      assert_cast_quickvote_succeeds(shortname, id, vote)
+    end
+  end
   def assert_create_quickvote_succeeds(election)
     # Checks if a created quickvote is identical when retrieved
     old_len=invoke_delegated(:vote,:list_quickvotes).length
-    result = invoke_delegated :vote, :create_quickvote, election
+    result=""
+    assert_nothing_raised do
+      result = invoke_delegated :vote, :create_quickvote, election
+    end
     assert_equal result, ""
     reflection = invoke_delegated :vote, :get_quickvote, election.name
     assert_equal election.description, reflection.description
@@ -141,11 +155,8 @@ class SelectricityServiceTest < Test::Unit::TestCase
     assert_equal(invoke_delegated(:vote,:list_quickvotes).length, old_len+1)
   end
   def assert_create_quickvote_fails(election)
-    # Helper function to check that creating this quickvote fails
-    old_len=invoke_delegated(:vote,:list_quickvotes).length
-    result = invoke_delegated :vote, :create_quickvote, election
-    assert_instance_of String, result
-    assert_not_equal result.length, 0
-    assert_equal(invoke_delegated(:vote,:list_quickvotes).length, old_len)
+    assert_raises Test::Unit::AssertionFailedError do
+      assert_create_quickvote_succeeds election
+    end
   end
 end