[Mocklib-checkins] mocklib3/input/javasrc/biz/xsoftware/examples/timer2 TimerInterfaceImpl.java, NONE, 1.1 SysUnderTest.java, 1.1, 1.2 TimerInterface.java, 1.1, 1.2 TestExample.java, 1.1, 1.2

[Nobody <fas...@us...>]

Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/examples/timer2
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15922/input/javasrc/biz/xsoftware/examples/timer2

Modified Files:
	SysUnderTest.java TimerInterface.java TestExample.java 
Added Files:
	TimerInterfaceImpl.java 
Log Message:
clean up examples.

Index: TimerInterface.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/examples/timer2/TimerInterface.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TimerInterface.java	10 Sep 2006 18:25:57 -0000	1.1
--- TimerInterface.java	11 Sep 2006 00:34:10 -0000	1.2
***************
*** 17,20 ****
--- 17,21 ----
  public interface TimerInterface {
  
+ 	public void cancelTask(TimerTask task);
  	public void cancel();
  	public int purge();

--- NEW FILE: TimerInterfaceImpl.java ---
package biz.xsoftware.examples.timer2;

import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;

public class TimerInterfaceImpl implements TimerInterface {

	private Timer timer;

	public void cancelTask(TimerTask task) {
		task.cancel();
	}
	
	public void cancel() {
		timer.cancel();
	}

	public int purge() {
		return timer.purge();
	}

	public void schedule(TimerTask task, Date firstTime, long period) {
		timer.schedule(task, firstTime, period);
	}

	public void schedule(TimerTask task, Date time) {
		timer.schedule(task, time);
	}

	public void schedule(TimerTask task, long delay, long period) {
		timer.schedule(task, delay, period);
	}

	public void schedule(TimerTask task, long delay) {
		timer.schedule(task, delay);
	}

	public void scheduleAtFixedRate(TimerTask task, Date firstTime, long period) {
		timer.scheduleAtFixedRate(task, firstTime, period);
	}

	public void scheduleAtFixedRate(TimerTask task, long delay, long period) {
		timer.scheduleAtFixedRate(task, delay, period);
	}

}

Index: TestExample.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/examples/timer2/TestExample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestExample.java	10 Sep 2006 18:25:57 -0000	1.1
--- TestExample.java	11 Sep 2006 00:34:10 -0000	1.2
***************
*** 70,73 ****
  	}
  	
! 	
  }
--- 70,88 ----
  	}
  	
! 	public void testCancelOfEvent() {
! 		String title = "some event";
! 		long delay = 50000;
! 		calendar.addEvent(title, delay);
! 		
! 		CalledMethod method = mockTimer.expect("schedule");
! 		//param[0] is a timer task
! 		TimerTask task = (TimerTask)method.getParameter(0);
! 		assertEquals("Should have set the timer for "+delay+" ms", new Long(delay), method.getParameter(1));
! 		
! 		calendar.cancelEvent(title);
! 		
! 		CalledMethod method2 = mockTimer.expect("cancelTask");
! 		TimerTask cancelledTask = (TimerTask)method.getParameter(0);
! 		assertSame(task, cancelledTask);
! 	}
  }

Index: SysUnderTest.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/examples/timer2/SysUnderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SysUnderTest.java	10 Sep 2006 18:25:57 -0000	1.1
--- SysUnderTest.java	11 Sep 2006 00:34:10 -0000	1.2
***************
*** 7,10 ****
--- 7,12 ----
  package biz.xsoftware.examples.timer2;
  
+ import java.util.HashMap;
+ import java.util.Map;
  import java.util.TimerTask;
  
***************
*** 21,24 ****
--- 23,29 ----
  	private TimerInterface timer;
  	private EventListenerList listenerList = new EventListenerList();
+ 	private Map<String, CalendarEvent> titleToEvent = new HashMap<String, CalendarEvent>();
+ 	
+ 	
  	/**
  	 * @showcode
***************
*** 31,36 ****
  	 */
  	public void addEvent(String title, long delay) {
! 		timer.schedule(new CalendarEvent(title), delay);
  	}
  	/**
  	 * @showcode
--- 36,44 ----
  	 */
  	public void addEvent(String title, long delay) {
! 		CalendarEvent evt = new CalendarEvent(title);
! 		titleToEvent.put(title, evt);
! 		timer.schedule(evt, delay);
  	}
+ 	
  	/**
  	 * @showcode
***************
*** 76,78 ****
--- 84,90 ----
  		}		
  	}
+ 	public void cancelEvent(String title) {
+ 		CalendarEvent event = titleToEvent.get(title);
+ 		timer.cancelTask(event);
+ 	}
  }