Condorcet methods determine all candidates before tallying, in case of

[rubyvote] / test / condorcet_test.rb

diff --git a/test/condorcet_test.rb b/test/condorcet_test.rb
index 7b49bc66eda4f79f3cb6d2e623e88f145280b488..ea1b19c75c2630c04c10297815923d2bbdbd12d8 100644 (file)
--- a/test/condorcet_test.rb
+++ b/test/condorcet_test.rb
@@ -1,10 +1,10 @@
-#!/usr/bin/ruby
+#!/usr/bin/ruby -Ilib
 
 require 'test/unit'
-require 'election_test_helper'
+require 'rubyvote/election'
+require 'rubyvote/condorcet'
 
 class TestCondorcetVote < Test::Unit::TestCase
-  include ElectionTestHelper
 
   def test_condorcet
     vote_array = Array.new
@@ -12,7 +12,7 @@ class TestCondorcetVote < Test::Unit::TestCase
     3.times {vote_array << "CBA".split("")}
     2.times {vote_array << "BAC".split("")}
 
-    test_winner( ["B"], PureCondorcetVote.new(vote_array).result )
+    assert_equal ["B"], PureCondorcetVote.new(vote_array).result.winners[0]
   end
 
   def test_ssd
@@ -26,7 +26,9 @@ class TestCondorcetVote < Test::Unit::TestCase
     7.times {vote_array << "DCEBA".split("")}
     8.times {vote_array << "EBADC".split("")}
 
-    test_winner( "E", CloneproofSSDVote.new(vote_array).result )
+    assert_equal "E", CloneproofSSDVote.new(vote_array).result.winners[0]
+    assert_equal [['E'], ['A'], ['C'], ['B'], ['D']], 
+                 CloneproofSSDVote.new(vote_array).result.get_full_results
   end
 
   def test_ssd2
@@ -41,7 +43,9 @@ class TestCondorcetVote < Test::Unit::TestCase
     5.times {vote_array << "DBAC".split("")}
     4.times {vote_array << "DCBA".split("")}
 
-    test_winner( "D", CloneproofSSDVote.new(vote_array).result )
+    assert_equal "D", CloneproofSSDVote.new(vote_array).result.winners[0] 
+    assert_equal [['D'], ['A'], ['C'], ['B']], 
+                 CloneproofSSDVote.new(vote_array).result.get_full_results
   end
 
   def test_ssd3
@@ -51,6 +55,35 @@ class TestCondorcetVote < Test::Unit::TestCase
     2.times {vote_array << "DBCA".split("")}
     2.times {vote_array << "CBDA".split("")}
 
-    test_winner("B", CloneproofSSDVote.new(vote_array).result )
+    assert_equal "B", CloneproofSSDVote.new(vote_array).result.winners[0]
+    assert_equal [['B'], ['C'], ['D'], ['A']], 
+                 CloneproofSSDVote.new(vote_array).result.get_full_results
   end
+
+  def test_ssd_incomplete_votes
+    vote_array = Array.new
+    3.times {vote_array << "ABCD".split("")}
+    2.times {vote_array << "DABC".split("")}
+    2.times {vote_array << "DBCA".split("")}
+    4.times {vote_array << ["C"]}
+    2.times {vote_array << "DBC".split("")}
+
+    result = CloneproofSSDVote.new(vote_array).result
+    assert_equal "B", result.winners[0]
+    assert_equal [['B'], ['C'], ['D'], ['A']], result.get_full_results
+  end
+
+  def test_ssd_incomplete_votes_2
+    vote_array = Array.new
+    4.times {vote_array << ["C"]}
+    3.times {vote_array << "ABCD".split("")}
+    2.times {vote_array << "DABC".split("")}
+    2.times {vote_array << "DBCA".split("")}
+    2.times {vote_array << "DBC".split("")}
+
+    result = CloneproofSSDVote.new(vote_array).result
+    assert_equal "B", result.winners[0]
+    assert_equal [['B'], ['C'], ['D'], ['A']], result.get_full_results
+  end
+
 end