[Tail-cvs] Tail/src/test/net/sf/tail/analysis StockAnalysisTest.java, 1.12

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

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

Modified Files:
	StockAnalysisTest.java 
Log Message:
Refatoração nos scripts

Index: StockAnalysisTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockAnalysisTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StockAnalysisTest.java	21 Nov 2007 21:55:21 -0000	1.11
--- StockAnalysisTest.java	5 Dec 2007 23:22:46 -0000	1.12
***************
*** 24,27 ****
--- 24,28 ----
  import net.sf.tail.series.RegularSlicer;
  import net.sf.tail.series.SerializableTimeSeries;
+ import net.sf.tail.strategiesSet.JavaStrategiesSet;
  import net.sf.tail.strategy.FakeStrategy;
  
***************
*** 70,74 ****
  
  		walker = new WalkForward(new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
! 		report = walker.walk(strategies, slicer, applyedCriterion);
  		report.setName("");
  		this.stockAnalysis = new StockAnalysis(stock, applyedCriterion, slicer, new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
--- 71,75 ----
  
  		walker = new WalkForward(new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
! 		report = walker.walk(new JavaStrategiesSet( strategies), slicer, applyedCriterion);
  		report.setName("");
  		this.stockAnalysis = new StockAnalysis(stock, applyedCriterion, slicer, new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
***************
*** 77,86 ****
  	@Test
  	public void testCreateReport() {
! 		assertEquals(report, stockAnalysis.addReport("", strategies));
  	}
  
  	@Test
  	public void testAddCriterionAndCriteria() {
! 		stockAnalysis.addReport("", strategies);
  		stockAnalysis.addCriterion(new NumberOfTicksCriterion());
  		assertEquals(1, stockAnalysis.getAdditionalCriteria().size());
--- 78,87 ----
  	@Test
  	public void testCreateReport() {
! 		assertEquals(report, stockAnalysis.addReport("", new JavaStrategiesSet( strategies)));
  	}
  
  	@Test
  	public void testAddCriterionAndCriteria() {
! 		stockAnalysis.addReport("", new JavaStrategiesSet( strategies));
  		stockAnalysis.addCriterion(new NumberOfTicksCriterion());
  		assertEquals(1, stockAnalysis.getAdditionalCriteria().size());
***************
*** 135,139 ****
  		assertFalse((new StockAnalysis(null, applyedCriterion, slicer, new HigherValueEvaluatorFactory(), new HistoryRunnerFactory()).equals(analysis)));
  		
! 		analysis.addReport("Teste", strategies);
  		StockAnalysis analysis2 = new StockAnalysis(stock, applyedCriterion, slicer, new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
  		StockAnalysis analysis3 = new StockAnalysis(null, null, null, null, null);
--- 136,140 ----
  		assertFalse((new StockAnalysis(null, applyedCriterion, slicer, new HigherValueEvaluatorFactory(), new HistoryRunnerFactory()).equals(analysis)));
  		
! 		analysis.addReport("Teste", new JavaStrategiesSet( strategies));
  		StockAnalysis analysis2 = new StockAnalysis(stock, applyedCriterion, slicer, new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
  		StockAnalysis analysis3 = new StockAnalysis(null, null, null, null, null);