tail-cvs

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

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

Modified Files:
	Tick.java 
Log Message:
refatoração dos testes

Index: Tick.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/Tick.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Tick.java	17 May 2007 19:58:52 -0000	1.4
--- Tick.java	17 May 2007 20:16:10 -0000	1.5
***************
*** 10,17 ****
  	private double maxPrice;
  	private double minPrice;
! 	private double change;
  	private double previousPrice;
! 	private double volumeAmount;
! 	private double volumeFinancier;
  	private int trades;
  
--- 10,17 ----
  	private double maxPrice;
  	private double minPrice;
! 	private double variation;
  	private double previousPrice;
! 	private double amount;
! 	private double volume;
  	private int trades;
  
***************
*** 22,26 ****
  
  	public Tick(Timestamp data, double openPrice, double closePrice, double maxPrice, double minPrice,
! 			double change,double previousPrice,double volumeAmount,double volumeFinancier,int trades) {
  		super();			
  		this.data = data;
--- 22,26 ----
  
  	public Tick(Timestamp data, double openPrice, double closePrice, double maxPrice, double minPrice,
! 			double variation,double previousPrice,double amount,double volume,int trades) {
  		super();			
  		this.data = data;
***************
*** 29,36 ****
  		this.maxPrice = maxPrice;       
  		this.minPrice = minPrice;     
! 		this.change = change;       
  		this.previousPrice = previousPrice;       
! 		this.volumeAmount = volumeAmount;        
! 		this.volumeFinancier = volumeFinancier;
  		this.trades = trades;
  	}
--- 29,36 ----
  		this.maxPrice = maxPrice;       
  		this.minPrice = minPrice;     
! 		this.variation = variation;       
  		this.previousPrice = previousPrice;       
! 		this.amount = amount;        
! 		this.volume = volume;
  		this.trades = trades;
  	}
***************
*** 64,79 ****
  
  
! 	public double getVolumeAmount() {
! 		return volumeAmount;
  	}
  
  
! 	public double getVolumeFinancier() {
! 		return volumeFinancier;
  	}
  
! 
! 	public double getChange() {
! 		return change;
  	}
  
--- 64,93 ----
  
  
! 	public double getAmount() {
! 		return amount;
  	}
  
  
! 	public double getVolume() {
! 		return volume;
  	}
  
! 	@Override
! 	public boolean equals(Object obj) {
! 		Tick tick = (Tick) obj;
! 		return (variation == tick.getVariation()) && 
! 			   (closePrice == tick.getClosePrice()) && 
! 			   (data.equals(tick.getData())) &&
! 			   (maxPrice == tick.getMaxPrice()) &&
! 			   (minPrice == tick.getMinPrice()) &&
! 			   (openPrice == tick.getOpenPrice()) &&
! 			   (previousPrice == getPreviousPrice()) &&
! 			   (trades == tick.getTrades()) &&
! 			   (amount == tick.getAmount()) &&
! 			   (volume == tick.getVolume());
! 	}
! 	
! 	public double getVariation() {
! 		return variation;
  	}