[Tail-cvs] Tail/src/test/net/sf/tail/series PartialMemorizesSlicerTest.java, 1.3

[xanaot <xa...@us...>]

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

Modified Files:
	PartialMemorizesSlicerTest.java 
Log Message:
Arrumando testes do Serializer. Refatoração da classe PartialMemorizedSlicer quando periodsPerSlice menor que 1 e testes da classe

Index: PartialMemorizesSlicerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/PartialMemorizesSlicerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PartialMemorizesSlicerTest.java	5 Oct 2007 20:55:00 -0000	1.2
--- PartialMemorizesSlicerTest.java	8 Oct 2007 19:15:28 -0000	1.3
***************
*** 15,18 ****
--- 15,20 ----
  
  	private DateTime date;
+ 	
+ 	private TimeSeriesSlicer slicer; 
  
  	@Before
***************
*** 20,32 ****
  		this.date = new DateTime(0);
  	}
! 	
  	@Test
! 	public void testApllyForRegularSlicer(){
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
! 		PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, 1);
! 		
  		assertEquals(0, slicer.getSlice(0).getBegin());
  		assertEquals(1, slicer.getSlice(1).getBegin());
--- 22,34 ----
  		this.date = new DateTime(0);
  	}
! 
  	@Test
! 	public void testApllyForRegularSlicer() {
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
! 		slicer = new PartialMemorizedSlicer(series, period, 1);
! 
  		assertEquals(0, slicer.getSlice(0).getBegin());
  		assertEquals(1, slicer.getSlice(1).getBegin());
***************
*** 35,47 ****
  		assertEquals(4, slicer.getSlice(4).getBegin());
  	}
! 	
  	@Test
! 	public void testStartDateBeforeTimeSeriesDate(){
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
! 		PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, date.withYear(1980), 1);
! 		
  		assertEquals(0, slicer.getSlice(0).getBegin());
  		assertEquals(1, slicer.getSlice(1).getBegin());
--- 37,56 ----
  		assertEquals(4, slicer.getSlice(4).getBegin());
  	}
! 
! 	@Test(expected = IllegalArgumentException.class)
! 	public void testPeriodsPerSliceGreaterThan1() {
! 		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
! 				.withYear(2003), date.withYear(2004));
! 		slicer = new PartialMemorizedSlicer(series, new Period().withYears(1), 0);
! 	}
! 
  	@Test
! 	public void testStartDateBeforeTimeSeriesDate() {
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
! 		slicer = new PartialMemorizedSlicer(series, period, date.withYear(1980), 1);
! 
  		assertEquals(0, slicer.getSlice(0).getBegin());
  		assertEquals(1, slicer.getSlice(1).getBegin());
***************
*** 50,104 ****
  		assertEquals(4, slicer.getSlice(4).getBegin());
  	}
  	@Test
! 	public void testApllyForPartialMemorizedSlicer(){
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
! 		PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, 3);
! 		
  		assertEquals(0, slicer.getSlice(0).getBegin());
  		assertEquals(0, slicer.getSlice(0).getEnd());
! 		
  		assertEquals(0, slicer.getSlice(1).getBegin());
  		assertEquals(1, slicer.getSlice(1).getEnd());
! 		
  		assertEquals(0, slicer.getSlice(2).getBegin());
  		assertEquals(2, slicer.getSlice(2).getEnd());
! 		
  		assertEquals(1, slicer.getSlice(3).getBegin());
  		assertEquals(3, slicer.getSlice(3).getEnd());
! 		
  		assertEquals(2, slicer.getSlice(4).getBegin());
  		assertEquals(4, slicer.getSlice(4).getEnd());
  	}
! 	
! 	
  	@Test
! 	public void testApllyForFullMemorizedSlicer(){
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
! 		PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, series.getSize());
! 		
  		assertEquals(0, slicer.getSlice(0).getBegin());
  		assertEquals(0, slicer.getSlice(0).getEnd());
! 		
  		assertEquals(0, slicer.getSlice(1).getBegin());
  		assertEquals(1, slicer.getSlice(1).getEnd());
! 		
  		assertEquals(0, slicer.getSlice(2).getBegin());
  		assertEquals(2, slicer.getSlice(2).getEnd());
! 		
  		assertEquals(0, slicer.getSlice(3).getBegin());
  		assertEquals(3, slicer.getSlice(3).getEnd());
! 		
  		assertEquals(0, slicer.getSlice(4).getBegin());
  		assertEquals(4, slicer.getSlice(4).getEnd());
  	}
! 	
  	@Test
! 	public void testApllyForSeries(){
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
--- 59,113 ----
  		assertEquals(4, slicer.getSlice(4).getBegin());
  	}
+ 
  	@Test
! 	public void testApllyForPartialMemorizedSlicer() {
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
! 		slicer = new PartialMemorizedSlicer(series, period, 3);
! 
  		assertEquals(0, slicer.getSlice(0).getBegin());
  		assertEquals(0, slicer.getSlice(0).getEnd());
! 
  		assertEquals(0, slicer.getSlice(1).getBegin());
  		assertEquals(1, slicer.getSlice(1).getEnd());
! 
  		assertEquals(0, slicer.getSlice(2).getBegin());
  		assertEquals(2, slicer.getSlice(2).getEnd());
! 
  		assertEquals(1, slicer.getSlice(3).getBegin());
  		assertEquals(3, slicer.getSlice(3).getEnd());
! 
  		assertEquals(2, slicer.getSlice(4).getBegin());
  		assertEquals(4, slicer.getSlice(4).getEnd());
  	}
! 
  	@Test
! 	public void testApllyForFullMemorizedSlicer() {
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
  		Period period = new Period().withYears(1);
  
! 		slicer = new PartialMemorizedSlicer(series, period, series.getSize());
! 
  		assertEquals(0, slicer.getSlice(0).getBegin());
  		assertEquals(0, slicer.getSlice(0).getEnd());
! 
  		assertEquals(0, slicer.getSlice(1).getBegin());
  		assertEquals(1, slicer.getSlice(1).getEnd());
! 
  		assertEquals(0, slicer.getSlice(2).getBegin());
  		assertEquals(2, slicer.getSlice(2).getEnd());
! 
  		assertEquals(0, slicer.getSlice(3).getBegin());
  		assertEquals(3, slicer.getSlice(3).getEnd());
! 
  		assertEquals(0, slicer.getSlice(4).getBegin());
  		assertEquals(4, slicer.getSlice(4).getEnd());
  	}
! 
  	@Test
! 	public void testApllyForSeries() {
  		series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date
  				.withYear(2003), date.withYear(2004));
***************
*** 108,114 ****
  
  		TimeSeriesSlicer newSlicer = slicer.applyForSeries(series);
! 		
  		assertEquals(slicer, newSlicer);
! 		
  		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),
--- 117,123 ----
  
  		TimeSeriesSlicer newSlicer = slicer.applyForSeries(series);
! 
  		assertEquals(slicer, newSlicer);
! 
  		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),
***************
*** 145,158 ****
  		assertEquals(0, split.getSlice(0).getBegin());
  		assertEquals(0, split.getSlice(0).getEnd());
! 		
  		assertEquals(0, split.getSlice(1).getBegin());
  		assertEquals(1, split.getSlice(1).getEnd());
! 		
  		assertEquals(0, split.getSlice(2).getBegin());
  		assertEquals(2, split.getSlice(2).getEnd());
! 		
  		assertEquals(1, split.getSlice(3).getBegin());
  		assertEquals(3, split.getSlice(3).getEnd());
! 		
  		assertEquals(2, split.getSlice(4).getBegin());
  		assertEquals(4, split.getSlice(4).getEnd());
--- 154,167 ----
  		assertEquals(0, split.getSlice(0).getBegin());
  		assertEquals(0, split.getSlice(0).getEnd());
! 
  		assertEquals(0, split.getSlice(1).getBegin());
  		assertEquals(1, split.getSlice(1).getEnd());
! 
  		assertEquals(0, split.getSlice(2).getBegin());
  		assertEquals(2, split.getSlice(2).getEnd());
! 
  		assertEquals(1, split.getSlice(3).getBegin());
  		assertEquals(3, split.getSlice(3).getEnd());
! 
  		assertEquals(2, split.getSlice(4).getBegin());
  		assertEquals(4, split.getSlice(4).getEnd());
***************
*** 208,212 ****
  	}
  
- 
  	@Test
  	public void testSplitByYearBeginningInJuly() {
--- 217,220 ----
***************
*** 217,221 ****
  						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 PartialMemorizedSlicer(series, period, 2);
  
--- 225,229 ----
  						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 PartialMemorizedSlicer(series, period, 2);
  
***************
*** 288,293 ****
  
  	}
! 	
! 	
! 	
  }
--- 296,299 ----
  
  	}
! 
  }