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

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

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

Modified Files:
	SplittedTimeSeriesTest.java 
Log Message:
refatoração de código e conserto de alguns testes

Index: SplittedTimeSeriesTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/SplittedTimeSeriesTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SplittedTimeSeriesTest.java	4 Aug 2007 13:51:35 -0000	1.12
--- SplittedTimeSeriesTest.java	4 Aug 2007 17:07:15 -0000	1.13
***************
*** 20,27 ****
  	}
  
- 	private static DateTime time(int hour, int minute, int second) {
- 		return new DateTime(1979, 10, 31, hour, minute, second, 0);
- 	}
- 
  	@Test
  	public void testSplitByYearOneDatePerYear() {
--- 20,23 ----
***************
*** 46,52 ****
  	}
  
- 
- 
- 
  	@Test
  	public void testSplitByYear() {
--- 42,45 ----
***************
*** 84,88 ****
  				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) );
  
--- 77,81 ----
  				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) );
  
***************
*** 198,205 ****
  	}
  
- 
- 
- 
- 
  	@Test
  	public void testSplitByHour() {
--- 191,194 ----
***************
*** 215,226 ****
  				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());
--- 204,210 ----
  				openTime.plusHours(10).plusMinutes(5), openTime.plusHours(10).plusMinutes(10), openTime.plusHours(10).plusMinutes(20), openTime.plusHours(10).plusMinutes(30) );
  		
  		SplittedTimeSeries split = new SplittedTimeSeries(series, period);
  
! 		assertEquals(5, split.getSlices());
  
  		assertEquals(0, split.getSlice(0).getBegin());
***************
*** 237,245 ****
  
  		assertEquals(9, split.getSlice(4).getBegin());
! 		assertEquals(10, split.getSlice(4).getEnd());
  
- 		//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) });
  	}
  }
--- 221,226 ----
  
  		assertEquals(9, split.getSlice(4).getBegin());
! 		assertEquals(12, split.getSlice(4).getEnd());
  
  	}
  }