Cleaned up some of the test cases.

diff --git a/test/unit/selectricityservice_test.rb b/test/unit/selectricityservice_test.rb
index 0596dc715fe8d17ed1401c6cd2f6b0f01ae1584a..c0f73c02789236df5c23e8728cc0d79aca329144 100644 (file)
--- a/test/unit/selectricityservice_test.rb
+++ b/test/unit/selectricityservice_test.rb
@@ -13,16 +13,19 @@ class SelectricityServiceTest < Test::Unit::TestCase
     assert_instance_of Array, result
     assert_equal result.length, 0
   end
     assert_instance_of Array, result
     assert_equal result.length, 0
   end

+

   def test_create_quickvote
     election = ElectionStruct.new :name => "TestVote", :description => "Test Vote", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_succeeds election
   end
   def test_create_quickvote
     election = ElectionStruct.new :name => "TestVote", :description => "Test Vote", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_succeeds election
   end

+

   def test_cast_quickvote
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"
     casted_vote = election.candidate_ids.sort_by {rand} #Shuffles
     assert_cast_quickvote_succeeds "TestVote", 42, [casted_vote]
   end
   def test_cast_quickvote
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"
     casted_vote = election.candidate_ids.sort_by {rand} #Shuffles
     assert_cast_quickvote_succeeds "TestVote", 42, [casted_vote]
   end

+

   def test_cast_nil_quickvote
     assert_cast_quickvote_fails nil, nil, nil
     assert_cast_quickvote_fails "foo", nil, nil
   def test_cast_nil_quickvote
     assert_cast_quickvote_fails nil, nil, nil
     assert_cast_quickvote_fails "foo", nil, nil


@@ -31,6 +34,7 @@ class SelectricityServiceTest < Test::Unit::TestCase
     assert_cast_quickvote_fails "TestVote",42,nil
     assert_cast_quickvote_fails "TestVote",nil,[]
   end
     assert_cast_quickvote_fails "TestVote",42,nil
     assert_cast_quickvote_fails "TestVote",nil,[]
   end

+

   def test_cast_malformed_votelist
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"
   def test_cast_malformed_votelist
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"


@@ -38,17 +42,21 @@ class SelectricityServiceTest < Test::Unit::TestCase
     assert_cast_quickvote_fails "TestVote", 11, [1,2]
     assert_cast_quickvote_fails "TestVote", 11, [election.candidate_ids[0],election.candidate_ids[0], election.candidate_ids[1], election.candidate_ids[1], election.candidate_ids[2]]
   end
     assert_cast_quickvote_fails "TestVote", 11, [1,2]
     assert_cast_quickvote_fails "TestVote", 11, [election.candidate_ids[0],election.candidate_ids[0], election.candidate_ids[1], election.candidate_ids[1], election.candidate_ids[2]]
   end

+

   def test_get_nonexistent_quickvote
     assert_raises ArgumentError do
       qv = invoke_delegated :vote, :get_quickvote, "asdfasdfasdf"
     end
   end
   def test_get_nonexistent_quickvote
     assert_raises ArgumentError do
       qv = invoke_delegated :vote, :get_quickvote, "asdfasdfasdf"
     end
   end

+

   def test_get_voters_nonexistent_quickvote
     assert_raises(ArgumentError) {invoke_delegated :vote, :get_quickvote_votes, "asdfasdf"}
   end
   def test_get_voters_nonexistent_quickvote
     assert_raises(ArgumentError) {invoke_delegated :vote, :get_quickvote_votes, "asdfasdf"}
   end

+

   def test_get_candidate_map_nonexistent_quickvote
     assert_raises(ArgumentError) { invoke_delegated :vote, :get_quickvote_candidate_map, "asdfasdf"}
   end
   def test_get_candidate_map_nonexistent_quickvote
     assert_raises(ArgumentError) { invoke_delegated :vote, :get_quickvote_candidate_map, "asdfasdf"}
   end

+

   def test_cast_mass_quickvote
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"
   def test_cast_mass_quickvote
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"


@@ -57,43 +65,52 @@ class SelectricityServiceTest < Test::Unit::TestCase
       assert_cast_quickvote_succeeds "TestVote", t, [casted_vote]
     end
   end
       assert_cast_quickvote_succeeds "TestVote", t, [casted_vote]
     end
   end

+

   def test_cast_quickvote_nonexistent
     assert_cast_quickvote_fails "ASDFJOFASF", "me", [1,2,3]
   end
   def test_cast_quickvote_nonexistent
     assert_cast_quickvote_fails "ASDFJOFASF", "me", [1,2,3]
   end

+

   def test_cast_quickvote_nonexistent_candidates
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"
     assert_cast_quickvote_fails "TestVote", 42, [123,342314,5342,1,1,2]
   end
   def test_cast_quickvote_nonexistent_candidates
     test_create_quickvote
     election = invoke_delegated :vote, :get_quickvote, "TestVote"
     assert_cast_quickvote_fails "TestVote", 42, [123,342314,5342,1,1,2]
   end

+

   def test_create_mass_quickvote
     10.times do |t|
       election = ElectionStruct.new :name => "test#{t}", :description => "Test Vote", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
       assert_create_quickvote_succeeds election
     end
   end
   def test_create_mass_quickvote
     10.times do |t|
       election = ElectionStruct.new :name => "test#{t}", :description => "Test Vote", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
       assert_create_quickvote_succeeds election
     end
   end

+

   def test_create_quickvote_bad_name
     election = ElectionStruct.new :name => "invalid space", :description => "Test Vote", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
   end
   def test_create_quickvote_bad_name
     election = ElectionStruct.new :name => "invalid space", :description => "Test Vote", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
   end

+

   def test_create_quickvote_nil
     election =  ElectionStruct.new
     assert_create_quickvote_fails election
   end
   def test_create_quickvote_nil
     election =  ElectionStruct.new
     assert_create_quickvote_fails election
   end

+

   def test_create_quickvote_name_nil
     election = ElectionStruct.new :name => "", :description => "Test Vote", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
   end
   def test_create_quickvote_name_nil
     election = ElectionStruct.new :name => "", :description => "Test Vote", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
   end

+

   def test_create_quickvote_description_nil
     election = ElectionStruct.new :name => "foobar", :description => nil, :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
     
   end
   def test_create_quickvote_description_nil
     election = ElectionStruct.new :name => "foobar", :description => nil, :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
     
   end

+  

   def test_create_quickvote_description_whitespace
     election = ElectionStruct.new :name => "foobar", :description => "       ", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
     election = ElectionStruct.new :name => "foobar", :description => "\t\t", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
   end
   def test_create_quickvote_description_whitespace
     election = ElectionStruct.new :name => "foobar", :description => "       ", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
     election = ElectionStruct.new :name => "foobar", :description => "\t\t", :candidate_names => ["Apple", "Orange", "Banana", "Pineapple"]
     assert_create_quickvote_fails election
   end

+  

   def test_create_quickvote_candidates_nil
     election = ElectionStruct.new :name => "foobar", :description => "valid", :candidate_names => nil
     assert_create_quickvote_fails election
   def test_create_quickvote_candidates_nil
     election = ElectionStruct.new :name => "foobar", :description => "valid", :candidate_names => nil
     assert_create_quickvote_fails election


@@ -158,38 +175,46 @@ class SelectricityServiceTest < Test::Unit::TestCase
     assert_equal results.ssd_winners, [candidates["jdong"]]
   end
   private
     assert_equal results.ssd_winners, [candidates["jdong"]]
   end
   private

+

   def assert_cast_quickvote_succeeds(shortname, id, vote)
     assert_nothing_raised do
   def assert_cast_quickvote_succeeds(shortname, id, vote)
     assert_nothing_raised do

-      old_votes = invoke_delegated :vote, :get_quickvote_votes, shortname
-      invoke_delegated :vote, :cast_quickvote, shortname, id, vote
-      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]
+      old_votes = invoke_delegated(:vote, :get_quickvote_votes, shortname)
+      invoke_delegated(:vote, :cast_quickvote, shortname, id, vote)
+
+      new_votes = invoke_delegated(:vote, :get_quickvote_votes, shortname)
+      assert_equal(old_votes.length, new_votes.length - 1)
+
+      reflection = new_votes.find_all { |v| v.voter_session_id == "XMLRPC:#{id}" }
+      assert_not_nil(reflection)
+      assert_equal(reflection.length, 1)
+      assert_equal(reflection[0].vote, vote[0])

     end
   end
     end
   end

+

   def assert_cast_quickvote_fails(shortname, id, vote)
   def assert_cast_quickvote_fails(shortname, id, vote)

-    assert_raise Test::Unit::AssertionFailedError do 
+    assert_raise Test::Unit::AssertionFailedError do

       assert_cast_quickvote_succeeds(shortname, id, vote)
       assert_cast_quickvote_succeeds(shortname, id, vote)

-    end
+     end

   end
   end

+

   def assert_create_quickvote_succeeds(election)
   def assert_create_quickvote_succeeds(election)

-    # Checks if a created quickvote is identical when retrieved
+    # checks if a created quickvote is identical when retrieved

     assert_nothing_raised do
     assert_nothing_raised do

-      old_len=invoke_delegated(:vote,:list_quickvotes).length
-      result = invoke_delegated :vote, :create_quickvote, election
-      assert_equal result, ""
-      reflection = invoke_delegated :vote, :get_quickvote, election.name
-      assert_equal election.description, reflection.description
-      assert_equal 0, election.name.casecmp(reflection.name)
-      assert_equal election.candidate_names, reflection.candidate_names
-      assert_equal(invoke_delegated(:vote,:list_quickvotes).length, old_len+1)
+      old_len = invoke_delegated(:vote, :list_quickvotes).length
+      result = invoke_delegated(:vote, :create_quickvote, election)
+      assert_equal(result, "")
+
+      reflection = invoke_delegated(:vote, :get_quickvote, election.name)
+      assert_equal(election.description, reflection.description)
+      assert_equal(0, election.name.casecmp(reflection.name))
+      assert_equal(election.candidate_names, reflection.candidate_names)
+      assert_equal(invoke_delegated(:vote, :list_quickvotes).length, old_len+1)

     end
   end
     end
   end

+  

   def assert_create_quickvote_fails(election)
     assert_raise Test::Unit::AssertionFailedError do
   def assert_create_quickvote_fails(election)
     assert_raise Test::Unit::AssertionFailedError do

-      assert_create_quickvote_succeeds election
+      assert_create_quickvote_succeeds(election)

     end
   end
 end
     end
   end
 end