|
From: Márcio V. d. S. <mv...@us...> - 2007-10-05 20:55:00
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22554/src/test/net/sf/tail/series Modified Files: FullyMemorizedSlicerTest.java PartialMemorizesSlicerTest.java Log Message: Index: PartialMemorizesSlicerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/PartialMemorizesSlicerTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PartialMemorizesSlicerTest.java 3 Oct 2007 22:56:47 -0000 1.1 --- PartialMemorizesSlicerTest.java 5 Oct 2007 20:55:00 -0000 1.2 *************** *** 37,40 **** --- 37,54 ---- @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()); + assertEquals(2, slicer.getSlice(2).getBegin()); + assertEquals(3, slicer.getSlice(3).getBegin()); + assertEquals(4, slicer.getSlice(4).getBegin()); + } + @Test public void testApllyForPartialMemorizedSlicer(){ series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date *************** *** 85,90 **** } - //TODO - @Test public void testApllyForSeries(){ --- 99,102 ---- *************** *** 224,228 **** 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 --- 236,240 ---- Period period = new Period().withYears(1); ! series = new SampleTimeSeries(date.withDate(2000, 1, 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 Index: FullyMemorizedSlicerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/FullyMemorizedSlicerTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FullyMemorizedSlicerTest.java 3 Oct 2007 22:56:47 -0000 1.1 --- FullyMemorizedSlicerTest.java 5 Oct 2007 20:55:00 -0000 1.2 *************** *** 182,186 **** 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 --- 182,186 ---- Period period = new Period().withYears(1); ! series = new SampleTimeSeries(date.withDate(2000, 1, 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 *************** *** 239,243 **** 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 --- 239,243 ---- Period period = new Period().withYears(1); ! series = new SampleTimeSeries(date.withDate(2000, 1, 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 |