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

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

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

Modified Files:
	StockAnalysisTest.java StockTest.java 
Log Message:
refatoração gigante! Stock virou TimeSeries

Index: StockAnalysisTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockAnalysisTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StockAnalysisTest.java	8 Oct 2007 19:38:15 -0000	1.7
--- StockAnalysisTest.java	15 Oct 2007 20:23:24 -0000	1.8
***************
*** 31,35 ****
  public class StockAnalysisTest {
  
! 	private Stock stock;
  
  	private TotalProfitCriterion applyedCriterion;
--- 31,35 ----
  public class StockAnalysisTest {
  
! 	private SerializableTimeSeries stock;
  
  	private TotalProfitCriterion applyedCriterion;
***************
*** 49,53 ****
  	@Before
  	public void setUp() throws Exception {
! 		this.stock = new Stock("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
  
  		this.applyedCriterion = new TotalProfitCriterion();
--- 49,53 ----
  	@Before
  	public void setUp() throws Exception {
! 		this.stock = new SerializableTimeSeries("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
  
  		this.applyedCriterion = new TotalProfitCriterion();
***************
*** 79,88 ****
  	@Test
  	public void testCreateReport() {
! 		assertEquals(report, stockAnalysis.createReport("", strategies));
  	}
  
  	@Test
  	public void testAddCriterionAndCriteria() {
! 		stockAnalysis.createReport("", strategies);
  		stockAnalysis.addCriterion(new NumberOfTicksCriterion());
  		assertEquals(1, stockAnalysis.getAdditionalCriteria().size());
--- 79,88 ----
  	@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());

Index: StockTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StockTest.java	26 Sep 2007 19:36:21 -0000	1.4
--- StockTest.java	15 Oct 2007 20:23:24 -0000	1.5
***************
*** 16,25 ****
  public class StockTest {
  
! 	private Stock stock;
  	private DefaultTimeSeries series;
  
  	@Before 
  	public void setUp() throws FileNotFoundException, IOException{
! 		this.stock = new Stock("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
  		this.series = new CedroTimeSeriesLoader().load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "Teste");
  	}
--- 16,25 ----
  public class StockTest {
  
! 	private SerializableTimeSeries stock;
  	private DefaultTimeSeries series;
  
  	@Before 
  	public void setUp() throws FileNotFoundException, IOException{
! 		this.stock = new SerializableTimeSeries("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
  		this.series = new CedroTimeSeriesLoader().load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "Teste");
  	}
***************
*** 44,48 ****
  		StockSerializer serializer = new StockSerializer();
  		String serialized = serializer.toXML(stock);
! 		Stock afterSerializedStock = serializer.fromXML(serialized);
  		assertEquals(stock.getSeries(), afterSerializedStock.reloadSeries());
  		assertEquals(stock.getSeries(), afterSerializedStock.getSeries());
--- 44,48 ----
  		StockSerializer serializer = new StockSerializer();
  		String serialized = serializer.toXML(stock);
! 		SerializableTimeSeries afterSerializedStock = serializer.fromXML(serialized);
  		assertEquals(stock.getSeries(), afterSerializedStock.reloadSeries());
  		assertEquals(stock.getSeries(), afterSerializedStock.getSeries());