|
From: Márcio V. d. S. <mv...@us...> - 2007-08-04 02:34:19
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30946/src/test/net/sf/tail/graphics Modified Files: ChartTest.java SeriesDatasetTest.java Log Message: mega merge erefatoração de código e correção de testes Index: ChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ChartTest.java 7 Jul 2007 18:45:24 -0000 1.1 --- ChartTest.java 4 Aug 2007 02:34:18 -0000 1.2 *************** *** 111,115 **** indicators.add(sma); ! List<Trade> trades = new HistoryRunner(OperationType.BUY).run(new IndicatorCrossedIndicatorStrategy(sma,close), 0, 100); seriesDataset = new SeriesDataset(timeSeries, indicators,0,seriesEndIndex,trades); --- 111,115 ---- indicators.add(sma); ! List<Trade> trades = new HistoryRunner(OperationType.BUY).run(new IndicatorCrossedIndicatorStrategy(close,sma), 0, 100); seriesDataset = new SeriesDataset(timeSeries, indicators,0,seriesEndIndex,trades); Index: SeriesDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SeriesDatasetTest.java 2 Aug 2007 15:44:47 -0000 1.2 --- SeriesDatasetTest.java 4 Aug 2007 02:34:18 -0000 1.3 *************** *** 1,7 **** package net.sf.tail.graphics; import static junit.framework.Assert.assertEquals; - import java.util.GregorianCalendar; import java.util.LinkedList; import java.util.List; --- 1,7 ---- package net.sf.tail.graphics; + import static junit.framework.Assert.assertEquals; import java.util.LinkedList; import java.util.List; *************** *** 22,77 **** public class SeriesDatasetTest { ! TimeSeries series; ! List<Indicator<? extends Number>> indicators; - List<Trade> trades; - List<Tick> ticks; - private SampleIndicator indicator1; - private SampleIndicator indicator2; ! @Before public void setUp() throws Exception { ticks = new LinkedList<Tick>(); ! ticks.add(new Tick(new DateTime(new GregorianCalendar(2007, 6, 6)), 1d)); ! ticks.add(new Tick(new DateTime(new GregorianCalendar(2007, 6, 7)), 2d)); ! ticks.add(new Tick(new DateTime(new GregorianCalendar(2007, 6, 8)), 3d)); ! ticks.add(new Tick(new DateTime(new GregorianCalendar(2007, 6, 9)), 4d)); ! series = new DefaultTimeSeries(ticks); indicators = new LinkedList<Indicator<? extends Number>>(); trades = new LinkedList<Trade>(); ! ! indicator1 = new SampleIndicator(new double[] { 2d, 3d, 4d, 5d }); ! indicator2 = new SampleIndicator(new double[] { 5d, 4d, 3d, 2d }); ! indicators.add(indicator1); indicators.add(indicator2); ! ! Operation entry = new Operation(0, OperationType.BUY); ! Operation exit = new Operation(1, OperationType.SELL); ! trades.add(new Trade(entry, exit)); ! ! entry = new Operation(2, OperationType.BUY); ! exit = new Operation(3, OperationType.SELL); ! trades.add(new Trade(entry, exit)); } @Test ! public void testDefaultConstructor() { ! SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3); assertEquals(indicators.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); assertEquals(4d, dataset.getValue(1, 1)); } ! @Test ! public void testTradesConstructor() { ! SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades); ! assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); assertEquals(2d, dataset.getValue(3, 1)); --- 22,73 ---- public class SeriesDatasetTest { ! TimeSeries series; List<Indicator<? extends Number>> indicators; List<Trade> trades; List<Tick> ticks; private SampleIndicator indicator1; private SampleIndicator indicator2; ! @Before public void setUp() throws Exception { ticks = new LinkedList<Tick>(); ! ticks.add(new Tick(new DateTime().withDate(2007, 6, 6),1d)); ! ticks.add(new Tick(new DateTime().withDate(2007,6,7),2d)); ! 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); indicators = new LinkedList<Indicator<? extends Number>>(); trades = new LinkedList<Trade>(); ! ! indicator1 = new SampleIndicator(new double[]{2d,3d,4d,5d}); ! indicator2 = new SampleIndicator(new double[]{5d,4d,3d,2d}); ! indicators.add(indicator1); indicators.add(indicator2); ! ! Operation entry = new Operation(0,OperationType.BUY); ! Operation exit = new Operation(1,OperationType.SELL); ! trades.add(new Trade(entry,exit)); ! ! entry = new Operation(2,OperationType.BUY); ! exit = new Operation(3,OperationType.SELL); ! trades.add(new Trade(entry,exit)); } @Test ! public void testDefaultConstructor(){ ! SeriesDataset dataset = new SeriesDataset(series,indicators,0,3); assertEquals(indicators.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); assertEquals(4d, dataset.getValue(1, 1)); } ! @Test ! public void testTradesConstructor(){ ! SeriesDataset dataset = new SeriesDataset(series,indicators,0,3,trades); ! assertEquals(indicators.size()+trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); assertEquals(2d, dataset.getValue(3, 1)); *************** *** 79,86 **** @Test ! public void testMoveRightWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { ! SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades); dataset.moveRight(); ! assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); assertEquals(2d, dataset.getValue(3, 1)); --- 75,82 ---- @Test ! public void testMoveRightWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing(){ ! SeriesDataset dataset = new SeriesDataset(series,indicators,0,3,trades); dataset.moveRight(); ! assertEquals(indicators.size()+trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); assertEquals(2d, dataset.getValue(3, 1)); *************** *** 88,122 **** @Test ! public void testMoveLeftWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { ! SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades); dataset.moveLeft(); ! assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); assertEquals(2d, dataset.getValue(3, 1)); } ! @Test ! public void testMoveRight() { ! SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades); ! ticks.add(new Tick(new DateTime(new GregorianCalendar(2007, 6, 10)), 4d)); indicator1.addValue(15d); indicator2.addValue(30d); ! dataset.moveRight(); ! 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(new GregorianCalendar(2007, 6, 10)), 4d)); indicator1.addValue(15d); indicator2.addValue(30d); ! dataset.moveRight(); dataset.moveLeft(); ! assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize() - 1, dataset.getColumnCount()); assertEquals(4d, dataset.getValue(1, 1)); --- 84,118 ---- @Test ! public void testMoveLeftWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing(){ ! SeriesDataset dataset = new SeriesDataset(series,indicators,0,3,trades); dataset.moveLeft(); ! assertEquals(indicators.size()+trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); assertEquals(2d, dataset.getValue(3, 1)); } ! @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(); ! 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(); dataset.moveLeft(); ! assertEquals(indicators.size()+trades.size(), dataset.getRowCount()); assertEquals(series.getSize() - 1, dataset.getColumnCount()); assertEquals(4d, dataset.getValue(1, 1)); |