Minor changes for clarity and few tests added

renamed injector to sandboxedInjector in DirectCommandMap for clarity tests payload leakage in commands moves NullCommandTrigger to command center
creynders · Apr 11, 2013 · 44b074e · 44b074e
1 parent 0d686c3
commit 44b074e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/...rectCommandMap/impl/NullCommandTrigger.as → .../commandCenter/impl/NullCommandTrigger.as b/...rectCommandMap/impl/NullCommandTrigger.as → .../commandCenter/impl/NullCommandTrigger.as
@@ -5,7 +5,7 @@
 //  in accordance with the terms of the license agreement accompanying it.
 //------------------------------------------------------------------------------
 
-package robotlegs.bender.extensions.directCommandMap.impl
+package robotlegs.bender.extensions.commandCenter.impl
 {
 	import robotlegs.bender.extensions.commandCenter.api.ICommandTrigger;
 

diff --git a/src/robotlegs/bender/extensions/directCommandMap/impl/DirectCommandMap.as b/src/robotlegs/bender/extensions/directCommandMap/impl/DirectCommandMap.as
@@ -16,6 +16,7 @@ package robotlegs.bender.extensions.directCommandMap.impl
 	import robotlegs.bender.extensions.directCommandMap.api.IDirectCommandMap;
 	import robotlegs.bender.extensions.directCommandMap.dsl.IDirectCommandConfigurator;
 	import robotlegs.bender.framework.api.IContext;
+	import robotlegs.bender.extensions.commandCenter.impl.NullCommandTrigger;
 
 	public class DirectCommandMap implements IDirectCommandMap
 	{
@@ -40,10 +41,10 @@ package robotlegs.bender.extensions.directCommandMap.impl
 		public function DirectCommandMap(context:IContext)
 		{
 			_context = context;
-			var injector:Injector = context.injector.createChildInjector();
-			injector.map(IDirectCommandMap).toValue(this);
+			var sandboxedInjector:Injector = context.injector.createChildInjector();
+			sandboxedInjector.map(IDirectCommandMap).toValue(this);
 			_mappings = new CommandMappingList(new NullCommandTrigger(), context.getLogger(this));
-			_executor = new CommandExecutor(injector.createChildInjector(), _mappings.removeMapping);
+			_executor = new CommandExecutor(sandboxedInjector.createChildInjector(), _mappings.removeMapping);
 		}
 
 		/*============================================================================*/

diff --git a/test/robotlegs/bender/extensions/commandCenter/impl/CommandExecutorTest.as b/test/robotlegs/bender/extensions/commandCenter/impl/CommandExecutorTest.as
@@ -243,6 +243,17 @@ package robotlegs.bender.extensions.commandCenter.impl
 			assertThat(reported, array(null, 0));
 		}
 
+		[Test]
+		public function payload_doesnt_leak_into_class_instantiated_by_command():void
+		{
+			injector.map(Injector).toValue(injector);
+			addMapping(OptionalInjectionPointsCommandInstantiatingCommand);
+
+			const payload:CommandPayload = new CommandPayload(['message', 1], [String, int]);
+			executeCommands(payload);
+			assertThat(reported, array(null, 0));
+		}
+
 		[Test]
 		public function result_is_handled():void
 		{
@@ -293,6 +304,8 @@ package robotlegs.bender.extensions.commandCenter.impl
 	}
 }
 
+import org.swiftsuspenders.Injector;
+
 class ExecutelessCommand
 {
 
@@ -536,3 +549,24 @@ class PayloadInjectionPointsGuard
 		return true;
 	}
 }
+
+class OptionalInjectionPointsCommandInstantiatingCommand
+{
+
+	/*============================================================================*/
+	/* Public Properties                                                          */
+	/*============================================================================*/
+
+	[Inject]
+	public var injector:Injector;
+
+	/*============================================================================*/
+	/* Public Functions                                                           */
+	/*============================================================================*/
+
+	public function execute():void
+	{
+		var command:OptionalInjectionPointsCommand = injector.instantiateUnmapped(OptionalInjectionPointsCommand);
+		command.execute();
+	}
+}