Merge pull request #27 from DoclerLabs/develop

prepare 0.29.0

.travis.yml

@@ -51,7 +51,7 @@ install:
   - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexInject.git ./hexinject
   - haxelib dev hexinject ./hexinject
 #tink_macro
-  - haxelib install tink_macro 0.14.0
+  - haxelib install tink_macro 0.14.1
 #hexDSL
   - haxelib dev hexdsl .
   - export DISPLAY=:99.0;

haxelib.json

@@ -11,6 +11,6 @@
   "dependencies":
   {
     "hexinject": "git:https://github.com/DoclerLabs/hexInject.git",
-    "tink_macro": "0.14.0"
+    "tink_macro": "0.14.1"
   }
 }

src/hex/compiletime/flow/README.md

@@ -348,18 +348,7 @@ var myString = factory.locate( 'myString' );
 ```haxe
 @context( name = 'applicationContext' )
 {
-	@inject_into(a, b, c) instance = new hex.mock.MockClassWithInjectedProperty();
-}
-```
-</details>
-
-<details>
-<summary>Create an instance using context's injector</summary>
-
-```haxe
-@context( name = 'applicationContext' )
-{
-	@injector_creation instance = new hex.mock.MockClassWithInjectedProperty();
+	@inject_into instance = new hex.mock.MockClassWithInjectedProperty();
 }
 ```
 </details>
@@ -784,4 +773,4 @@ var myString = factory.locate( 'myString' );
 	p2 = new hex.structures.Point( 3, 4 );
 }
 ```
-</details>
+</details>

test/MainDslTest.hx

@@ -1,13 +1,7 @@
 package;
 
+import hex.HexDslSuite;
 import hex.unittest.runner.ExMachinaUnitCore;
-import hex.unittest.notifier.TraceNotifier;
-
-#if js
-import hex.unittest.notifier.ConsoleNotifier;
-#elseif flash
-import flash.Lib;
-#end
 
 /**
  * ...
@@ -20,14 +14,15 @@ class MainDslTest
 		var emu = new ExMachinaUnitCore();
 
 		#if flash
-		emu.addListener( new TraceNotifier( Lib.current.loaderInfo, false, true ) );
-		#elseif js
-		emu.addListener( new ConsoleNotifier( false ) );
+		emu.addListener( new hex.unittest.notifier.TraceNotifier( flash.Lib.current.loaderInfo, false, true ) );
+		#elseif (php && haxe_ver < 4.0)
+		emu.addListener( new hex.unittest.notifier.TraceNotifier( ) );
 		#else
-		emu.addListener( new TraceNotifier( false ) );
+		emu.addListener( new hex.unittest.notifier.ConsoleNotifier( ) );
 		#end
+		emu.addListener( new hex.unittest.notifier.ExitingNotifier( ) );
 
-        emu.addTest( hex.HexDslSuite );
+        emu.addTest( HexDslSuite );
         emu.run();
 	}
-}
+}

test/context/flow/enumArgument.flow

@@ -0,0 +1,6 @@
+@context( name = 'applicationContext' )
+{
+	color = hex.mock.MockColor.Red;
+	colored = new hex.mock.MockColorable( color );
+	colored2 = new hex.mock.MockColorable( hex.mock.MockColor.Red );
+}

test/context/flow/primitives/uint.flow

@@ -1,4 +1,5 @@
 @context( name = 'applicationContext' )
 {
+	@type( 'UInt' )
 	i = 3;
-}
+}

test/context/xml/enumArgument.xml

@@ -0,0 +1,5 @@
+<root name="applicationContext">
+	<model id="colored" type="hex.mock.MockColorable">
+		<argument static-ref="hex.mock.MockColor.Red" />
+	</model>
+</root>

test/hex/compiletime/flow/BasicFlowCompilerTest.hx

@@ -1001,4 +1001,13 @@ class BasicFlowCompilerTest
 		Assert.isInstanceOf( map, MockClass );
 		Assert.equals( this._getCoreFactory().locate( "test" ), map );
 	}
+
+	@Test( "test enum argument" )
+	public function testEnumArgument() : Void
+	{
+		this._applicationAssembler = BasicFlowCompiler.compile( "context/flow/enumArgument.flow" );
+		Assert.equals( hex.mock.MockColor.Red, this._getCoreFactory().locate( "color" ) );
+		Assert.equals( hex.mock.MockColor.Red, this._getCoreFactory().locate( "colored" ).color );
+		Assert.equals( hex.mock.MockColor.Red, this._getCoreFactory().locate( "colored2" ).color );
+	}
 }

test/hex/compiletime/flow/BasicStaticFlowCompilerTest.hx

@@ -1272,5 +1272,16 @@ class BasicStaticFlowCompilerTest
 
 		Assert.equals( mock, code.locator.alias );
 	}
+
+	@Test( "test enum argument" )
+	public function testEnumArgument() : Void
+	{
+		var code = BasicStaticFlowCompiler.compile( this._myApplicationAssembler, "context/flow/enumArgument.flow", "BasicStaticFlowCompiler_testEnumArgument" );
+		code.execute();
+
+		Assert.equals( hex.mock.MockColor.Red, code.locator.color );
+		Assert.equals( hex.mock.MockColor.Red, code.locator.colored.color );
+		Assert.equals( hex.mock.MockColor.Red, code.locator.colored2.color );
+	}
 }
 

test/hex/compiletime/xml/BasicXmlCompilerTest.hx

@@ -21,6 +21,7 @@ import hex.mock.MockClass;
 import hex.mock.MockClassWithGeneric;
 import hex.mock.MockClassWithInjectedProperty;
 import hex.mock.MockClassWithoutArgument;
+import hex.mock.MockColorable;
 import hex.mock.MockContextHolder;
 import hex.mock.MockFruitVO;
 import hex.mock.MockInjectee;
@@ -911,4 +912,12 @@ class BasicXmlCompilerTest
 		Assert.equals( 1, MockTriggerListener.callbackCount );
 		Assert.equals( 'hello world', MockTriggerListener.message );
 	}*/
+
+	@Test( "test enum argument" )
+	public function testEnumArgument() : Void
+	{
+		this._applicationAssembler = BasicXmlCompiler.compile( "context/xml/enumArgument.xml" );
+		var colored : MockColorable = cast this._locate( "colored" );
+		Assert.equals( hex.mock.MockColor.Red, colored.color );
+	}
 }

test/hex/mock/MockColor.hx

@@ -0,0 +1,11 @@
+package hex.mock;
+
+/**
+ * @author Francis Bourre
+ */
+enum MockColor 
+{
+	Red;
+	Green;
+	Blue;
+}

test/hex/mock/MockColorable.hx

@@ -0,0 +1,17 @@
+package hex.mock;
+
+import hex.mock.MockColor;
+
+/**
+ * ...
+ * @author Francis Bourre
+ */
+class MockColorable 
+{
+	public var color : MockColor;
+
+	public function new( color : MockColor ) 
+	{
+		this.color = color;
+	}
+}