[Tail-cvs] Tail/src/test/net/sf/tail/analysis/criteria AverageProfitCriterionTest.java, 1.4 MaximumDrawDownCriterionTest.java, 1.4 RewardRiskRatioCriterionTest.java, 1.7 TotalProfitCriterionTest.java, 1.4

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

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

Modified Files:
	AverageProfitCriterionTest.java 
	MaximumDrawDownCriterionTest.java 
	RewardRiskRatioCriterionTest.java 
	TotalProfitCriterionTest.java 
Log Message:
Testes do isBetter incluidos.

Index: TotalProfitCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/TotalProfitCriterionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TotalProfitCriterionTest.java	16 Jun 2007 18:20:35 -0000	1.3
--- TotalProfitCriterionTest.java	19 Jul 2007 18:15:19 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  
  import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
  
  import java.util.ArrayList;
***************
*** 58,60 ****
--- 59,81 ----
  	}
  
+ 	@Test
+ 	public void testIsBetter(){
+ 		AnalysisCriterion criterion = new TotalProfitCriterion();
+ 		List<Double> list1 = new ArrayList<Double>();
+ 		List<Double> list2 = new ArrayList<Double>();
+ 		
+ 		list1.add(1.3d);
+ 		list1.add(1.5d);
+ 		list1.add(1.3d);
+ 		list1.add(1.3d);
+ 		list1.add(1.3d);
+ 	
+ 		list2.add(1.4d);
+ 		list2.add(1.2d);
+ 		list2.add(1.3d);
+ 		list2.add(1.4d);
+ 		list2.add(1.3d);
+ 		
+ 		assertTrue(criterion.isBetter(list1, list2));
+ 	}
  }

Index: RewardRiskRatioCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/RewardRiskRatioCriterionTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RewardRiskRatioCriterionTest.java	28 Jun 2007 17:36:46 -0000	1.6
--- RewardRiskRatioCriterionTest.java	19 Jul 2007 18:15:19 -0000	1.7
***************
*** 7,10 ****
--- 7,11 ----
  import java.util.List;
  
+ import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
***************
*** 59,62 ****
--- 60,84 ----
  		
  	}
+ 	
+ 	@Test
+ 	public void testIsBetter(){
+ 		AnalysisCriterion criterion = new RewardRiskRatioCriterion();
+ 		List<Double> list1 = new ArrayList<Double>();
+ 		List<Double> list2 = new ArrayList<Double>();
+ 		
+ 		list1.add(5.1d);
+ 		list1.add(6.2d);
+ 		list1.add(7.3d);
+ 		list1.add(8.4d);
+ 		list1.add(11.5d);
+ 
+ 		list2.add(7.0d);
+ 		list2.add(4.1d);
+ 		list2.add(6.2d);
+ 		list2.add(8.3d);
+ 		list2.add(10.4d);
+ 		
+ 		assertTrue(criterion.isBetter(list1, list2));
+ 	}
  
  }

Index: MaximumDrawDownCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/MaximumDrawDownCriterionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MaximumDrawDownCriterionTest.java	23 Jun 2007 13:18:22 -0000	1.3
--- MaximumDrawDownCriterionTest.java	19 Jul 2007 18:15:19 -0000	1.4
***************
*** 2,10 ****
  
  import static org.junit.Assert.assertEquals;
  
  import java.util.ArrayList;
  import java.util.List;
  
! import junit.framework.JUnit4TestAdapter;
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
--- 2,11 ----
  
  import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
  
  import java.util.ArrayList;
  import java.util.List;
  
! import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
***************
*** 71,76 ****
  	}
  
! 	public static junit.framework.Test suite() {
! 		return new JUnit4TestAdapter(MaximumDrawDownCriterionTest.class);
  	}
  }
--- 72,94 ----
  	}
  
! 	@Test
! 	public void testIsBetter(){
! 		AnalysisCriterion criterion = new MaximumDrawDownCriterion();
! 		List<Double> list1 = new ArrayList<Double>();
! 		List<Double> list2 = new ArrayList<Double>();
! 		
! 		list1.add(5.1d);
! 		list1.add(6.2d);
! 		list1.add(7.3d);
! 		list1.add(8.4d);
! 		list1.add(9.5d);
! 
! 		list2.add(7.0d);
! 		list2.add(4.1d);
! 		list2.add(6.2d);
! 		list2.add(9.3d);
! 		list2.add(10.4d);
! 		
! 		assertTrue(criterion.isBetter(list1, list2));
  	}
  }

Index: AverageProfitCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/AverageProfitCriterionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AverageProfitCriterionTest.java	16 Jun 2007 18:20:35 -0000	1.3
--- AverageProfitCriterionTest.java	19 Jul 2007 18:15:19 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  
  import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
  
  import java.util.ArrayList;
***************
*** 51,54 ****
--- 52,76 ----
  		assertEquals(Double.NaN, averageProfit.calculate(series,trades));
  	}
+ 	
+ 	@Test
+ 	public void testIsBetter(){
+ 		AnalysisCriterion criterion = new AverageProfitCriterion();
+ 		List<Double> list1 = new ArrayList<Double>();
+ 		List<Double> list2 = new ArrayList<Double>();
+ 		
+ 		list1.add(1.4d);
+ 		list1.add(1.2d);
+ 		list1.add(1.3d);
+ 		list1.add(1.4d);
+ 		list1.add(1.3d);
+ 
+ 		list2.add(1.3d);
+ 		list2.add(1.3d);
+ 		list2.add(1.3d);
+ 		list2.add(1.3d);
+ 		list2.add(1.3d);
+ 		
+ 		assertTrue(criterion.isBetter(list1, list2));
+ 	}
  
  }