diff --git a/build/lib/dust.rb b/build/lib/dust.rb index f5eeb95..c577c71 100644 --- a/build/lib/dust.rb +++ b/build/lib/dust.rb @@ -34,8 +34,14 @@ def make(target) nme.make 'flash' when 'html5' haxe.html5 - when 'ios' + when 'iphone' nme.make 'ios' + when 'iphone_simulator' + nme.make 'ios', '-simulator' + when 'ipad' + nme.make 'ios', '-ipad' + when 'ipad_simulator' + nme.make 'ios', '-ipad -simulator' else puts "dust unable to make #{target} - unsupported target" end @@ -47,8 +53,8 @@ def run(target) nme.run 'flash' when 'html5' puts 'TODO running html5 target not implemented yet!' - when 'ios' - nme.run 'ios' + when 'ipad' + nme.run 'ios', '-ipad' when 'iphone_simulator' nme.run 'ios', '-simulator' when 'ipad_simulator' diff --git a/build/lib/nme.rb b/build/lib/nme.rb index 3854336..440a4a7 100644 --- a/build/lib/nme.rb +++ b/build/lib/nme.rb @@ -17,13 +17,14 @@ def attributes_hash(attributes) hash end - def make(target) + def make(target, flags = nil) @target = target write_nmml + test target, flags end def test(target, flags) - command = "nme test #{target}.nmml #{target} #{flags}" + command = "nme build #{target}.nmml #{target} #{flags.nil? ? '' : flags}" execute command end diff --git a/rakefile.rb b/rakefile.rb index 26f2a44..4dd8f5d 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -20,8 +20,7 @@ task :all => [:build, :clients] task :clients do - puts dust.test %w(as3 js) - #puts munit.test %w(as3 js cpp) + puts dust.test %w(as3 js) #%w(as3 js cpp) end task :as3 do @@ -57,8 +56,20 @@ dust.make 'html5' end - task :ios do - dust.make 'ios' + task :iphone do + dust.make 'iphone' + end + + task :iphone_simulator do + dust.make 'iphone_simulator' + end + + task :ipad do + dust.make 'ipad' + end + + task :ipad_simulator do + dust.make 'ipad_simulator' end end @@ -73,15 +84,19 @@ end - task :ios => :'make:ios' do - dust.run 'ios-simulator' + task :iphone => :'make:iphone' do + dust.run 'ipad' end - task :iphone_simulator => :'make:ios' do + task :iphone_simulator => :'make:iphone_simulator' do dust.run 'iphone_simulator' end - task :ipad_simulator => :'make:ios' do + task :ipad => :'make:ipad' do + dust.run 'ipad' + end + + task :ipad_simulator => :'make:ipad_simulator' do dust.run 'ipad_simulator' end diff --git a/src/dust/app/AppConfig.hx b/src/dust/app/AppConfig.hx new file mode 100644 index 0000000..2f5827d --- /dev/null +++ b/src/dust/app/AppConfig.hx @@ -0,0 +1,37 @@ +package dust.app; + +import nme.Vector; +import nme.ui.Multitouch; +import dust.app.data.AppData; +import minject.Injector; +import dust.context.Config; + +class AppConfig implements Config +{ + @inject public var injector:Injector; + + public function configure() + injector.mapValue(AppData, makeApp()) + + function makeApp():AppData + { + var app = new AppData(); + app.deviceWidth = Std.int(nme.system.Capabilities.screenResolutionX); + app.deviceHeight = Std.int(nme.system.Capabilities.screenResolutionY); + app.isMultiTouch = nme.ui.Multitouch.supportsTouchEvents; + app.hasGestures = nme.ui.Multitouch.supportsGestureEvents; + app.supportedGestures = toArray(nme.ui.Multitouch.supportedGestures); + return app; + } + + function toArray(list:Vector):Array + { + var output = new Array(); + if (list == null) + return output; + + for (item in list) + output.push(item); + return output; + } +} diff --git a/src/dust/app/data/AppData.hx b/src/dust/app/data/AppData.hx new file mode 100644 index 0000000..be6075c --- /dev/null +++ b/src/dust/app/data/AppData.hx @@ -0,0 +1,12 @@ +package dust.app.data; + +class AppData +{ + public var deviceWidth:Int; + public var deviceHeight:Int; + public var isMultiTouch:Bool; + public var hasGestures:Bool; + public var supportedGestures:Array; + + public function new() {} +} diff --git a/src/dust/camera/CameraConfig.hx b/src/dust/camera/CameraConfig.hx index 16ca719..b443b43 100644 --- a/src/dust/camera/CameraConfig.hx +++ b/src/dust/camera/CameraConfig.hx @@ -1,5 +1,7 @@ package dust.camera; +import dust.app.data.AppData; +import dust.app.AppConfig; import dust.collections.CollectionsConfig; import dust.camera.config.CameraDecorator; import dust.entities.EntitiesConfig; @@ -13,6 +15,7 @@ import minject.Injector; class CameraConfig implements DependentConfig { @inject public var injector:Injector; + @inject public var app:AppData; @inject public var entities:Entities; var screenCenterX:Int; @@ -20,7 +23,7 @@ class CameraConfig implements DependentConfig var camera:Camera; public function dependencies():Array> - return [CollectionsConfig] + return [AppConfig, CollectionsConfig] public function configure() { @@ -35,8 +38,8 @@ class CameraConfig implements DependentConfig function makeCamera():Camera { var stage = nme.Lib.current.stage; - screenCenterX = Std.int(stage.stageWidth * 0.5); - screenCenterY = Std.int(stage.stageHeight * 0.5); + screenCenterX = Std.int(app.deviceWidth * 0.5); + screenCenterY = Std.int(app.deviceHeight * 0.5); return new Camera(screenCenterX, screenCenterY); } diff --git a/src/dust/app/CommandMapConfig.hx b/src/dust/commands/CommandMapConfig.hx similarity index 86% rename from src/dust/app/CommandMapConfig.hx rename to src/dust/commands/CommandMapConfig.hx index 17664a1..18a7a33 100644 --- a/src/dust/app/CommandMapConfig.hx +++ b/src/dust/commands/CommandMapConfig.hx @@ -1,5 +1,6 @@ -package dust.app; +package dust.commands; +import dust.signals.SignalMapConfig; import dust.context.DependentConfig; import dust.commands.CommandMap; import minject.Injector; diff --git a/src/dust/console/ConsoleConfig.hx b/src/dust/console/ConsoleConfig.hx index 1c97e58..5556462 100644 --- a/src/dust/console/ConsoleConfig.hx +++ b/src/dust/console/ConsoleConfig.hx @@ -1,7 +1,8 @@ package dust.console; -import dust.app.CommandMapConfig; -import dust.app.SignalMapConfig; +import dust.app.AppConfig; +import dust.commands.CommandMapConfig; +import dust.signals.SignalMapConfig; import dust.commands.CommandMap; import dust.context.Context; import dust.console.control.MapConsoleMethodsCommand; @@ -10,8 +11,8 @@ import dust.console.ui.ConsoleFormat; import dust.console.ui.ConsoleOutput; import dust.console.ui.ConsoleInput; import dust.console.control.DefaultConsoleListeners; -import dust.console.control.HideConfigSignal; -import dust.console.control.ShowConfigSignal; +import dust.console.control.HideConsoleSignal; +import dust.console.control.ShowConsoleSignal; import dust.console.impl.Console; import dust.console.impl.ConsoleMap; import dust.context.DependentConfig; @@ -40,7 +41,7 @@ class ConsoleConfig implements DependentConfig, implements UnconfigConfig var listeners:DefaultConsoleListeners; public function dependencies():Array> - return [SignalMapConfig, CommandMapConfig] + return [AppConfig, SignalMapConfig, CommandMapConfig] public function configure() { @@ -64,8 +65,8 @@ class ConsoleConfig implements DependentConfig, implements UnconfigConfig function mapSignals() { console = injector.getInstance(Console); - signalMap.mapVoid(ShowConfigSignal, console.enable); - signalMap.mapVoid(HideConfigSignal, console.disable); + signalMap.mapVoid(ShowConsoleSignal, console.enable); + signalMap.mapVoid(HideConsoleSignal, console.disable); } function mapCommands() @@ -89,8 +90,8 @@ class ConsoleConfig implements DependentConfig, implements UnconfigConfig console.disable(); listeners.disable(); - signalMap.unmapVoid(ShowConfigSignal, console.enable); - signalMap.unmapVoid(HideConfigSignal, console.disable); + signalMap.unmapVoid(ShowConsoleSignal, console.enable); + signalMap.unmapVoid(HideConsoleSignal, console.disable); injector.unmap(ConsoleMap); injector.unmap(Console); } diff --git a/src/dust/console/control/HideConfigSignal.hx b/src/dust/console/control/HideConsoleSignal.hx similarity index 58% rename from src/dust/console/control/HideConfigSignal.hx rename to src/dust/console/control/HideConsoleSignal.hx index fb9fa84..94c2004 100644 --- a/src/dust/console/control/HideConfigSignal.hx +++ b/src/dust/console/control/HideConsoleSignal.hx @@ -2,4 +2,4 @@ package dust.console.control; import dust.signals.SignalVoid; -class HideConfigSignal extends SignalVoid {} \ No newline at end of file +class HideConsoleSignal extends SignalVoid {} \ No newline at end of file diff --git a/src/dust/console/control/ShowConfigSignal.hx b/src/dust/console/control/ShowConsoleSignal.hx similarity index 58% rename from src/dust/console/control/ShowConfigSignal.hx rename to src/dust/console/control/ShowConsoleSignal.hx index 98138c1..d8562e9 100644 --- a/src/dust/console/control/ShowConfigSignal.hx +++ b/src/dust/console/control/ShowConsoleSignal.hx @@ -2,4 +2,4 @@ package dust.console.control; import dust.signals.SignalVoid; -class ShowConfigSignal extends SignalVoid {} \ No newline at end of file +class ShowConsoleSignal extends SignalVoid {} \ No newline at end of file diff --git a/src/dust/console/ui/ConsoleInput.hx b/src/dust/console/ui/ConsoleInput.hx index 1d89049..a2037e0 100644 --- a/src/dust/console/ui/ConsoleInput.hx +++ b/src/dust/console/ui/ConsoleInput.hx @@ -1,5 +1,6 @@ package dust.console.ui; +import dust.app.data.AppData; import nme.display.BlendMode; import dust.signals.Signal; @@ -17,22 +18,19 @@ class ConsoleInput extends Sprite var input:TextField; @inject - public function new(format:ConsoleFormat) + public function new(app:AppData, format:ConsoleFormat) { super(); this.format = format; - this.input = makeInput(); + this.input = makeInput(app); command = new Signal(); } - function makeInput() + function makeInput(app:AppData) { - var width = nme.Lib.current.stage.stageWidth; - var height = nme.Lib.current.stage.stageHeight; - var input = new TextField(); - input.y = height - 20; - input.width = width; + input.y = app.deviceHeight - 20; + input.width = app.deviceWidth; input.height = 20; input.background = true; input.backgroundColor = 0x006600; diff --git a/src/dust/console/ui/ConsoleOutput.hx b/src/dust/console/ui/ConsoleOutput.hx index 3d6a122..d7e1984 100644 --- a/src/dust/console/ui/ConsoleOutput.hx +++ b/src/dust/console/ui/ConsoleOutput.hx @@ -1,5 +1,6 @@ package dust.console.ui; +import dust.app.data.AppData; import nme.display.Shape; import nme.display.Sprite; import nme.display.BlendMode; @@ -17,37 +18,31 @@ class ConsoleOutput extends Sprite var previous:Int; @inject - public function new(format:ConsoleFormat) + public function new(app:AppData, format:ConsoleFormat) { super(); this.lines = new Array(); this.format = format; - this.background = makeBackground(); - this.textfield = makeTextfield(); + this.background = makeBackground(app); + this.textfield = makeTextfield(app); this.previous = 0; } - function makeBackground():Shape + function makeBackground(app:AppData):Shape { - var width = nme.Lib.current.stage.stageWidth; - var height = nme.Lib.current.stage.stageHeight; - var shape = new Shape(); shape.graphics.beginFill(0x006600, 0.8); - shape.graphics.drawRect(0, 0, width, height); + shape.graphics.drawRect(0, 0, app.deviceWidth, app.deviceHeight); shape.graphics.endFill(); addChild(shape); return shape; } - function makeTextfield():TextField + function makeTextfield(app:AppData):TextField { - var width = nme.Lib.current.stage.stageWidth; - var height = nme.Lib.current.stage.stageHeight; - var textfield = new TextField(); - textfield.width = width; - textfield.height = height - 20; + textfield.width = app.deviceWidth; + textfield.height = app.deviceHeight - 20; textfield.background = false; textfield.defaultTextFormat = format; textfield.multiline = true; diff --git a/src/dust/entities/EntitiesConfig.hx b/src/dust/entities/EntitiesConfig.hx index 76ea31c..2eed58c 100644 --- a/src/dust/entities/EntitiesConfig.hx +++ b/src/dust/entities/EntitiesConfig.hx @@ -1,6 +1,6 @@ package dust.entities; -import dust.app.SignalMapConfig; +import dust.signals.SignalMapConfig; import dust.commands.CommandMap; import dust.components.BitfieldFactory; import dust.context.Config; diff --git a/src/dust/mainmenu/MainMenuConfig.hx b/src/dust/mainmenu/MainMenuConfig.hx index 93d89d7..ce99843 100644 --- a/src/dust/mainmenu/MainMenuConfig.hx +++ b/src/dust/mainmenu/MainMenuConfig.hx @@ -1,6 +1,8 @@ package dust.mainmenu; import nme.display.DisplayObjectContainer; +import dust.app.data.AppData; +import dust.app.AppConfig; import dust.text.Helvetica10WhiteFontConfig; import dust.mainmenu.control.MainMenuButtonFactory; import dust.graphics.data.Paint; @@ -12,19 +14,20 @@ import dust.text.BitmapTextConfig; import dust.signals.SignalMap; import dust.mainmenu.MainMenu; import minject.Injector; -import dust.app.SignalMapConfig; +import dust.signals.SignalMapConfig; import dust.context.DependentConfig; import dust.context.Config; class MainMenuConfig implements DependentConfig { + @inject public var app:AppData; @inject public var injector:Injector; @inject public var signalMap:SignalMap; @inject public var fonts:BitmapFonts; @inject public var root:DisplayObjectContainer; public function dependencies():Array> - return [SignalMapConfig, Helvetica10WhiteFontConfig] + return [AppConfig, SignalMapConfig, Helvetica10WhiteFontConfig] public function configure() { @@ -42,6 +45,6 @@ class MainMenuConfig implements DependentConfig .setFill(0x1E90FF) .setLine(1, 0xFFFFFF); - return new MainMenuButtonConfig(font, paint, 160, 40, 10); + return new MainMenuButtonConfig(app, font, paint, 160, 40, 20); } } diff --git a/src/dust/mainmenu/data/MainMenuButtonConfig.hx b/src/dust/mainmenu/data/MainMenuButtonConfig.hx index 2077e32..fec4280 100644 --- a/src/dust/mainmenu/data/MainMenuButtonConfig.hx +++ b/src/dust/mainmenu/data/MainMenuButtonConfig.hx @@ -1,5 +1,6 @@ package dust.mainmenu.data; +import dust.app.data.AppData; import nme.display.Graphics; import nme.display.Sprite; import dust.geom.data.Position; @@ -15,8 +16,12 @@ class MainMenuButtonConfig public var height:Int; public var padding:Int; - public function new(font:BitmapFont, paint:Paint, width:Int, height:Int, padding:Int) + var app:AppData; + + public function new(app:AppData, font:BitmapFont, paint:Paint, width:Int, height:Int, padding:Int) { + this.app = app; + this.font = font; this.paint = paint; this.width = width; @@ -35,5 +40,5 @@ class MainMenuButtonConfig } public function rows():Int - return Std.int((nme.Lib.current.stage.stageHeight - padding) / (height + padding)) + return Std.int((app.deviceHeight - padding) / (height + padding)) } diff --git a/src/dust/app/SignalMapConfig.hx b/src/dust/signals/SignalMapConfig.hx similarity index 91% rename from src/dust/app/SignalMapConfig.hx rename to src/dust/signals/SignalMapConfig.hx index 34d3dad..0302f16 100644 --- a/src/dust/app/SignalMapConfig.hx +++ b/src/dust/signals/SignalMapConfig.hx @@ -1,4 +1,4 @@ -package dust.app; +package dust.signals; import dust.context.Config; import dust.signals.SignalMap; diff --git a/src/dust/systems/SystemsConfig.hx b/src/dust/systems/SystemsConfig.hx index c8608c8..a3a25bb 100644 --- a/src/dust/systems/SystemsConfig.hx +++ b/src/dust/systems/SystemsConfig.hx @@ -8,11 +8,11 @@ import dust.systems.impl.SystemMap; import dust.systems.impl.Systems; import dust.systems.control.StopSystemsSignal; import dust.systems.control.StartSystemsSignal; -import dust.app.CommandMapConfig; +import dust.commands.CommandMapConfig; import dust.commands.CommandMap; import dust.systems.impl.Systems; import dust.context.Context; -import dust.app.SignalMapConfig; +import dust.signals.SignalMapConfig; import dust.entities.EntitiesConfig; import dust.signals.SignalMap; import dust.signals.SignalVoid; diff --git a/src/dust/text/control/BitmapFontCharFactory.hx b/src/dust/text/control/BitmapFontCharFactory.hx index 4f8e279..fb4298c 100644 --- a/src/dust/text/control/BitmapFontCharFactory.hx +++ b/src/dust/text/control/BitmapFontCharFactory.hx @@ -51,7 +51,7 @@ class BitmapFontCharFactory var width = hash.get('width'); var height = hash.get('height'); - if (width == 0 || height == 0) + if (width <= 0 || height <= 0) return pixel; var x = hash.get('x'); diff --git a/test/TestSuite.hx b/test/TestSuite.hx index da522fe..90eca78 100644 --- a/test/TestSuite.hx +++ b/test/TestSuite.hx @@ -1,7 +1,5 @@ import massive.munit.TestSuite; -import dust.app.CommandMapConfigTest; -import dust.app.SignalMapConfigTest; import dust.ArrayUtilTest; import dust.camera.CameraConfigTest; import dust.camera.config.CameraDecoratorTest; @@ -12,6 +10,7 @@ import dust.collections.api.CollectionTest; import dust.collections.CollectionsConfigTest; import dust.collections.control.CollectionMapTest; import dust.collections.control.CollectionSubscriberTest; +import dust.commands.CommandMapConfigTest; import dust.commands.CommandMapTest; import dust.components.BitfieldFactoryTest; import dust.components.BitfieldListenersTest; @@ -49,6 +48,7 @@ import dust.quadtree.data.QuadTreeAtomTest; import dust.quadtree.data.QuadTreeDivisionsTest; import dust.quadtree.data.QuadTreeRangeTest; import dust.quadtree.data.QuadTreeTest; +import dust.signals.SignalMapConfigTest; import dust.signals.SignalMapTest; import dust.stats.RollingMeanTest; import dust.systems.impl.SystemMappingTest; @@ -80,8 +80,6 @@ class TestSuite extends massive.munit.TestSuite { super(); - add(dust.app.CommandMapConfigTest); - add(dust.app.SignalMapConfigTest); add(dust.ArrayUtilTest); add(dust.camera.CameraConfigTest); add(dust.camera.config.CameraDecoratorTest); @@ -92,6 +90,7 @@ class TestSuite extends massive.munit.TestSuite add(dust.collections.CollectionsConfigTest); add(dust.collections.control.CollectionMapTest); add(dust.collections.control.CollectionSubscriberTest); + add(dust.commands.CommandMapConfigTest); add(dust.commands.CommandMapTest); add(dust.components.BitfieldFactoryTest); add(dust.components.BitfieldListenersTest); @@ -129,6 +128,7 @@ class TestSuite extends massive.munit.TestSuite add(dust.quadtree.data.QuadTreeDivisionsTest); add(dust.quadtree.data.QuadTreeRangeTest); add(dust.quadtree.data.QuadTreeTest); + add(dust.signals.SignalMapConfigTest); add(dust.signals.SignalMapTest); add(dust.stats.RollingMeanTest); add(dust.systems.impl.SystemMappingTest); diff --git a/test/dust/camera/data/CameraTest.hx b/test/dust/camera/data/CameraTest.hx index 78252c1..b0c0c43 100644 --- a/test/dust/camera/data/CameraTest.hx +++ b/test/dust/camera/data/CameraTest.hx @@ -14,8 +14,8 @@ class CameraTest @Before public function before() { var stage = nme.Lib.current.stage; - screenCenterX = Std.int(stage.stageWidth * 0.5); - screenCenterY = Std.int(stage.stageHeight * 0.5); + screenCenterX = Std.int(400); + screenCenterY = Std.int(300); camera = new Camera(screenCenterX, screenCenterY); world = new Position(); diff --git a/test/dust/app/CommandMapConfigTest.hx b/test/dust/commands/CommandMapConfigTest.hx similarity index 90% rename from test/dust/app/CommandMapConfigTest.hx rename to test/dust/commands/CommandMapConfigTest.hx index 1e1715b..2ccda16 100644 --- a/test/dust/app/CommandMapConfigTest.hx +++ b/test/dust/commands/CommandMapConfigTest.hx @@ -1,5 +1,6 @@ -package dust.app; +package dust.commands; +import dust.commands.CommandMapConfig; import minject.Injector; import dust.context.Config; import dust.commands.CommandMap; diff --git a/test/dust/console/ConsoleConfigTest.hx b/test/dust/console/ConsoleConfigTest.hx index 07ac107..cb57184 100644 --- a/test/dust/console/ConsoleConfigTest.hx +++ b/test/dust/console/ConsoleConfigTest.hx @@ -1,8 +1,8 @@ package dust.console; -import dust.console.control.HideConfigSignal; +import dust.console.control.HideConsoleSignal; import dust.console.impl.Console; -import dust.console.control.ShowConfigSignal; +import dust.console.control.ShowConsoleSignal; import dust.console.impl.ConsoleMap; import minject.Injector; import nme.display.Sprite; @@ -32,14 +32,14 @@ class ConsoleConfigTest @Test public function canEnableConsoleViaSignal() { - injector.getInstance(ShowConfigSignal).dispatch(); + injector.getInstance(ShowConsoleSignal).dispatch(); Assert.isTrue(injector.getInstance(Console).isEnabled); } @Test public function canDisableConsoleViaSignal() { - injector.getInstance(ShowConfigSignal).dispatch(); - injector.getInstance(HideConfigSignal).dispatch(); + injector.getInstance(ShowConsoleSignal).dispatch(); + injector.getInstance(HideConsoleSignal).dispatch(); Assert.isFalse(injector.getInstance(Console).isEnabled); } } diff --git a/test/dust/console/impl/ConsoleInputTest.hx b/test/dust/console/impl/ConsoleInputTest.hx index c61035c..25b5b87 100644 --- a/test/dust/console/impl/ConsoleInputTest.hx +++ b/test/dust/console/impl/ConsoleInputTest.hx @@ -1,5 +1,8 @@ package dust.console.impl; +import nme.display.Sprite; +import dust.context.Context; +import minject.Injector; import dust.console.ui.ConsoleFormat; import dust.console.ui.ConsoleInput; import nme.events.KeyboardEvent; @@ -12,8 +15,13 @@ class ConsoleInputTest @Before public function before() { - var format = new ConsoleFormat(); - input = new ConsoleInput(format); + var injector = new Injector(); + + var context = new Context(injector) + .configure(ConsoleConfig) + .start(new Sprite()); + + input = injector.getInstance(ConsoleInput); } @Test public function canEnable() diff --git a/test/dust/console/impl/ConsoleOutputTest.hx b/test/dust/console/impl/ConsoleOutputTest.hx index 7555203..c7bd6b3 100644 --- a/test/dust/console/impl/ConsoleOutputTest.hx +++ b/test/dust/console/impl/ConsoleOutputTest.hx @@ -1,5 +1,8 @@ package dust.console.impl; +import dust.context.Context; +import nme.display.Sprite; +import minject.Injector; import dust.console.ui.ConsoleFormat; import dust.console.ui.ConsoleOutput; import nme.text.TextFormat; @@ -10,8 +13,13 @@ class ConsoleOutputTest @Before public function before() { - var format = new ConsoleFormat(); - subject = new ConsoleOutput(format); + var injector = new Injector(); + + var context = new Context(injector) + .configure(ConsoleConfig) + .start(new Sprite()); + + subject = injector.getInstance(ConsoleOutput); } @Test public function writeAppendsText() diff --git a/test/dust/console/impl/ConsoleTest.hx b/test/dust/console/impl/ConsoleTest.hx index ac4f140..1c1a5ec 100644 --- a/test/dust/console/impl/ConsoleTest.hx +++ b/test/dust/console/impl/ConsoleTest.hx @@ -1,34 +1,35 @@ package dust.console.impl; +import nme.display.Sprite; +import minject.Injector; +import dust.context.Context; import dust.console.ui.ConsoleFormat; import dust.console.ui.ConsoleInput; import dust.console.ui.ConsoleOutput; class ConsoleTest { - var map:ConsoleMap; - var format:ConsoleFormat; - var input:ConsoleInput; - var output:ConsoleOutput; - var subject:Console; + var output:Console; @Before public function before() { - map = new ConsoleMap(); - format = new ConsoleFormat(); - input = new ConsoleInput(format); - output = new ConsoleOutput(format); - subject = new Console(map, input, output); + var injector = new Injector(); + + var context = new Context(injector) + .configure(ConsoleConfig) + .start(new Sprite()); + + output = injector.getInstance(Console); } @Test public function canEnableConsole() { - subject.enable(); + output.enable(); } @Test public function canDisableConsole() { - subject.enable(); - subject.disable(); + output.enable(); + output.disable(); } } diff --git a/test/dust/interactive/systems/MouseSystemTest.hx b/test/dust/interactive/systems/MouseSystemTest.hx index 45488f1..7eadf5f 100644 --- a/test/dust/interactive/systems/MouseSystemTest.hx +++ b/test/dust/interactive/systems/MouseSystemTest.hx @@ -69,8 +69,8 @@ class MouseSystemTest function startSystemsAndClick() { systems.start(); - root.dispatchEvent(new MouseEvent(MouseEvent.CLICK, false, false, 20, 20)); systems.update(); + root.dispatchEvent(new MouseEvent(MouseEvent.CLICK, false, false, 20, 20)); } @After diff --git a/test/dust/app/SignalMapConfigTest.hx b/test/dust/signals/SignalMapConfigTest.hx similarity index 90% rename from test/dust/app/SignalMapConfigTest.hx rename to test/dust/signals/SignalMapConfigTest.hx index 7155c1f..d308be2 100644 --- a/test/dust/app/SignalMapConfigTest.hx +++ b/test/dust/signals/SignalMapConfigTest.hx @@ -1,5 +1,6 @@ -package dust.app; +package dust.signals; +import dust.signals.SignalMapConfig; import dust.signals.SignalMap; import minject.Injector; import dust.context.Config;