Changeset 209 for liacs/TOOS/assignment1

Timestamp:

Oct 26, 2010, 6:19:27 AM (14 years ago)

Author:

Rick van der Zwet

Message:

Some more usefull tests and debugging

Location:

liacs/TOOS/assignment1

Files:

• build.xml (modified) (2 diffs)
• src/Census.java (modified) (3 diffs)
• src/CensusTest.java (modified) (2 diffs)

liacs/TOOS/assignment1/build.xml

@@ -25 +25 @@
       <mkdir dir="${classes.dir}"/>
       <javac srcdir="${src.dir}" destdir="${classes.dir}" 
-        includeAntRuntime="${javac.includeAntRuntime}" classpathref="classpath">
-
+        includeAntRuntime="${javac.includeAntRuntime}" 
+        classpathref="classpath"
+        debug="true">
         <compilerarg value="-Xlint:unchecked" />
       </javac>
@@ -52 +53 @@
   </target>
 
-  <target name="junit" depends="jar">
+  <target name="junit" depends="clean, jar">
     <mkdir dir="${report.dir}" />
     <junit printsummary="no">

liacs/TOOS/assignment1/src/Census.java

@@ -13 +13 @@
   static Logger logger = Logger.getLogger(Census.class);
   public static void main(String[] args) {
-    BasicConfigurator.configure();
-    
-    Census census = new Census();
-
-    HashSet<Voter> voters = new HashSet<Voter>();
-    voters.add(new Voter(true));
-    voters.add(new Voter(true));
-    Voter duplicate  = new Voter(true);
-    voters.add(duplicate);
-    voters.add(duplicate);
-    //voters.add(new Voter());
-   
-    logger.info(census.census(voters));
   }
   /**
@@ -35 +22 @@
    * @return boolean with conjuction of voters or null on error.
    */
-  public Boolean census(HashSet<Voter> voters) {
+  public static Boolean census(HashSet<Voter> voters) {
+
     /* Nobody likes voting on Tuesday don't they? */
     Calendar rightNow = Calendar.getInstance();
-    if (rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.TUESDAY) {
+    if (rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) {
       return false;
     }
@@ -47 +35 @@
       /* Some vote is not set correctly or of wrong return value */
       if (v.getVote() == null || (!(v.getVote() instanceof Boolean))) { 
-        return false;
+        logger.debug("Invalid type");
+        return null;
       }
 

liacs/TOOS/assignment1/src/CensusTest.java

@@ -1 @@
-package nl.rickvanderzwet.toos.assignment1;
-
 import java.util.Calendar;
 import java.util.HashSet;
@@ -11 +9 @@
 
     public void testEmptyVoteList() {
+      HashSet<Voter> v = null;
       Census c = new Census();
-      assertTrue(c.census(null).equals(null));    
+      assertTrue(c.census(v).equals(null));    
     }
-    
-    public void testNoVote() {
-        fail("An error message");
+
+    public void testAllPositiveVote() {
+      HashSet<Voter> v = new HashSet<Voter>();
+      v.add(new Voter(true));
+      v.add(new Voter(true));
+      v.add(new Voter(true));
+      v.add(new Voter(true));
+
+      Census c = new Census();
+      assertTrue(c.census(v));    
     }
-    
+
+    public void testNegativeVote() {
+      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(true));
+
+      Census c = new Census();
+      assertFalse(c.census(v));    
+    }
 }