tail-cvs

[Márcio V. d. S. <mv...@us...>]

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

Modified Files:
	ReportGeneratorTest.java 
Log Message:
refatoração do report

Index: ReportGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportGeneratorTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ReportGeneratorTest.java	8 Aug 2007 18:34:33 -0000	1.10
--- ReportGeneratorTest.java	8 Aug 2007 18:50:42 -0000	1.11
***************
*** 10,13 ****
--- 10,14 ----
  import net.sf.tail.OperationType;
  import net.sf.tail.Trade;
+ import net.sf.tail.analysis.SlicerByTimePeriod;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.evaluator.Decision;
***************
*** 16,19 ****
--- 17,21 ----
  import net.sf.tail.strategy.FakeStrategy;
  
+ import org.joda.time.Period;
  import org.junit.Before;
  import org.junit.Test;
***************
*** 22,29 ****
  
  	private List<Decision> decisions;
  
  	@Before
  	public void setUp() throws Exception {
! 		SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 105, 110, 100, 95, 105 });
  		List<Trade> trades = new ArrayList<Trade>();
  		trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(2, OperationType.SELL)));
--- 24,32 ----
  
  	private List<Decision> decisions;
+ 	private SlicerByTimePeriod slicer;
  
  	@Before
  	public void setUp() throws Exception {
! 		SampleTimeSeries series = new SampleTimeSeries();
  		List<Trade> trades = new ArrayList<Trade>();
  		trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(2, OperationType.SELL)));
***************
*** 34,38 ****
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 
  	}
  	
--- 37,41 ----
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		slicer = new SlicerByTimePeriod(series,new Period().withYears(1));
  	}
  	
***************
*** 40,49 ****
  	public void testSimpleGenerate() throws IOException {
  
! 		Report report = new Report(new TotalProfitCriterion(), null, decisions);
  		StringBuffer html = new ReportGenerator().generate(report);
  		System.out.println(html);
  		
! 		assertTrue(html.toString().contains("1,155"));
! 		assertTrue(html.toString().contains("1,037"));
  	}
  
--- 43,52 ----
  	public void testSimpleGenerate() throws IOException {
  
! 		Report report = new Report(new TotalProfitCriterion(),slicer , decisions);
  		StringBuffer html = new ReportGenerator().generate(report);
  		System.out.println(html);
  		
! 		assertTrue(html.toString().contains("1,456"));
! 		assertTrue(html.toString().contains("4,5"));
  	}