[duedates-gold commit] r79 - in trunk/src/edu/hawaii/duedates: . library

[codesite...@google.com]

Author: tylerwolff
Date: Mon Nov 17 12:04:32 2008
New Revision: 79

Modified:
trunk/src/edu/hawaii/duedates/DueDates.java
trunk/src/edu/hawaii/duedates/TestDueDateTimer.java
trunk/src/edu/hawaii/duedates/library/HawaiiStateLibrary.java
trunk/src/edu/hawaii/duedates/library/TestHawaiiStateLibrary.java
trunk/src/edu/hawaii/duedates/library/TestUhManoaLibrary.java
trunk/src/edu/hawaii/duedates/library/UhManoaLibrary.java

Log:
Fixed small problems with timer and test cases.

Modified: trunk/src/edu/hawaii/duedates/DueDates.java
==============================================================================
--- trunk/src/edu/hawaii/duedates/DueDates.java (original)
+++ trunk/src/edu/hawaii/duedates/DueDates.java Mon Nov 17 12:04:32 2008
@@ -71,6 +71,7 @@
this.hslParam[0] = -1;
this.hslParam[1] = -1;
this.sort.value = "library";
+ this.wakeup.value = 0;

// Creating parser with Option values
ArgParser parser = new ArgParser("java argparser.DueDates");
@@ -377,12 +378,13 @@
*/
public static void main(String[] params) throws Exception {

- Timer timer = new Timer();
- Calendar date = Calendar.getInstance();
DueDates dueDate = new DueDates(params);
System.out.println("Gathering data from specified libraries...");
dueDate.setItemsDue(dueDate.getItems());
+
if (dueDate.getWakeupValue() > 0) {
+ Timer timer = new Timer();
+ Calendar date = Calendar.getInstance();
//for outputs after the first
DueDateTimer dueDateTimer = new DueDateTimer(dueDate);
timer.scheduleAtFixedRate(dueDateTimer, date.getTime(), (long)
@@ -393,6 +395,6 @@
dueDate.output();
}

- }
+ } // end main

} // end DueDates class

Modified: trunk/src/edu/hawaii/duedates/TestDueDateTimer.java
==============================================================================
--- trunk/src/edu/hawaii/duedates/TestDueDateTimer.java (original)
+++ trunk/src/edu/hawaii/duedates/TestDueDateTimer.java Mon Nov 17 12:04:32
2008
@@ -1,5 +1,6 @@
package edu.hawaii.duedates;

+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import java.util.Calendar;
@@ -28,7 +29,6 @@
String [] params =
{"-uhm", "15516494", "sanchez", "-console", "-wakeup", "1"};

DueDates dueDate = new DueDates(params);
- System.out.println("Gathering data from specified libraries...");
dueDate.setItemsDue(dueDate.getItems());
if (dueDate.getWakeupValue() > 0) {
Timer timer = new Timer();
@@ -59,13 +59,12 @@
params[5] = "0";

DueDates dueDate = new DueDates(params);
- System.out.println("Gathering data from specified libraries...");
dueDate.setItemsDue(dueDate.getItems());
if (dueDate.getWakeupValue() > 0) {
fail("wakeup value has to be greater than zero");
}
else {
- dueDate.output();
+ assertEquals(0.0, dueDate.getWakeupValue(), 0);
}

}

Modified: trunk/src/edu/hawaii/duedates/library/HawaiiStateLibrary.java
==============================================================================
--- trunk/src/edu/hawaii/duedates/library/HawaiiStateLibrary.java (original)
+++ trunk/src/edu/hawaii/duedates/library/HawaiiStateLibrary.java Mon Nov
17 12:04:32 2008
@@ -85,7 +85,7 @@

// If login was unsuccessful
if (conversation == null) {
- return null;
+ return itemsDue;
}

WebResponse response = conversation.getCurrentPage();

Modified: trunk/src/edu/hawaii/duedates/library/TestHawaiiStateLibrary.java
==============================================================================
--- trunk/src/edu/hawaii/duedates/library/TestHawaiiStateLibrary.java
(original)
+++ trunk/src/edu/hawaii/duedates/library/TestHawaiiStateLibrary.java Mon
Nov 17 12:04:32 2008
@@ -2,6 +2,7 @@

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.List;
import org.junit.Test;
import com.meterware.httpunit.WebConversation;
@@ -51,6 +52,6 @@

HawaiiStateLibrary hsl = new HawaiiStateLibrary();
List<ItemDue> hslInfo = hsl.getItemInfo("2323", "2334");
- assertNull("Testing incorrect Login", hslInfo);
+ assertTrue("Testing incorrect Login", hslInfo.isEmpty());
}
}

Modified: trunk/src/edu/hawaii/duedates/library/TestUhManoaLibrary.java
==============================================================================
--- trunk/src/edu/hawaii/duedates/library/TestUhManoaLibrary.java (original)
+++ trunk/src/edu/hawaii/duedates/library/TestUhManoaLibrary.java Mon Nov
17 12:04:32 2008
@@ -90,7 +90,6 @@
UhManoaLibrary uhManoa = new UhManoaLibrary();

List<ItemDue> uhInfo = uhManoa.getItemInfo (uhTestId2, lastTestName2);
- assertNotNull("Testing no items currently checked out.", uhInfo);
assertEquals("Testing number of books out", 2, uhInfo.size());

}

Modified: trunk/src/edu/hawaii/duedates/library/UhManoaLibrary.java
==============================================================================
--- trunk/src/edu/hawaii/duedates/library/UhManoaLibrary.java (original)
+++ trunk/src/edu/hawaii/duedates/library/UhManoaLibrary.java Mon Nov 17
12:04:32 2008
@@ -77,13 +77,15 @@
public List<ItemDue> getItemInfo (String id, String lastName)
throws Exception {

+ List<ItemDue> itemsDue = new ArrayList<ItemDue>();
+
try {

WebConversation conversation = this.login(id, lastName);

// If login was unsuccessful
if (conversation == null) {
- return null;
+ return itemsDue;
}

WebResponse response = conversation.getCurrentPage();
@@ -98,8 +100,7 @@
}

// whiteSpace created to account for all sized book descriptions
- String whiteSpace
= " ";
- List<ItemDue> itemsDue = new ArrayList<ItemDue>();
+ String whiteSpace
= " ";

if (tableOut != null) {
// Checks for table with renew option (No patron blocks)