Merge pull request #89 from DoclerLabs/develop

prepare 0.35.0
FrancisBourre · Feb 19, 2018 · d680c28 · d680c28
2 parents e7d82cf + 46310a4
commit d680c28
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -50,6 +50,8 @@ install:
 #hexInject
   - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexInject.git ./hexinject
   - haxelib dev hexinject ./hexinject
+#tink_macro
+  - haxelib install tink_macro 0.16.1
 #hexMVC
   - haxelib dev hexmvc .
   - export DISPLAY=:99.0;

diff --git a/test/hex/control/command/MockCommand.hx b/test/hex/control/command/MockCommand.hx
@@ -8,7 +8,7 @@ import hex.control.payload.ExecutionPayload;
  */
 class MockCommand extends BasicCommand
 {
-	static public var executionCount : UInt;
+	static public var executionCount : UInt = 0;
 
 	public function new()
 	{

diff --git a/test/hex/control/macro/MacroExecutorTest.hx b/test/hex/control/macro/MacroExecutorTest.hx
@@ -82,7 +82,7 @@ class MacroExecutorTest
 		this._macroExecutor.add( MockBasicAsyncCommand );
 		Assert.isFalse( this._macroExecutor.hasRunEveryCommand, "'hasRunEveryCommand' should return false" );
 		this._macroExecutor.executeNextCommand();
-		Timer.delay( MethodRunner.asyncHandler( this._onTestHasRunEveryCommand ), 100 );
+		Timer.delay( MethodRunner.asyncHandler.bind( this._onTestHasRunEveryCommand.bind() ), 100 );
 	}
 
 	@Test( "Test executeNextCommand" )

diff --git a/test/hex/control/macro/MacroTest.hx b/test/hex/control/macro/MacroTest.hx
@@ -226,7 +226,7 @@ class MacroTest
 		myMacro.add( MockCommand );
 
 		Assert.equals( 0, MockCommand.executeCallCount, "'execute' method shoud not been called" );
-		myMacro.addCompleteHandler( MethodRunner.asyncHandler( this._onTestSequenceModeComplete, [ myMacro ] ) );
+		myMacro.addCompleteHandler( function(command) MethodRunner.asyncHandler( this._onTestSequenceModeComplete.bind( command, myMacro ) ) );
 		myMacro.execute();
 		Assert.equals( 0, MockCommand.executeCallCount, "'execute' method should not been called" );
 	} 
@@ -244,7 +244,7 @@ class MacroTest
 		macroExecutor.injector = new MockDependencyInjector();
 		myMacro.macroExecutor = macroExecutor;
 
-		myMacro.addCompleteHandler( MethodRunner.asyncHandler( this._onMacroWithHandlerComplete, [ myMacro ] ) );
+		myMacro.addCompleteHandler( function(command) MethodRunner.asyncHandler( this._onMacroWithHandlerComplete.bind(command, myMacro) ) );
 
 		myMacro.isInSequenceMode = true;
 		myMacro.preExecute();

diff --git a/test/hex/control/trigger/CommandTriggerTest.hx b/test/hex/control/trigger/CommandTriggerTest.hx
@@ -71,7 +71,12 @@ class CommandTriggerTest
 			Assert.isNull( MockCommandClassWithParameters.ignored, 'Last parameter should be ignored' );
 		}
 
-		this._controller.say( "hola mundo", this, "ignore that", new Locator<String, Bool>() ).onComplete( MethodRunner.asyncHandler( f ) );
+		this._controller.say( "hola mundo", this, "ignore that", new Locator<String, Bool>() ).onComplete( 
+			function( message : String ) 
+			{
+				MethodRunner.asyncHandler( f.bind( message ) );
+			} 
+		);
 	}
 
 	@Test( "test controller call without mapping" )
@@ -106,7 +111,12 @@ class CommandTriggerTest
 			Assert.isNull( MockCommandClassWithParameters.ignored, 'Last parameter should be ignored' );
 		}
 
-		controller.say( "hola mundo", this, new Locator<String, Bool>() ).onComplete( MethodRunner.asyncHandler( f ) );
+		controller.say( "hola mundo", this, new Locator<String, Bool>() ).onComplete( 
+			function( message : String ) 
+			{
+				MethodRunner.asyncHandler( f.bind( message ) );
+			} 
+		);
 
 		//doSomething
 		var vos : Array<Dynamic> = [];

diff --git a/test/hex/control/trigger/CommandTriggerUserCaseTest.hx b/test/hex/control/trigger/CommandTriggerUserCaseTest.hx
@@ -45,8 +45,12 @@ class CommandTriggerUserCaseTest
 	{
 		var ageProvider = function() return 46;
 
-		this._controller.getUserVO( ageProvider )
-			.onComplete( MethodRunner.asyncHandler( this._onGetUser ) );
+		this._controller.getUserVO( ageProvider ).onComplete( 
+			function( userVO ) 
+			{
+				MethodRunner.asyncHandler( this._onGetUser.bind( userVO ) );
+			} 
+		);
 	}
 
 	function _onGetUser( userVO : MockUserVO ) : Void
@@ -64,8 +68,12 @@ class CommandTriggerUserCaseTest
 
 		this._injector.mapDependencyToValue( new Dependency<TemperatureService>(), service );
 
-		this._controller.getTemperature( 'Luxembourg' )
-			.onComplete( MethodRunner.asyncHandler( this._onGetTemperature ) );
+		this._controller.getTemperature( 'Luxembourg' ).onComplete( 
+			function( temperature ) 
+			{
+				MethodRunner.asyncHandler( this._onGetTemperature.bind( temperature ) );
+			} 
+		);	
 	}
 
 	function _onGetTemperature( temperature : Int ) : Void

diff --git a/test/hex/control/trigger/MacroCommandTest.hx b/test/hex/control/trigger/MacroCommandTest.hx
@@ -2112,7 +2112,7 @@ class MacroCommandTest
 
 		var userOutcome : MockUserVO;
 		macroCommand.onComplete( function( result ) userOutcome = result );
-		macroCommand.onComplete( MethodRunner.asyncHandler( this._onUserCaseComplete ) );
+		macroCommand.onComplete( function( userVO ) MethodRunner.asyncHandler( this._onUserCaseComplete.bind( userVO ) ) );
 	}
 
 	function _onUserCaseComplete( userVO : MockUserVO ) : Void

diff --git a/test/hex/event/MacroAdapterStrategyTest.hx b/test/hex/event/MacroAdapterStrategyTest.hx
@@ -26,7 +26,7 @@ class MacroAdapterStrategyTest
 		var params : Array<Dynamic> = [ new MockRequest(), "test" ];
 		this._classAdapter.getCallbackAdapter()( params );
 
-		Timer.delay( MethodRunner.asyncHandler( this._onTestEnd ), 100 );
+		Timer.delay( MethodRunner.asyncHandler.bind( this._onTestEnd.bind() ), 100 );
 	}
 
 	function factoryForMacroClass( adapterClass : Class<IAdapterStrategy> ) : IAdapterStrategy