[Tail-cvs] Tail/src/test/net/sf/tail/series SlicerByTimePeriodTest.java, 1.2

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13475/src/test/net/sf/tail/series

Modified Files:
	SlicerByTimePeriodTest.java 
Log Message:


Index: SlicerByTimePeriodTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/SlicerByTimePeriodTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SlicerByTimePeriodTest.java	20 Aug 2007 18:15:30 -0000	1.1
--- SlicerByTimePeriodTest.java	23 Aug 2007 12:51:11 -0000	1.2
***************
*** 26,30 ****
  	public void testSplitByYearOneDatePerYear() {
  
! 		series = new SampleTimeSeries(date.withYear(2000),date.withYear(2001), date.withYear(2002),date.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
--- 26,31 ----
  	public void testSplitByYearOneDatePerYear() {
  
! 		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
! 				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
***************
*** 48,55 ****
  	public void testSplitByYear() {
  
! 		series = new SampleTimeSeries( date.withYear(2000), date.withYear(2000), date.withYear(2000),
! 				date.withYear(2001), date.withYear(2001), date.withYear(2001), 
! 				date.withYear(2002), date.withYear(2002), date.withYear(2002),date.withYear(2002), 
! 				date.withYear(2003) );
  
  		Period period = new Period().withYears(1);
--- 49,55 ----
  	public void testSplitByYear() {
  
! 		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2000), date.withYear(2000), date
! 				.withYear(2001), date.withYear(2001), date.withYear(2001), date.withYear(2002), date.withYear(2002),
! 				date.withYear(2002), date.withYear(2002), date.withYear(2003));
  
  		Period period = new Period().withYears(1);
***************
*** 72,87 ****
  	}
  
- 
  	@Test
  	public void testSplitByYearForcingJuly() {
  		Period period = new Period().withYears(1);
  
! 		series = new SampleTimeSeries(
! 				date.withDate(2000,1,1), date.withDate(2000,2,1), date.withDate(2000,3,1),
! 				date.withDate(2001,1,1), date.withDate(2001,2,1), date.withDate(2001,12,12),
! 				date.withDate(2002,1,1), date.withDate(2002,2,1), date.withDate(2002,3,1),	date.withDate(2002,5,1), 
! 				date.withDate(2003,3,1) );
  
! 		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withYear(2000).withMonthOfYear(7), SlicerType.REGULAR);
  
  		assertEquals(3, split.getSlices());
--- 72,86 ----
  	}
  
  	@Test
  	public void testSplitByYearForcingJuly() {
  		Period period = new Period().withYears(1);
  
! 		series = new SampleTimeSeries(date.withDate(2000, 1, 1), date.withDate(2000, 2, 1), date.withDate(2000, 3, 1),
! 				date.withDate(2001, 1, 1), date.withDate(2001, 2, 1), date.withDate(2001, 12, 12), date.withDate(2002,
! 						1, 1), date.withDate(2002, 2, 1), date.withDate(2002, 3, 1), date.withDate(2002, 5, 1), date
! 						.withDate(2003, 3, 1));
  
! 		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withYear(2000).withMonthOfYear(7),
! 				SlicerType.REGULAR);
  
  		assertEquals(3, split.getSlices());
***************
*** 100,107 ****
  	public void testSplitByYearWithHolesBetweenSlices() {
  
! 		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2000), date.withYear(2000),
! 				date.withYear(2001), date.withYear(2001), date.withYear(2001), 
! 				date.withYear(2002), date.withYear(2002), date.withYear(2002), date.withYear(2002), 
! 				date.withYear(2005), date.withYear(2005));
  
  		Period period = new Period().withYears(1);
--- 99,105 ----
  	public void testSplitByYearWithHolesBetweenSlices() {
  
! 		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2000), date.withYear(2000), date
! 				.withYear(2001), date.withYear(2001), date.withYear(2001), date.withYear(2002), date.withYear(2002),
! 				date.withYear(2002), date.withYear(2002), date.withYear(2005), date.withYear(2005));
  
  		Period period = new Period().withYears(1);
***************
*** 126,134 ****
  	@Test
  	public void testSplitByYearWithBiggerSlices() {
! 		
! 		series = new SampleTimeSeries( date.withDate(2000, 1, 1), date.withDate(2000, 2, 1), date.withDate(2000, 3, 15),
! 				date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), 
! 				date.withDate(2002, 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), 
! 				date.withDate(2003, 3, 3) );
  		Period period = new Period().withYears(1);
  
--- 124,132 ----
  	@Test
  	public void testSplitByYearWithBiggerSlices() {
! 
! 		series = new SampleTimeSeries(date.withDate(2000, 1, 1), date.withDate(2000, 2, 1), date.withDate(2000, 3, 15),
! 				date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002,
! 						1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date
! 						.withDate(2003, 3, 3));
  		Period period = new Period().withYears(1);
  
***************
*** 151,158 ****
  		Period period = new Period().withYears(1);
  
! 		series = new SampleTimeSeries( 
! 				date.withDate(2000, 7, 1), date.withDate(2000, 8, 1),date.withDate(2000, 9, 15), date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), 
! 				date.withDate(2001, 12, 31), date.withDate(2002, 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), 
! 				date.withDate(2003, 3, 3) );
  		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR);
  
--- 149,156 ----
  		Period period = new Period().withYears(1);
  
! 		series = new SampleTimeSeries(date.withDate(2000, 7, 1), date.withDate(2000, 8, 1), date.withDate(2000, 9, 15),
! 				date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002,
! 						1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date
! 						.withDate(2003, 3, 3));
  		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR);
  
***************
*** 173,180 ****
  		Period period = new Period().withYears(1);
  
! 		series = new SampleTimeSeries( 
! 				date.withDate(2000, 7, 1), date.withDate(2000, 8, 1),date.withDate(2000, 9, 15), date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), 
! 				date.withDate(2001, 12, 31), date.withDate(2002, 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), 
! 				date.withDate(2003, 3, 3) );
  		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withDate(2000, 1, 1), SlicerType.REGULAR);
  
--- 171,178 ----
  		Period period = new Period().withYears(1);
  
! 		series = new SampleTimeSeries(date.withDate(2000, 7, 1), date.withDate(2000, 8, 1), date.withDate(2000, 9, 15),
! 				date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002,
! 						1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date
! 						.withDate(2003, 3, 3));
  		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withDate(2000, 1, 1), SlicerType.REGULAR);
  
***************
*** 197,210 ****
  	public void testSplitByHour() {
  		Period period = new Period().withHours(1);
! 		
  		DateTime openTime = new DateTime(0).withTime(10, 0, 0, 0);
  
! 		series = new SampleTimeSeries( 
! 				openTime, openTime.plusMinutes(1) ,	openTime.plusMinutes(2), openTime.plusMinutes(10), openTime.plusMinutes(15), openTime.plusMinutes(25), 
! 				openTime.plusHours(1), 
! 				openTime.plusHours(2),
! 				openTime.plusHours(7), 
! 				openTime.plusHours(10).plusMinutes(5), openTime.plusHours(10).plusMinutes(10), openTime.plusHours(10).plusMinutes(20), openTime.plusHours(10).plusMinutes(30) );
! 		
  		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR);
  
--- 195,206 ----
  	public void testSplitByHour() {
  		Period period = new Period().withHours(1);
! 
  		DateTime openTime = new DateTime(0).withTime(10, 0, 0, 0);
  
! 		series = new SampleTimeSeries(openTime, openTime.plusMinutes(1), openTime.plusMinutes(2), openTime
! 				.plusMinutes(10), openTime.plusMinutes(15), openTime.plusMinutes(25), openTime.plusHours(1), openTime
! 				.plusHours(2), openTime.plusHours(7), openTime.plusHours(10).plusMinutes(5), openTime.plusHours(10)
! 				.plusMinutes(10), openTime.plusHours(10).plusMinutes(20), openTime.plusHours(10).plusMinutes(30));
! 
  		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR);
  
***************
*** 227,240 ****
  
  	}
! 	
  	@Test
! 	public void testMemorizedSlicer()
! 	{
  		Period period = new Period().withYears(1);
  
! 		series = new SampleTimeSeries( 
! 				date.withDate(2000, 7, 1), date.withDate(2000, 8, 1),date.withDate(2000, 9, 15), date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), 
! 				date.withDate(2001, 12, 31), date.withDate(2002, 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), 
! 				date.withDate(2003, 3, 3) );
  		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withDate(2000, 1, 1), SlicerType.MEMORIZED);
  
--- 223,235 ----
  
  	}
! 
  	@Test
! 	public void testMemorizedSlicer() {
  		Period period = new Period().withYears(1);
  
! 		series = new SampleTimeSeries(date.withDate(2000, 7, 1), date.withDate(2000, 8, 1), date.withDate(2000, 9, 15),
! 				date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002,
! 						1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date
! 						.withDate(2003, 3, 3));
  		TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withDate(2000, 1, 1), SlicerType.MEMORIZED);
  
***************
*** 251,257 ****
  
  		assertEquals(0, split.getSlice(3).getBegin());
! 		assertEquals(10, split.getSlice(3).getEnd());	
  	}
! 	
! 	
  }
--- 246,251 ----
  
  		assertEquals(0, split.getSlice(3).getBegin());
! 		assertEquals(10, split.getSlice(3).getEnd());
  	}
! 
  }