[Tail-cvs] Tail/src/test/net/sf/tail/io SerializerTest.java,1.6

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

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

Modified Files:
	SerializerTest.java 
Log Message:


Index: SerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SerializerTest.java	4 Sep 2007 13:09:16 -0000	1.5
--- SerializerTest.java	26 Sep 2007 19:36:22 -0000	1.6
***************
*** 14,18 ****
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
- import net.sf.tail.Walker;
  import net.sf.tail.analysis.Stock;
  import net.sf.tail.analysis.StockAnalysis;
--- 14,17 ----
***************
*** 22,26 ****
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.evaluator.BestStrategyEvaluator;
- import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
  import net.sf.tail.indicator.tracker.EMAIndicator;
--- 21,24 ----
***************
*** 28,37 ****
  import net.sf.tail.indicator.tracker.WilliamsRIndicator;
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
- import net.sf.tail.report.Report;
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
- import net.sf.tail.strategy.JustBuyOnceStrategy;
  
  import org.joda.time.DateTime;
--- 26,33 ----
***************
*** 64,85 ****
  
  	@Test
! 	public void testReportSerializer() {
! 
! 		Walker w = new WalkForward(new BestStrategyEvaluator(runner));
! 
! 		ClosePriceIndicator close = new ClosePriceIndicator(timeSeries);
! 		SMAIndicator sma = new SMAIndicator(close, 8);
! 
! 		Set<Strategy> strategies = new HashSet<Strategy>();
! 		strategies.add(new IndicatorCrossedIndicatorStrategy(close, sma));
! 		strategies.add(new JustBuyOnceStrategy());
! 
! 		Report report = w.walk(strategies, slicer, applyedCriterion);
! 
! 		Serializer<Report> serializer = new Serializer<Report>();
! 		String xml = serializer.toXML(report);
! 		Report reportAfter = serializer.fromXML(xml);
! 
! 		assertEquals(report, reportAfter);
  	}
  
--- 60,70 ----
  
  	@Test
! 	public void testStockSerializer() throws FileNotFoundException, IOException {
! 		Stock stock = new Stock("test", "BaseBovespa/15min/ambv4.csv",new CedroTimeSeriesLoader());
! 		StockSerializer serializer = new StockSerializer();
! 		String serializedStock = serializer.toXML(stock);
! 		Stock newStock = serializer.fromXML(serializedStock);
! 		assertEquals(stock, newStock);
! 		assertEquals(stock.getSeries(), newStock.getSeries());
  	}
  
***************
*** 129,133 ****
  		stockAnalysis.createReport(strategies);
  
! 		Serializer<StockAnalysis> serializer = new Serializer<StockAnalysis>();
  		String xml = serializer.toXML(stockAnalysis);
  
--- 114,118 ----
  		stockAnalysis.createReport(strategies);
  
! 		StockAnalysisSerializer serializer = new StockAnalysisSerializer();
  		String xml = serializer.toXML(stockAnalysis);
  
***************
*** 135,139 ****
  
  		assertEquals(stockAnalysis, afterStockAnalysis);
! 
  	}
  }
--- 120,125 ----
  
  		assertEquals(stockAnalysis, afterStockAnalysis);
! 		assertEquals(stockAnalysis.getStock().getSeries(), afterStockAnalysis.getStock().getSeries());
! 		
  	}
  }