[Tail-cvs] Tail/src/test/net/sf/tail/dsl/ruby EMAStrategies3.rb, 1.3 RubyDSLTest.java, 1.3

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

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

Modified Files:
	EMAStrategies3.rb RubyDSLTest.java 
Log Message:


Index: RubyDSLTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/dsl/ruby/RubyDSLTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RubyDSLTest.java	20 Sep 2007 23:11:38 -0000	1.2
--- RubyDSLTest.java	26 Sep 2007 19:36:21 -0000	1.3
***************
*** 2,5 ****
--- 2,6 ----
  
  import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
  
  import java.util.ArrayList;
***************
*** 36,42 ****
  		String text = read("EMAStrategies3.rb");
  		
! 		List<Strategy> defaultStrategies = new ArrayList<Strategy>();
  		for (int i = 1; i <= 50; i++) {
! 			defaultStrategies.add(new IndicatorCrossedIndicatorStrategy(close,new EMAIndicator(close,i)));
  		}
  		
--- 37,43 ----
  		String text = read("EMAStrategies3.rb");
  		
! 		List<String> defaultStrategies = new ArrayList<String>();
  		for (int i = 1; i <= 50; i++) {
! 			defaultStrategies.add(new IndicatorCrossedIndicatorStrategy(close,new EMAIndicator(close,i)).getName());
  		}
  		
***************
*** 44,50 ****
  		Set<Strategy> dslStrategies = dsl.evalStrategies(text);
  
- 		int index = 0;
  		for (Strategy strategy : dslStrategies) {
! 			assertEquals(defaultStrategies.get(index++).getName(), strategy.getName());
  		}
  	}
--- 45,50 ----
  		Set<Strategy> dslStrategies = dsl.evalStrategies(text);
  
  		for (Strategy strategy : dslStrategies) {
! 			assertTrue(defaultStrategies.contains(strategy.getName()));
  		}
  	}

Index: EMAStrategies3.rb
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/dsl/ruby/EMAStrategies3.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EMAStrategies3.rb	20 Sep 2007 23:11:38 -0000	1.2
--- EMAStrategies3.rb	26 Sep 2007 19:36:20 -0000	1.3
***************
*** 1,5 ****
  
  (1..50).collect{|numero| 
! 	cross($close, ema(numero))
  }
  
--- 1,5 ----
  
  (1..50).collect{|numero| 
! 	$strategies.add(cross($close, ema(numero)))
  }