|
From: Márcio V. d. S. <mv...@us...> - 2007-05-18 01:07:47
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/bollingerbands In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21729/src/test/net/sf/tail/indicator/bollingerbands Modified Files: BollingerBandsUpperIndicatorTest.java BollingerBandsMiddleIndicatorTest.java BollingerBandsLowerIndicatorTest.java Log Message: refatoração de código (control + shift + f) Index: BollingerBandsMiddleIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/bollingerbands/BollingerBandsMiddleIndicatorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BollingerBandsMiddleIndicatorTest.java 17 May 2007 22:42:31 -0000 1.1 --- BollingerBandsMiddleIndicatorTest.java 18 May 2007 01:07:45 -0000 1.2 *************** *** 14,44 **** public class BollingerBandsMiddleIndicatorTest { private TimeSeries data; ! @Before ! public void setUp() throws Exception { data = new SampleTimeSeries(new double[] { 1, 2, 3, 4, 3, 4, 5, 4, 3, 3, 4, 3, 2 }); } ! @Test public void testBollingerBandsMiddleUsingSMA() throws Exception { SMAIndicator sma = new SMAIndicator(new ClosePriceIndicator(data), 3); BollingerBandsMiddleIndicator bbmSMA = new BollingerBandsMiddleIndicator(sma); ! for (int i = 0; i < data.getSize(); i++) { assertEquals(sma.getValue(i), bbmSMA.getValue(i)); } ! } ! @Test(expected = IndexOutOfBoundsException.class) public void testWrongIndex() { SMAIndicator sma = new SMAIndicator(new ClosePriceIndicator(data), 3); BollingerBandsMiddleIndicator bbmSMA = new BollingerBandsMiddleIndicator(sma); ! bbmSMA.getValue(data.getSize()); } ! ! //Método adicionado por causa da compatibilidade do Eclipse 3.1.2(Rede Linux) ! //e o JUnit4 public static junit.framework.Test suite() { return new JUnit4TestAdapter(BollingerBandsMiddleIndicatorTest.class); --- 14,45 ---- public class BollingerBandsMiddleIndicatorTest { private TimeSeries data; ! @Before ! public void setUp() throws Exception { data = new SampleTimeSeries(new double[] { 1, 2, 3, 4, 3, 4, 5, 4, 3, 3, 4, 3, 2 }); } ! @Test public void testBollingerBandsMiddleUsingSMA() throws Exception { SMAIndicator sma = new SMAIndicator(new ClosePriceIndicator(data), 3); BollingerBandsMiddleIndicator bbmSMA = new BollingerBandsMiddleIndicator(sma); ! for (int i = 0; i < data.getSize(); i++) { assertEquals(sma.getValue(i), bbmSMA.getValue(i)); } ! } ! @Test(expected = IndexOutOfBoundsException.class) public void testWrongIndex() { SMAIndicator sma = new SMAIndicator(new ClosePriceIndicator(data), 3); BollingerBandsMiddleIndicator bbmSMA = new BollingerBandsMiddleIndicator(sma); ! bbmSMA.getValue(data.getSize()); } ! ! // Método adicionado por causa da compatibilidade do Eclipse 3.1.2(Rede ! // Linux) ! // e o JUnit4 public static junit.framework.Test suite() { return new JUnit4TestAdapter(BollingerBandsMiddleIndicatorTest.class); Index: BollingerBandsLowerIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/bollingerbands/BollingerBandsLowerIndicatorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BollingerBandsLowerIndicatorTest.java 17 May 2007 22:42:31 -0000 1.1 --- BollingerBandsLowerIndicatorTest.java 18 May 2007 01:07:45 -0000 1.2 *************** *** 17,26 **** private TimeSeries data; ! @Before ! public void setUp() throws Exception { data = new SampleTimeSeries(new double[] { 1, 2, 3, 4, 3, 4, 5, 4, 3, 3, 4, 3, 2 }); } ! @Test public void testBollingerBandsLowerUsingSMAAndStandardDeviation() throws Exception { --- 17,26 ---- private TimeSeries data; ! @Before ! public void setUp() throws Exception { data = new SampleTimeSeries(new double[] { 1, 2, 3, 4, 3, 4, 5, 4, 3, 3, 4, 3, 2 }); } ! @Test public void testBollingerBandsLowerUsingSMAAndStandardDeviation() throws Exception { *************** *** 31,40 **** StandardDeviationIndicator standardDeviation = new StandardDeviationIndicator(closePrice, timeFrame); BollingerBandsLowerIndicator bblSMA = new BollingerBandsLowerIndicator(bbmSMA, standardDeviation); ! for (int i = 0; i < data.getSize(); i++) { assertEquals(sma.getValue(i) - 2 * standardDeviation.getValue(i), bblSMA.getValue(i)); } } ! @Test(expected = IndexOutOfBoundsException.class) public void testWrongIndex() { --- 31,40 ---- StandardDeviationIndicator standardDeviation = new StandardDeviationIndicator(closePrice, timeFrame); BollingerBandsLowerIndicator bblSMA = new BollingerBandsLowerIndicator(bbmSMA, standardDeviation); ! for (int i = 0; i < data.getSize(); i++) { assertEquals(sma.getValue(i) - 2 * standardDeviation.getValue(i), bblSMA.getValue(i)); } } ! @Test(expected = IndexOutOfBoundsException.class) public void testWrongIndex() { *************** *** 45,52 **** StandardDeviationIndicator standardDeviation = new StandardDeviationIndicator(closePrice, timeFrame); BollingerBandsLowerIndicator bblSMA = new BollingerBandsLowerIndicator(bbmSMA, standardDeviation); ! bblSMA.getValue(data.getSize()); } ! public static junit.framework.Test suite() { return new JUnit4TestAdapter(BollingerBandsLowerIndicatorTest.class); --- 45,52 ---- StandardDeviationIndicator standardDeviation = new StandardDeviationIndicator(closePrice, timeFrame); BollingerBandsLowerIndicator bblSMA = new BollingerBandsLowerIndicator(bbmSMA, standardDeviation); ! bblSMA.getValue(data.getSize()); } ! public static junit.framework.Test suite() { return new JUnit4TestAdapter(BollingerBandsLowerIndicatorTest.class); Index: BollingerBandsUpperIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/bollingerbands/BollingerBandsUpperIndicatorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BollingerBandsUpperIndicatorTest.java 17 May 2007 22:42:31 -0000 1.1 --- BollingerBandsUpperIndicatorTest.java 18 May 2007 01:07:45 -0000 1.2 *************** *** 15,26 **** public class BollingerBandsUpperIndicatorTest { ! private TimeSeries data; ! @Before ! public void setUp() throws Exception { data = new SampleTimeSeries(new double[] { 1, 2, 3, 4, 3, 4, 5, 4, 3, 3, 4, 3, 2 }); } ! @Test public void testBollingerBandsUpperUsingSMAAndStandardDeviation() throws Exception { --- 15,26 ---- public class BollingerBandsUpperIndicatorTest { ! private TimeSeries data; ! @Before ! public void setUp() throws Exception { data = new SampleTimeSeries(new double[] { 1, 2, 3, 4, 3, 4, 5, 4, 3, 3, 4, 3, 2 }); } ! @Test public void testBollingerBandsUpperUsingSMAAndStandardDeviation() throws Exception { *************** *** 31,40 **** StandardDeviationIndicator standardDeviation = new StandardDeviationIndicator(closePrice, timeFrame); BollingerBandsUpperIndicator bbuSMA = new BollingerBandsUpperIndicator(bbmSMA, standardDeviation); ! for (int i = 0; i < data.getSize(); i++) { assertEquals(sma.getValue(i) + 2 * standardDeviation.getValue(i), bbuSMA.getValue(i)); } } ! @Test(expected = IndexOutOfBoundsException.class) public void testWrongIndex() { --- 31,40 ---- StandardDeviationIndicator standardDeviation = new StandardDeviationIndicator(closePrice, timeFrame); BollingerBandsUpperIndicator bbuSMA = new BollingerBandsUpperIndicator(bbmSMA, standardDeviation); ! for (int i = 0; i < data.getSize(); i++) { assertEquals(sma.getValue(i) + 2 * standardDeviation.getValue(i), bbuSMA.getValue(i)); } } ! @Test(expected = IndexOutOfBoundsException.class) public void testWrongIndex() { *************** *** 45,55 **** StandardDeviationIndicator standardDeviation = new StandardDeviationIndicator(closePrice, timeFrame); BollingerBandsUpperIndicator bbuSMA = new BollingerBandsUpperIndicator(bbmSMA, standardDeviation); ! bbuSMA.getValue(data.getSize()); } ! public static junit.framework.Test suite() { return new JUnit4TestAdapter(BollingerBandsUpperIndicatorTest.class); } ! } --- 45,55 ---- StandardDeviationIndicator standardDeviation = new StandardDeviationIndicator(closePrice, timeFrame); BollingerBandsUpperIndicator bbuSMA = new BollingerBandsUpperIndicator(bbmSMA, standardDeviation); ! bbuSMA.getValue(data.getSize()); } ! public static junit.framework.Test suite() { return new JUnit4TestAdapter(BollingerBandsUpperIndicatorTest.class); } ! } |