[Tail-cvs] Tail/src/test/net/sf/tail/graphics SeriesDatasetTest.java, 1.9

[Thies <tg...@us...>]

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

Modified Files:
	SeriesDatasetTest.java 
Log Message:
Acertado testes

Index: SeriesDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SeriesDatasetTest.java	22 Oct 2007 22:22:32 -0000	1.8
--- SeriesDatasetTest.java	24 Oct 2007 20:51:58 -0000	1.9
***************
*** 3,6 ****
--- 3,7 ----
  import static junit.framework.Assert.assertEquals;
  
+ import java.util.ArrayList;
  import java.util.LinkedList;
  import java.util.List;
***************
*** 13,16 ****
--- 14,18 ----
  import net.sf.tail.Trade;
  import net.sf.tail.sample.SampleIndicator;
+ import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.DefaultTimeSeries;
  
***************
*** 41,44 ****
--- 43,47 ----
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
+ 		
  
  		series = new DefaultTimeSeries(ticks);
***************
*** 46,50 ****
  		trades = new LinkedList<Trade>();
  
! 		indicator1 = new SampleIndicator(new double[] { 2d, 3d, 4d, 5d });
  		indicator2 = new SampleIndicator(new double[] { 5d, 4d, 3d, 2d });
  
--- 49,53 ----
  		trades = new LinkedList<Trade>();
  
! 		indicator1 = new SampleIndicator(new double[] { 2d, 3d, 4d, 5d});
  		indicator2 = new SampleIndicator(new double[] { 5d, 4d, 3d, 2d });
  
***************
*** 97,123 ****
  	@Test
  	public void testMoveRight() {
! 		SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades);
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
! 		indicator1.addValue(15d);
! 		indicator2.addValue(30d);
! 
  		dataset.moveRight(1);
- 		assertEquals(indicators.size() + trades.size(), dataset.getRowCount());
  		assertEquals(series.getSize() - 1, dataset.getColumnCount());
! 		assertEquals(3d, dataset.getValue(1, 1));
  	}
  
  	@Test
  	public void testMoveLeft() {
! 		SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades);
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
! 		indicator1.addValue(15d);
! 		indicator2.addValue(30d);
  
- 		dataset.moveRight(1);
  		dataset.moveLeft(1);
! 		assertEquals(indicators.size() + trades.size(), dataset.getRowCount());
! 		assertEquals(series.getSize() - 1, dataset.getColumnCount());
! 		assertEquals(4d, dataset.getValue(1, 1));
  	}
  }
--- 100,136 ----
  	@Test
  	public void testMoveRight() {
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks = this.ticks;
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
! 		SampleTimeSeries series = new SampleTimeSeries(ticks);
! 		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();
! 		SampleIndicator indicator1 = new SampleIndicator(new double[] { 2d, 3d, 4d, 5d, 14d });
! 		SampleIndicator indicator2 = new SampleIndicator(new double[] { 5d, 4d, 3d, 2d, 15d });
! 		indicators.add(indicator1);
! 		indicators.add(indicator2);
! 		SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades);
! 	
  		dataset.moveRight(1);
  		assertEquals(series.getSize() - 1, dataset.getColumnCount());
! 		assertEquals(3d, dataset.getValue(0, 0));
  	}
  
  	@Test
  	public void testMoveLeft() {
! 		List<Tick> ticks = this.ticks;
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
! 		SampleTimeSeries series = new SampleTimeSeries(ticks);
! 		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();
! 		SampleIndicator indicator1 = new SampleIndicator(new double[] { 2d, 3d, 4d, 5d, 14d });
! 		SampleIndicator indicator2 = new SampleIndicator(new double[] { 5d, 4d, 3d, 2d, 15d });
! 		indicators.add(indicator1);
! 		indicators.add(indicator2);
! 		SeriesDataset dataset = new SeriesDataset(series, indicators, 2, 4, trades);
! 				
  
  		dataset.moveLeft(1);
! 		
! 		assertEquals(series.getSize() - 2, dataset.getColumnCount());
! 		assertEquals(3d, dataset.getValue(0, 0));
  	}
  }