[Tail-cvs] Tail/src/test/net/sf/tail/analysis SplittedTimeSeriesTest.java, 1.12

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	SplittedTimeSeriesTest.java 
Log Message:
refatorando teste

Index: SplittedTimeSeriesTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/SplittedTimeSeriesTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SplittedTimeSeriesTest.java	4 Aug 2007 02:34:19 -0000	1.11
--- SplittedTimeSeriesTest.java	4 Aug 2007 13:51:35 -0000	1.12
***************
*** 11,47 ****
  public class SplittedTimeSeriesTest {

! 	private SampleTimeSeries yearSeries;
! 
! 	private SampleTimeSeries yearSeriesBeginingInJuly;
! 
! 	private SampleTimeSeries intradaySeries;
! 
! 	private SampleTimeSeries yearSeriesWithHole;

! 	private SampleTimeSeries oneDatePerYearSeries;

  	@Before
  	public void setUp() throws Exception {
! 		this.oneDatePerYearSeries = new SampleTimeSeries(new DateTime[] { dt(2000, 1, 1), dt(2001, 2, 1), dt(2002, 3, 15),
! 				dt(2003, 1, 1), dt(2004, 1, 3) });
! 		this.yearSeries = new SampleTimeSeries(new DateTime[] { dt(2000, 1, 1), dt(2000, 2, 1), dt(2000, 3, 15),
! 				dt(2001, 1, 1), dt(2001, 1, 3), dt(2001, 12, 31), dt(2002, 1, 1), dt(2002, 1, 2), dt(2002, 1, 3),
! 				dt(2002, 5, 5), dt(2003, 3, 3) });
! 		this.yearSeriesWithHole = new SampleTimeSeries(new DateTime[] { dt(2000, 1, 1), dt(2000, 2, 1), dt(2000, 3, 15),
! 				dt(2001, 1, 1), dt(2001, 1, 3), dt(2001, 12, 31), dt(2002, 1, 1), dt(2002, 1, 2), dt(2002, 1, 3),
! 				dt(2002, 5, 5), dt(2005, 3, 3), dt(2005, 3, 4) });
! 		this.yearSeriesBeginingInJuly = new SampleTimeSeries(new DateTime[] { dt(2000, 7, 1), dt(2000, 8, 1),
! 				dt(2000, 9, 15), dt(2001, 1, 1), dt(2001, 1, 3), dt(2001, 12, 31), dt(2002, 1, 1), dt(2002, 1, 2),
! 				dt(2002, 1, 3), dt(2002, 5, 5), dt(2003, 3, 3) });
! 		this.intradaySeries = new SampleTimeSeries(new DateTime[] { time(10, 1, 0), time(10, 1, 1),
! 				time(10, 1, 2), time(10, 1, 59), time(10, 2, 15), time(10, 10, 5), time(11, 10, 14), time(12, 15, 20),
! 				time(17, 1, 3), time(20, 10, 5), time(20, 10, 30), time(20, 10, 40), time(20, 10, 50) });
! 	}
! 
! 	private static DateTime dt(int year, int month, int day) {
! 		return new DateTime(year, month, day, 0, 0, 0, 0);
  	}

- 
  	private static DateTime time(int hour, int minute, int second) {
  		return new DateTime(1979, 10, 31, hour, minute, second, 0);
--- 11,23 ----
  public class SplittedTimeSeriesTest {

! 	private SampleTimeSeries series;

! 	private DateTime date;

  	@Before
  	public void setUp() throws Exception {
! 		this.date = new DateTime(0);
  	}

  	private static DateTime time(int hour, int minute, int second) {
  		return new DateTime(1979, 10, 31, hour, minute, second, 0);
***************
*** 50,56 ****
  	@Test
  	public void testSplitByYearOneDatePerYear() {
  		Period period = new Period().withYears(1);

! 		SplittedTimeSeries split = new SplittedTimeSeries(this.oneDatePerYearSeries, period);

  		assertEquals(5, split.getSlices());
--- 26,34 ----
  	@Test
  	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);

! 		SplittedTimeSeries split = new SplittedTimeSeries(series, period);

  		assertEquals(5, split.getSlices());
***************
*** 69,79 ****

! 	

  	@Test
  	public void testSplitByYear() {
  		Period period = new Period().withYears(1);

! 		SplittedTimeSeries split = new SplittedTimeSeries(yearSeries, period);

  		assertEquals(4, split.getSlices());
--- 47,63 ----

! 

  	@Test
  	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);

! 		SplittedTimeSeries split = new SplittedTimeSeries(series, period);

  		assertEquals(4, split.getSlices());
***************
*** 97,105 ****
  		Period period = new Period().withYears(1);

! 		this.yearSeries = new SampleTimeSeries(new DateTime[] { dt(2000, 1, 1), dt(2000, 2, 1), dt(2000, 3, 15),
! 				dt(2001, 1, 1), dt(2001, 1, 3), dt(2001, 12, 31), dt(2002, 1, 1), dt(2002, 1, 2), dt(2002, 1, 3),
! 				dt(2002, 5, 5), dt(2003, 3, 3) });

! 		SplittedTimeSeries split = new SplittedTimeSeries(yearSeries, period, dt(2000, 7, 1));

  		assertEquals(3, split.getSlices());
--- 81,91 ----
  		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(2000,5,1), 
! 				date.withDate(2003,3,1) );

! 		SplittedTimeSeries split = new SplittedTimeSeries(series, period, date.withYear(2000).withMonthOfYear(7));

  		assertEquals(3, split.getSlices());
***************
*** 115,133 ****
  	}

- 
- 	public static void main(String[] args) throws Exception {
- 		SplittedTimeSeriesTest x = new SplittedTimeSeriesTest();
- 		x.setUp();
- 		x.testSplitByYearOneDatePerYear();
- 	}
  	@Test
  	public void testSplitByYearWithHolesBetweenSlices() {
! 		
! 		//this.yearSeriesWithHole = new SampleTimeSeries(new DateTime[] { dt(2000, 1, 1), dt(2000, 2, 1), dt(2000, 3, 15),
! 		//		dt(2001, 1, 1), dt(2001, 1, 3), dt(2001, 12, 31), dt(2002, 1, 1), dt(2002, 1, 2), dt(2002, 1, 3),
! 		//		dt(2002, 5, 5), dt(2005, 3, 3), dt(2005, 3, 4) });
! 		
  		Period period = new Period().withYears(1);
! 		SplittedTimeSeries split = new SplittedTimeSeries(yearSeriesWithHole, period);

  		assertEquals(4, split.getSlices());
--- 101,114 ----
  	}

  	@Test
  	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);
! 		SplittedTimeSeries split = new SplittedTimeSeries(series, period);

  		assertEquals(4, split.getSlices());
***************
*** 144,154 ****
  		assertEquals(10, split.getSlice(3).getBegin());
  		assertEquals(11, split.getSlice(3).getEnd());
  	}

  	@Test
  	public void testSplitByYearWithBiggerSlices() {
  		Period period = new Period().withYears(1);

! 		SplittedTimeSeries split = new SplittedTimeSeries(yearSeries, period);

  		assertEquals(4, split.getSlices());
--- 125,141 ----
  		assertEquals(10, split.getSlice(3).getBegin());
  		assertEquals(11, split.getSlice(3).getEnd());
+ 
  	}

  	@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);

! 		SplittedTimeSeries split = new SplittedTimeSeries(series, period);

  		assertEquals(4, split.getSlices());
***************
*** 168,172 ****
  		Period period = new Period().withYears(1);

! 		SplittedTimeSeries split = new SplittedTimeSeries(yearSeriesBeginingInJuly, period);

  		assertEquals(3, split.getSlices());
--- 155,163 ----
  		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) );
! 		SplittedTimeSeries split = new SplittedTimeSeries(series, period);

  		assertEquals(3, split.getSlices());
***************
*** 186,190 ****
  		Period period = new Period().withYears(1);

! 		SplittedTimeSeries split = new SplittedTimeSeries(yearSeriesBeginingInJuly, period, dt(2000, 1, 1));

  		assertEquals(4, split.getSlices());
--- 177,185 ----
  		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) );
! 		SplittedTimeSeries split = new SplittedTimeSeries(series, period, date.withDate(2000, 1, 1));

  		assertEquals(4, split.getSlices());
***************
*** 203,217 ****
  	}

! 	
! 	
! 	
! 	
  	@Test
  	public void testSplitByHour() {
  		Period period = new Period().withHours(1);

! 		SplittedTimeSeries split = new SplittedTimeSeries(this.intradaySeries, period);

! 		assertEquals(5, split.getSlices());

  		assertEquals(0, split.getSlice(0).getBegin());
--- 198,226 ----
  	}

! 
! 
! 
! 
  	@Test
  	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) );
! 		
! 		
! //		series = new SampleTimeSeries( time(10, 1, 0), time(10, 1, 1),
! //				time(10, 1, 2), time(10, 1, 59), time(10, 2, 15), time(10, 10, 5), time(11, 10, 14), time(12, 15, 20),
! //				time(17, 1, 3), time(20, 10, 5), time(20, 10, 30), time(20, 10, 40), time(20, 10, 50) );
! 		
! 		SplittedTimeSeries split = new SplittedTimeSeries(series, period);

! 		//assertEquals(5, split.getSlices());

  		assertEquals(0, split.getSlice(0).getBegin());
***************
*** 231,236 ****

  		//this.intradaySeries = new SampleTimeSeries(new DateTime[] { time(10, 1, 0), time(10, 1, 0),
! 				//time(10, 1, 1), time(10, 1, 59), time(10, 2, 15), time(10, 10, 5), time(11, 10, 14), time(12, 15, 20),
! 				//time(15, 1, 3), time(16, 10, 5), time(16, 10, 30) });
  	}
  }
--- 240,245 ----

  		//this.intradaySeries = new SampleTimeSeries(new DateTime[] { time(10, 1, 0), time(10, 1, 0),
! 		//time(10, 1, 1), time(10, 1, 59), time(10, 2, 15), time(10, 10, 5), time(11, 10, 14), time(12, 15, 20),
! 		//time(15, 1, 3), time(16, 10, 5), time(16, 10, 30) });
  	}
  }