Changeset 210 for liacs

Timestamp:

Oct 26, 2010, 6:37:15 AM (14 years ago)

Author:

Rick van der Zwet

Message:

Some more test cases and a working program. Let's go to the University.

Location:

liacs/TOOS/assignment1/src

Files:

• Census.java (modified) (1 diff)
• CensusTest.java (modified) (2 diffs)
• VoterTest.java (added)
• log4j.properties (added)

liacs/TOOS/assignment1/src/Census.java

@@ -22 +22 @@
    * @return boolean with conjuction of voters or null on error.
    */
-  public static Boolean census(HashSet<Voter> voters) {
+  public Boolean census(HashSet<Voter> voters) {
+    logger.debug("Starting new comparison");
 
     /* Nobody likes voting on Tuesday don't they? */
     Calendar rightNow = Calendar.getInstance();
     if (rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) {
+      logger.debug("Sorry not today");
       return false;
+    }
+
+    /* No voters return error as result cannot be conclusive */
+    if (voters == null) {
+      return null;
     }
 
     /* Check all votes to make it a fair voting system */
     for (Voter v: voters) {
-      logger.debug(v.getVote());
       /* Some vote is not set correctly or of wrong return value */
-      if (v.getVote() == null || (!(v.getVote() instanceof Boolean))) { 
-        logger.debug("Invalid type");
+      if (v == null || v.getVote() == null || (!(v.getVote() instanceof Boolean))) { 
         return null;
       }
 
+      logger.debug(v.getVote());
       /* All has to be in agreement */
       if (v.getVote() == false) {

liacs/TOOS/assignment1/src/CensusTest.java

@@ -11 +11 @@
       HashSet<Voter> v = null;
       Census c = new Census();
-      assertTrue(c.census(v).equals(null));    
+      assertNull(c.census(v));    
     }
 
@@ -35 +35 @@
       assertFalse(c.census(v));    
     }
+
+    public void testInvalidVoter() {
+      HashSet<Voter> v = new HashSet<Voter>();
+      v.add(new Voter(true));
+      v.add(new Voter(true));
+      v.add(new Voter(false));
+      v.add(null);
+
+      Census c = new Census();
+      assertNull(c.census(v));    
+    }
+
+    public void testDuplicateVote() {
+      HashSet<Voter> v = new HashSet<Voter>();
+      Voter d = new Voter(true);
+      assertTrue(v.add(d));
+      assertFalse(v.add(d));
+    }
+
+    public void testUnusedVote() {
+      HashSet<Voter> v = new HashSet<Voter>();
+      v.add(new Voter(true));
+      v.add(new Voter(true));
+      v.add(new Voter(false));
+      v.add(new Voter());
+
+      Census c = new Census();
+      assertNull(c.census(v));    
+    }
 }