From b87d88f7ef331a0d4dbf761ef2025304257f80bc Mon Sep 17 00:00:00 2001 From: mde Date: Wed, 31 Mar 2010 14:33:49 -0700 Subject: [PATCH] Changing all Windmill references to FlexPilot. --- build.py | 16 ++--- pkg/build.json | 28 ++++---- .../flex_pilot/{WMAssert.as => FPAssert.as} | 36 +++++----- .../{WMBootstrap.as => FPBootstrap.as} | 10 +-- .../{WMController.as => FPController.as} | 42 ++++++------ .../{WMExplorer.as => FPExplorer.as} | 28 ++++---- .../flex_pilot/{WMLocator.as => FPLocator.as} | 62 ++++++++--------- .../flex_pilot/{WMLogger.as => FPLogger.as} | 6 +- .../{WMRecorder.as => FPRecorder.as} | 68 +++++++++---------- src/org/flex_pilot/{WMWait.as => FPWait.as} | 20 +++--- .../flex_pilot/{Windmill.as => FlexPilot.as} | 52 +++++++------- src/org/flex_pilot/TestCase.as | 20 +++--- src/org/flex_pilot/astest/ASTest.as | 28 ++++---- src/org/flex_pilot/astest/ASTestLoader.as | 6 +- src/org/flex_pilot/events/Events.as | 14 ++-- .../{WMFocusEvent.as => FPFocusEvent.as} | 6 +- ...{WMKeyboardEvent.as => FPKeyboardEvent.as} | 6 +- .../events/{WMListEvent.as => FPListEvent.as} | 6 +- .../{WMMouseEvent.as => FPMouseEvent.as} | 6 +- .../events/{WMTextEvent.as => FPTextEvent.as} | 6 +- src/util/DOMEventDrag.as | 2 +- tests/TestAppCode.as | 12 ++-- tests/TestBar.as | 2 +- tests/TestFoo.as | 2 +- 24 files changed, 242 insertions(+), 242 deletions(-) rename src/org/flex_pilot/{WMAssert.as => FPAssert.as} (91%) rename src/org/flex_pilot/{WMBootstrap.as => FPBootstrap.as} (85%) rename src/org/flex_pilot/{WMController.as => FPController.as} (90%) rename src/org/flex_pilot/{WMExplorer.as => FPExplorer.as} (87%) rename src/org/flex_pilot/{WMLocator.as => FPLocator.as} (82%) rename src/org/flex_pilot/{WMLogger.as => FPLogger.as} (88%) rename src/org/flex_pilot/{WMRecorder.as => FPRecorder.as} (79%) rename src/org/flex_pilot/{WMWait.as => FPWait.as} (87%) rename src/org/flex_pilot/{Windmill.as => FlexPilot.as} (79%) rename src/org/flex_pilot/events/{WMFocusEvent.as => FPFocusEvent.as} (88%) rename src/org/flex_pilot/events/{WMKeyboardEvent.as => FPKeyboardEvent.as} (87%) rename src/org/flex_pilot/events/{WMListEvent.as => FPListEvent.as} (88%) rename src/org/flex_pilot/events/{WMMouseEvent.as => FPMouseEvent.as} (92%) rename src/org/flex_pilot/events/{WMTextEvent.as => FPTextEvent.as} (86%) diff --git a/build.py b/build.py index fb6969b..dff3cec 100755 --- a/build.py +++ b/build.py @@ -11,12 +11,12 @@ # For replacing .as with .swf as_re = re.compile('\.as$|\.mxml$') -def windmill(): - cmd = MXMLC_PATH + ' -source-path=. ./org/windmill/Windmill.as -o ./org/windmill/Windmill.swf' +def flex_pilot(): + cmd = MXMLC_PATH + ' -source-path=./src ./src/org/flex_pilot/FlexPilot.as -o ./org/flex_pilot/FlexPilot.swf' os.system(cmd) def bootstrap(): - cmd = MXMLC_PATH + ' -source-path=. ./org/windmill/WMBootstrap.as -o ./org/windmill/WMBootstrap.swf' + cmd = MXMLC_PATH + ' -source-path=./src ./src/org/flex_pilot/FPBootstrap.as -o ./org/flex_pilot/FPBootstrap.swf' os.system(cmd) def clean(): @@ -31,22 +31,22 @@ def clean(): def parse_opts(): parser = optparse.OptionParser() parser.add_option('-t', '--target', dest='target', - help='build TARGET (windmill/bootstrap/all/clean, default is all)', - metavar='TARGET', choices=('windmill', 'bootstrap', 'all', 'clean'), default='all') + help='build TARGET (flex_pilot/bootstrap/all/clean, default is all)', + metavar='TARGET', choices=('flex_pilot', 'bootstrap', 'all', 'clean'), default='all') opts, args = parser.parse_args() return opts, args def main(o, a): target = o.target # Build only the AS tests into loadable swfs - if target == 'windmill': - windmill() + if target == 'flex_pilot': + flex_pilot() # Build only the test app we use to run the tests against elif target == 'bootstrap': bootstrap() # Build everything, natch elif target == 'all': - windmill() + flex_pilot() bootstrap() # Clean out any swfs in the directory elif target == 'clean': diff --git a/pkg/build.json b/pkg/build.json index e9ed255..ec9d78b 100644 --- a/pkg/build.json +++ b/pkg/build.json @@ -2,21 +2,21 @@ "source-path": ".", "output": - "windmill.swc", + "flex_pilot.swc", "include-classes": [ - "org.windmill.Windmill", - "org.windmill.WMController", - "org.windmill.WMLocator", - "org.windmill.WMLogger", - "org.windmill.WMExplorer", - "org.windmill.WMRecorder", - "org.windmill.WMAssert", - "org.windmill.events.Events", - "org.windmill.events.WMFocusEvent", - "org.windmill.events.WMKeyboardEvent", - "org.windmill.events.WMListEvent", - "org.windmill.events.WMMouseEvent", - "org.windmill.events.WMTextEvent" + "org.flex_pilot.FlexPilot", + "org.flex_pilot.FPController", + "org.flex_pilot.FPLocator", + "org.flex_pilot.FPLogger", + "org.flex_pilot.FPExplorer", + "org.flex_pilot.FPRecorder", + "org.flex_pilot.FPAssert", + "org.flex_pilot.events.Events", + "org.flex_pilot.events.FPFocusEvent", + "org.flex_pilot.events.FPKeyboardEvent", + "org.flex_pilot.events.FPListEvent", + "org.flex_pilot.events.FPMouseEvent", + "org.flex_pilot.events.FPTextEvent" ] } diff --git a/src/org/flex_pilot/WMAssert.as b/src/org/flex_pilot/FPAssert.as similarity index 91% rename from src/org/flex_pilot/WMAssert.as rename to src/org/flex_pilot/FPAssert.as index 184a409..12ba8d7 100644 --- a/src/org/flex_pilot/WMAssert.as +++ b/src/org/flex_pilot/FPAssert.as @@ -14,12 +14,12 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { - import org.windmill.WMLocator; - import org.windmill.WMLogger; +package org.flex_pilot { + import org.flex_pilot.FPLocator; + import org.flex_pilot.FPLogger; import flash.utils.getQualifiedClassName; - public dynamic class WMAssert { + public dynamic class FPAssert { public static var assertTemplates:Object = { assertTrue: { @@ -99,8 +99,8 @@ package org.windmill { }; public static function init():void { - for (var p:String in WMAssert.assertTemplates) { - WMAssert[p] = WMAssert.createAssert(p); + for (var p:String in FPAssert.assertTemplates) { + FPAssert[p] = FPAssert.createAssert(p); } } @@ -137,7 +137,7 @@ package org.windmill { // The actual assert method, e.g, 'equals' var meth:String = args.shift(); // The assert object - var asrt:Object = WMAssert.assertTemplates[meth]; + var asrt:Object = FPAssert.assertTemplates[meth]; // The assert expresion var expr:Function = asrt.expr; // Validate the args passed @@ -165,7 +165,7 @@ package org.windmill { } public static function assertDisplayObject(params:Object):Boolean { - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); if (!!obj) { return true; } @@ -176,26 +176,26 @@ package org.windmill { } public static function assertProperty(params:Object):Boolean { - return WMAssert.doBaseAssert(params); + return FPAssert.doBaseAssert(params); } public static function assertText(params:Object):Boolean { - return WMAssert.assertTextGeneric(params, true); + return FPAssert.assertTextGeneric(params, true); } public static function assertTextIn(params:Object):Boolean { - return WMAssert.assertTextGeneric(params, false); + return FPAssert.assertTextGeneric(params, false); } private static function assertTextGeneric(params:Object, exact:Boolean):Boolean { - return WMAssert.doBaseAssert(params, { + return FPAssert.doBaseAssert(params, { attrName: ['htmlText', 'label'], preMatchProcess: function (str:String):String { return str.replace(/^\s*|\s*$/g, ''); }, - matchType: exact ? WMAssert.matchTypes.EXACT : - WMAssert.matchTypes.CONTAINS + matchType: exact ? FPAssert.matchTypes.EXACT : + FPAssert.matchTypes.CONTAINS }); } @@ -204,9 +204,9 @@ package org.windmill { private static function doBaseAssert(params:Object, opts:Object = null):Boolean { // Ref to the object to do the lookup on - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); // Exact vs. 'in' (contains) match - var matchType:String = WMAssert.matchTypes.EXACT; + var matchType:String = FPAssert.matchTypes.EXACT; var attrName:String; var expectedVal:String; // Explicitly passing in the attr name, or a list of @@ -278,11 +278,11 @@ package org.windmill { // Check for a match var ret:Boolean = false; var errMsg:String; - if (matchType == WMAssert.matchTypes.EXACT) { + if (matchType == FPAssert.matchTypes.EXACT) { ret = attrVal == expectedVal; errMsg = 'Expected "' + expectedVal + '", got "' + attrVal + '"'; } - else if (matchType == WMAssert.matchTypes.CONTAINS) { + else if (matchType == FPAssert.matchTypes.CONTAINS) { ret = attrVal.indexOf(expectedVal) > -1; errMsg = '"' + attrVal + '" did not contain "' + expectedVal + '"'; } diff --git a/src/org/flex_pilot/WMBootstrap.as b/src/org/flex_pilot/FPBootstrap.as similarity index 85% rename from src/org/flex_pilot/WMBootstrap.as rename to src/org/flex_pilot/FPBootstrap.as index 1ce0548..4426e52 100644 --- a/src/org/flex_pilot/WMBootstrap.as +++ b/src/org/flex_pilot/FPBootstrap.as @@ -14,7 +14,7 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { +package org.flex_pilot { import flash.display.Loader; import flash.net.URLRequest; import flash.events.Event; @@ -22,12 +22,12 @@ package org.windmill { import flash.system.SecurityDomain; import flash.system.LoaderContext; - public class WMBootstrap { - public static var windmillLibPath:String = '/flash/org/windmill/Windmill.swf'; + public class FPBootstrap { + public static var flex_pilotLibPath:String = '/flash/org/flex_pilot/FlexPilot.swf'; public static var wm:*; public static function init(context:*, domains:* = null):void { var loader:Loader = new Loader(); - var url:String = WMBootstrap.windmillLibPath; + var url:String = FPBootstrap.flex_pilotLibPath; var req:URLRequest = new URLRequest(url); var con:LoaderContext = new LoaderContext(false, ApplicationDomain.currentDomain, @@ -35,7 +35,7 @@ package org.windmill { loader.contentLoaderInfo.addEventListener( Event.COMPLETE, function ():void { wm = ApplicationDomain.currentDomain.getDefinition( - "org.windmill.Windmill") as Class; + "org.flex_pilot.FlexPilot") as Class; wm.init({ context: context, domains: domains }); }); loader.load(req, con); diff --git a/src/org/flex_pilot/WMController.as b/src/org/flex_pilot/FPController.as similarity index 90% rename from src/org/flex_pilot/WMController.as rename to src/org/flex_pilot/FPController.as index a56589a..f7b1c7c 100644 --- a/src/org/flex_pilot/WMController.as +++ b/src/org/flex_pilot/FPController.as @@ -14,31 +14,31 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { - import org.windmill.events.*; - import org.windmill.WMLocator; +package org.flex_pilot { + import org.flex_pilot.events.*; + import org.flex_pilot.FPLocator; import flash.events.* import mx.events.* import flash.utils.*; import flash.geom.Point; - public class WMController { - public function WMController():void {} + public class FPController { + public function FPController():void {} public static function mouseOver(params:Object):void { - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); Events.triggerMouseEvent(obj, MouseEvent.MOUSE_OVER); Events.triggerMouseEvent(obj, MouseEvent.ROLL_OVER); } public static function mouseOut(params:Object):void { - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); Events.triggerMouseEvent(obj, MouseEvent.MOUSE_OUT); Events.triggerMouseEvent(obj, MouseEvent.ROLL_OUT); } public static function click(params:Object):void { - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); // Give it focus Events.triggerFocusEvent(obj, FocusEvent.FOCUS_IN); // Down, (TextEvent.LINK,) up, click @@ -47,7 +47,7 @@ package org.windmill { // If this is a link, do the TextEvent hokey-pokey // All events fire on the containing DisplayObject if ('link' in params) { - var link:String = WMLocator.locateLinkHref(params.link, + var link:String = FPLocator.locateLinkHref(params.link, obj.htmlText); Events.triggerTextEvent(obj, TextEvent.LINK, { text: link }); @@ -58,10 +58,10 @@ package org.windmill { // Click alias functions public static function check(params:Object):void { - return WMController.click(params); + return FPController.click(params); } public static function radio(params:Object):void { - return WMController.click(params); + return FPController.click(params); } public static function dragDropElemToElem(params:Object):void { @@ -73,7 +73,7 @@ package org.windmill { break; } } - var dest:* = WMLocator.lookupDisplayObject(destParams); + var dest:* = FPLocator.lookupDisplayObject(destParams); var destCoords:Point = new Point(0, 0); destCoords = dest.localToGlobal(destCoords); params.coords = '(' + destCoords.x + ',' + destCoords.y + ')'; @@ -81,9 +81,9 @@ package org.windmill { } public static function dragDropToCoords(params:Object):void { - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); var startCoordsLocal:Point = new Point(0, 0); - var endCoordsAbs:Point = WMController.parseCoords(params.coords); + var endCoordsAbs:Point = FPController.parseCoords(params.coords); // Convert local X/Y to global var startCoordsAbs:Point = obj.localToGlobal(startCoordsLocal); // Move mouse over to the dragged obj @@ -169,7 +169,7 @@ package org.windmill { } public static function doubleClick(params:Object):void { - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); // Give it focus Events.triggerFocusEvent(obj, FocusEvent.FOCUS_IN); // First click @@ -179,7 +179,7 @@ package org.windmill { // If this is a link, do the TextEvent hokey-pokey // All events fire on the containing DisplayObject if ('link' in params) { - var link:String = WMLocator.locateLinkHref(params.link, + var link:String = FPLocator.locateLinkHref(params.link, obj.htmlText); Events.triggerTextEvent(obj, TextEvent.LINK, { text: link }); @@ -201,7 +201,7 @@ package org.windmill { public static function type(params:Object):void { // Look up the item to write to - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); // Text to type out var str:String = params.text; // Char @@ -233,7 +233,7 @@ package org.windmill { public static function select(params:Object):void { // Look up the item to write to - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); var sel:* = obj.selectedItem; var item:*; // Give the item focus @@ -279,7 +279,7 @@ package org.windmill { } public static function getTextValue(params:Object):String { // Look up the item where we want to get the property - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); var attrs:Object=['htmlText', 'label']; var res:String = 'undefined'; var attr:String; @@ -294,7 +294,7 @@ package org.windmill { public static function getPropertyValue(params:Object, opts:Object = null):String { // Look up the item where we want to get the property - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); var attrName:String; var attrVal:String = 'undefined'; if (opts){ @@ -314,7 +314,7 @@ package org.windmill { public static function getObjectCoords(params:Object):String { // Look up the item which coords we want to get - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); var destCoords:Point = new Point(0, 0); destCoords = obj.localToGlobal(destCoords); var coords:String = '(' + String(destCoords.x) + ',' + String(destCoords.y) + ')'; diff --git a/src/org/flex_pilot/WMExplorer.as b/src/org/flex_pilot/FPExplorer.as similarity index 87% rename from src/org/flex_pilot/WMExplorer.as rename to src/org/flex_pilot/FPExplorer.as index 0781da1..3d1e889 100644 --- a/src/org/flex_pilot/WMExplorer.as +++ b/src/org/flex_pilot/FPExplorer.as @@ -14,11 +14,11 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { - import org.windmill.Windmill; - import org.windmill.WMLocator; - import org.windmill.WMLogger; - import org.windmill.WMRecorder; +package org.flex_pilot { + import org.flex_pilot.FlexPilot; + import org.flex_pilot.FPLocator; + import org.flex_pilot.FPLogger; + import org.flex_pilot.FPRecorder; import flash.display.Stage; import flash.display.Sprite; import flash.events.MouseEvent; @@ -26,7 +26,7 @@ package org.windmill { import flash.geom.Rectangle; import flash.external.ExternalInterface; - public class WMExplorer { + public class FPExplorer { // Sprite which gets superimposed on the moused-over element // and provides the border effect private static var borderSprite:Sprite = new Sprite(); @@ -45,13 +45,13 @@ package org.windmill { } // Stop the recorder if it's going - WMRecorder.stop(); + FPRecorder.stop(); running = true; - var stage:Stage = Windmill.getStage(); + var stage:Stage = FlexPilot.getStage(); var spr:Sprite = borderSprite; // Add the border-sprite to the stage - spr.name = 'windmillBorderSprite'; + spr.name = 'flex_pilotBorderSprite'; stage.addChild(spr); // Highlight every element, create locator chain on mouseover stage.addEventListener(MouseEvent.MOUSE_OVER, select, false); @@ -64,7 +64,7 @@ package org.windmill { public static function stop(e:MouseEvent = null):void { if (!running) { return; } - var stage:Stage = Windmill.getStage(); + var stage:Stage = FlexPilot.getStage(); stage.removeChild(borderSprite); stage.removeEventListener(MouseEvent.MOUSE_OVER, select); @@ -79,7 +79,7 @@ package org.windmill { var res:* = ExternalInterface.call('wm_explorerStopped'); if (!res) { - WMLogger.log('(Windmill Flash bridge not found.)'); + FPLogger.log('(FlexPilot Flash bridge not found.)'); } } @@ -87,7 +87,7 @@ package org.windmill { // expression for it public static function select(e:MouseEvent):void { var targ:* = e.target; - if ('name' in targ && targ.name == 'windmillBorderSprite') { + if ('name' in targ && targ.name == 'flex_pilotBorderSprite') { return; } // Bordered sprite for highlighting @@ -110,11 +110,11 @@ package org.windmill { if (strictLocators is Boolean) { args.push(strictLocators); } - var expr:String = WMLocator.generateLocator.apply(WMLocator, args); + var expr:String = FPLocator.generateLocator.apply(FPLocator, args); if (expr && expr.length) { var res:* = ExternalInterface.call('wm_explorerSelect', expr); if (!res) { - WMLogger.log('Locator chain: ' + expr); + FPLogger.log('Locator chain: ' + expr); } } else { diff --git a/src/org/flex_pilot/WMLocator.as b/src/org/flex_pilot/FPLocator.as similarity index 82% rename from src/org/flex_pilot/WMLocator.as rename to src/org/flex_pilot/FPLocator.as index 656988d..e17fa71 100644 --- a/src/org/flex_pilot/WMLocator.as +++ b/src/org/flex_pilot/FPLocator.as @@ -14,13 +14,13 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { - import org.windmill.Windmill; - import org.windmill.WMLogger; +package org.flex_pilot { + import org.flex_pilot.FlexPilot; + import org.flex_pilot.FPLogger; import flash.display.DisplayObject; import flash.display.DisplayObjectContainer; - public class WMLocator { + public class FPLocator { // Stupid AS3 doesn't iterate over Object keys // in insertion order // null for the finder func means use the default @@ -28,9 +28,9 @@ package org.windmill { private static var locatorMap:Array = [ ['name', null], ['id', null], - ['link', WMLocator.findLink], + ['link', FPLocator.findLink], ['label', null], - ['htmlText', WMLocator.findHTML], + ['htmlText', FPLocator.findHTML], ['automationName', null] ]; private static var locatorMapObj:Object = {}; @@ -49,17 +49,17 @@ package org.windmill { ]; public static function init():void { - for each (var arr:Array in WMLocator.locatorMap) { - WMLocator.locatorMapObj[arr[0]] = arr[1]; + for each (var arr:Array in FPLocator.locatorMap) { + FPLocator.locatorMapObj[arr[0]] = arr[1]; } - WMLocator.locatorMapCreated = true; + FPLocator.locatorMapCreated = true; } public static function lookupDisplayObjectBool( params:Object):Boolean { var res:DisplayObject; - res = WMLocator.lookupDisplayObject(params); + res = FPLocator.lookupDisplayObject(params); if (res){ return true; } @@ -69,9 +69,9 @@ package org.windmill { public static function lookupDisplayObject( params:Object):DisplayObject { var res:DisplayObject; - res = lookupDisplayObjectForContext(params, Windmill.getContext()); - if (!res && Windmill.contextIsApplication()) { - res = lookupDisplayObjectForContext(params, Windmill.getStage()); + res = lookupDisplayObjectForContext(params, FlexPilot.getContext()); + if (!res && FlexPilot.contextIsApplication()) { + res = lookupDisplayObjectForContext(params, FlexPilot.getStage()); } return res; @@ -81,12 +81,12 @@ package org.windmill { params:Object, obj:*):DisplayObject { var locators:Array = []; var queue:Array = []; - var checkWMLocatorChain:Function = function ( + var checkFPLocatorChain:Function = function ( item:*, pos:int):DisplayObject { - var map:Object = WMLocator.locatorMapObj; + var map:Object = FPLocator.locatorMapObj; var loc:Object = locators[pos]; // If nothing specific exists for that attr, use the basic one - var finder:Function = map[loc.attr] || WMLocator.findBySimpleAttr; + var finder:Function = map[loc.attr] || FPLocator.findBySimpleAttr; var next:int = pos + 1; if (!!finder(item, loc.attr, loc.val)) { // Move to the next locator in the chain @@ -104,7 +104,7 @@ package org.windmill { var index:int = 0; while (index < count) { var kid:DisplayObject = item.getChildAt(index); - var res:DisplayObject = checkWMLocatorChain(kid, next); + var res:DisplayObject = checkFPLocatorChain(kid, next); if (res) { return res; } @@ -114,8 +114,8 @@ package org.windmill { } return null; }; - var str:String = normalizeWMLocator(params); - locators = parseWMLocatorChainExpresson(str); + var str:String = normalizeFPLocator(params); + locators = parseFPLocatorChainExpresson(str); queue.push(obj); while (queue.length) { // Otherwise grab the next item in the queue @@ -130,7 +130,7 @@ package org.windmill { index++; } } - var res:DisplayObject = checkWMLocatorChain(item, 0); + var res:DisplayObject = checkFPLocatorChain(item, 0); // If this is a full match, we're done if (res) { return res; @@ -139,7 +139,7 @@ package org.windmill { return null; } - private static function parseWMLocatorChainExpresson( + private static function parseFPLocatorChainExpresson( exprStr:String):Array { var locators:Array = []; var expr:Array = exprStr.split('/'); @@ -154,15 +154,15 @@ package org.windmill { return locators; } - private static function normalizeWMLocator(params:Object):String { + private static function normalizeFPLocator(params:Object):String { if ('chain' in params) { return params.chain; } else { - var map:Object = WMLocator.locatorMap; + var map:Object = FPLocator.locatorMap; var attr:String; var val:*; - // WMLocators have an order of precedence -- ComboBox will + // FPLocators have an order of precedence -- ComboBox will // have a name/id, and its sub-options will have label // Make sure to do name-/id-based lookups first, label last for each (var item:Array in map) { @@ -197,7 +197,7 @@ package org.windmill { obj:*, attr:String, val:*):Boolean { var res:Boolean = false; if ('htmlText' in obj) { - var text:String = WMLocator.cleanHTML(obj.htmlText); + var text:String = FPLocator.cleanHTML(obj.htmlText); return val == text; } return res; @@ -211,7 +211,7 @@ package org.windmill { var linkPlain:String = ''; while (!!(res = pat.exec(htmlText))) { // Remove HTML tags and linebreaks; and trim - linkPlain = WMLocator.cleanHTML(res[2]); + linkPlain = FPLocator.cleanHTML(res[2]); if (linkPlain == linkText) { var evPat:RegExp = /href="event:(.*?)"/i; var arr:Array = evPat.exec(res[1]); @@ -233,7 +233,7 @@ package org.windmill { // Generates a chained-locator expression for the clicked-on item public static function generateLocator(item:*, ...args):String { - var strictLocators:Boolean = Windmill.config.strictLocators; + var strictLocators:Boolean = FlexPilot.config.strictLocators; if (args.length) { strictLocators = args[0]; } @@ -297,7 +297,7 @@ package org.windmill { return !!validLookup; }; // Attrs to look for, ordered by priority - var locatorPriority:Array = WMLocator.locatorLookupPriority; + var locatorPriority:Array = FPLocator.locatorLookupPriority; do { // Try looking up a value for each attribute in order // of preference @@ -307,7 +307,7 @@ package org.windmill { // Prepend onto the locator expression, then check to // see if the chain still results in a valid lookup attrVal = attr == 'htmlText' ? - WMLocator.cleanHTML(item[attr]) : item[attr]; + FPLocator.cleanHTML(item[attr]) : item[attr]; exprArr.unshift(attr + ':' + attrVal); // If this chain looks up an object correct, keeps going if (isValidLookup(exprArr)) { @@ -321,8 +321,8 @@ package org.windmill { } } item = item.parent; - } while (item.parent && !(item.parent == Windmill.getContext() || - item.parent == Windmill.getStage())) + } while (item.parent && !(item.parent == FlexPilot.getContext() || + item.parent == FlexPilot.getStage())) if (exprArr.length) { expr = exprArr.join('/'); return expr; diff --git a/src/org/flex_pilot/WMLogger.as b/src/org/flex_pilot/FPLogger.as similarity index 88% rename from src/org/flex_pilot/WMLogger.as rename to src/org/flex_pilot/FPLogger.as index dbc8b22..72a3276 100644 --- a/src/org/flex_pilot/WMLogger.as +++ b/src/org/flex_pilot/FPLogger.as @@ -14,17 +14,17 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { +package org.flex_pilot { import flash.external.ExternalInterface; - public class WMLogger { + public class FPLogger { public static var modes:Object = { TRACE: 'trace', BROWSER: 'browser' }; public static var mode:String = modes.BROWSER; public static function log(msg:*):void { - if (WMLogger.mode == modes.BROWSER) { + if (FPLogger.mode == modes.BROWSER) { ExternalInterface.call("console.log", msg); } else { diff --git a/src/org/flex_pilot/WMRecorder.as b/src/org/flex_pilot/FPRecorder.as similarity index 79% rename from src/org/flex_pilot/WMRecorder.as rename to src/org/flex_pilot/FPRecorder.as index d86faca..9183476 100644 --- a/src/org/flex_pilot/WMRecorder.as +++ b/src/org/flex_pilot/FPRecorder.as @@ -14,11 +14,11 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { - import org.windmill.Windmill; - import org.windmill.WMLogger; - import org.windmill.WMLocator; - import org.windmill.WMExplorer; +package org.flex_pilot { + import org.flex_pilot.FlexPilot; + import org.flex_pilot.FPLogger; + import org.flex_pilot.FPLocator; + import org.flex_pilot.FPExplorer; import flash.utils.*; import flash.display.Stage; import flash.display.DisplayObject; @@ -31,7 +31,7 @@ package org.windmill { import mx.controls.List; import flash.external.ExternalInterface; - public class WMRecorder { + public class FPRecorder { // Remember the last event type so we know when to // output the stored string from a sequence of keyDown events private static var lastEventType:String; @@ -53,19 +53,19 @@ package org.windmill { private static var listItems:Array = []; private static var running:Boolean = false; - public function WMRecorder():void {} + public function FPRecorder():void {} public static function start():void { // Stop the explorer if it's going - WMExplorer.stop(); + FPExplorer.stop(); var recurseAttach:Function = function (item:*):void { // Otherwise recursively check the next link in // the locator chain var count:int = 0; if (item is ComboBox || item is List) { - WMRecorder.listItems.push(item); - item.addEventListener(ListEvent.CHANGE, WMRecorder.handleEvent); + FPRecorder.listItems.push(item); + item.addEventListener(ListEvent.CHANGE, FPRecorder.handleEvent); } if (item is DisplayObjectContainer) { count = item.numChildren; @@ -79,33 +79,33 @@ package org.windmill { } } } - recurseAttach(Windmill.getContext()); - var stage:Stage = Windmill.getStage(); - stage.addEventListener(MouseEvent.CLICK, WMRecorder.handleEvent); - stage.addEventListener(MouseEvent.DOUBLE_CLICK, WMRecorder.handleEvent); - stage.addEventListener(TextEvent.LINK, WMRecorder.handleEvent); - stage.addEventListener(KeyboardEvent.KEY_DOWN, WMRecorder.handleEvent); - - WMRecorder.running = true; + recurseAttach(FlexPilot.getContext()); + var stage:Stage = FlexPilot.getStage(); + stage.addEventListener(MouseEvent.CLICK, FPRecorder.handleEvent); + stage.addEventListener(MouseEvent.DOUBLE_CLICK, FPRecorder.handleEvent); + stage.addEventListener(TextEvent.LINK, FPRecorder.handleEvent); + stage.addEventListener(KeyboardEvent.KEY_DOWN, FPRecorder.handleEvent); + + FPRecorder.running = true; } public static function stop():void { - if (!WMRecorder.running) { return; } - var stage:Stage = Windmill.getStage(); - stage.removeEventListener(MouseEvent.CLICK, WMRecorder.handleEvent); - stage.removeEventListener(MouseEvent.DOUBLE_CLICK, WMRecorder.handleEvent); - stage.removeEventListener(TextEvent.LINK, WMRecorder.handleEvent); - stage.removeEventListener(KeyboardEvent.KEY_DOWN, WMRecorder.handleEvent); - var list:Array = WMRecorder.listItems; + if (!FPRecorder.running) { return; } + var stage:Stage = FlexPilot.getStage(); + stage.removeEventListener(MouseEvent.CLICK, FPRecorder.handleEvent); + stage.removeEventListener(MouseEvent.DOUBLE_CLICK, FPRecorder.handleEvent); + stage.removeEventListener(TextEvent.LINK, FPRecorder.handleEvent); + stage.removeEventListener(KeyboardEvent.KEY_DOWN, FPRecorder.handleEvent); + var list:Array = FPRecorder.listItems; for each (var item:* in list) { - item.removeEventListener(ListEvent.CHANGE, WMRecorder.handleEvent); + item.removeEventListener(ListEvent.CHANGE, FPRecorder.handleEvent); } } private static function handleEvent(e:*):void { var targ:* = e.target; - var _this:* = WMRecorder; - var chain:String = WMLocator.generateLocator(targ); + var _this:* = FPRecorder; + var chain:String = FPLocator.generateLocator(targ); switch (e.type) { // Keyboard input -- append to the stored string reference @@ -153,12 +153,12 @@ package org.windmill { // keyboard events _this.lastEventType = e.type; - //WMLogger.log(e.toString()); - //WMLogger.log(e.target.toString()); + //FPLogger.log(e.toString()); + //FPLogger.log(e.target.toString()); } private static function resetRecentTarget(t:String, e:*):void { - var _this:* = WMRecorder; + var _this:* = FPRecorder; // Remember this target, avoid multiple clicks on it _this.recentTarget[t] = e.target; // Cancel any old setTimeout still hanging around @@ -174,7 +174,7 @@ package org.windmill { private static function generateAction(t:String, targ:*, opts:Object = null):void { - var chain:String = WMLocator.generateLocator(targ); + var chain:String = FPLocator.generateLocator(targ); var res:Object = { method: t, chain: chain @@ -206,8 +206,8 @@ package org.windmill { var r:* = ExternalInterface.call('wm_recorderAction', res); if (!r) { - WMLogger.log(res); - WMLogger.log('(Windmill Flash bridge not found.)'); + FPLogger.log(res); + FPLogger.log('(FlexPilot Flash bridge not found.)'); } } diff --git a/src/org/flex_pilot/WMWait.as b/src/org/flex_pilot/FPWait.as similarity index 87% rename from src/org/flex_pilot/WMWait.as rename to src/org/flex_pilot/FPWait.as index 848c377..2c89464 100644 --- a/src/org/flex_pilot/WMWait.as +++ b/src/org/flex_pilot/FPWait.as @@ -14,14 +14,14 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { - import org.windmill.Windmill; - import org.windmill.WMLogger; - import org.windmill.WMLocator; - import org.windmill.astest.ASTest; +package org.flex_pilot { + import org.flex_pilot.FlexPilot; + import org.flex_pilot.FPLogger; + import org.flex_pilot.FPLocator; + import org.flex_pilot.astest.ASTest; import flash.utils.*; - public class WMWait { + public class FPWait { // Simple wait function -- puts ASTest into waiting // mode, calls a function on setTimeout to take it // back out of waiting mode @@ -36,11 +36,11 @@ package org.windmill { // from a test function (params.test) // All other waits should simply define a test function // and hand off to this - // Default timeout (Windmill.config.timeout) is 20 seconds -- + // Default timeout (FlexPilot.config.timeout) is 20 seconds -- // can be overridden with params.timeout public static function forCondition(params:Object, callback:Function = null):void { - var timeout:int = Windmill.config.timeout; + var timeout:int = FlexPilot.config.timeout; if (params.timeout) { if (!isNaN(parseInt(params.timeout, 10))) { timeout = params.timeout; @@ -112,11 +112,11 @@ package org.windmill { public static function forDisplayObject(params:Object, callback:Function = null):void { var func:Function = function ():Boolean { - var obj:* = WMLocator.lookupDisplayObject(params); + var obj:* = FPLocator.lookupDisplayObject(params); return !!obj } params.test = func; - return WMWait.forCondition(params, callback); + return FPWait.forCondition(params, callback); } } } diff --git a/src/org/flex_pilot/Windmill.as b/src/org/flex_pilot/FlexPilot.as similarity index 79% rename from src/org/flex_pilot/Windmill.as rename to src/org/flex_pilot/FlexPilot.as index 5de9ae7..d50f303 100644 --- a/src/org/flex_pilot/Windmill.as +++ b/src/org/flex_pilot/FlexPilot.as @@ -14,11 +14,11 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { - import org.windmill.astest.ASTest; - import org.windmill.WMLocator; - import org.windmill.WMController; - import org.windmill.WMAssert; +package org.flex_pilot { + import org.flex_pilot.astest.ASTest; + import org.flex_pilot.FPLocator; + import org.flex_pilot.FPController; + import org.flex_pilot.FPAssert; import flash.utils.*; import mx.core.Application; import flash.system.Security; @@ -27,7 +27,7 @@ package org.windmill { import flash.display.DisplayObject; import flash.external.ExternalInterface; - public class Windmill extends Sprite { + public class FlexPilot extends Sprite { public static var config:Object = { context: null, // Ref to the Stage or Application timeout: 20000, // Default timeout for waits @@ -40,30 +40,30 @@ package org.windmill { controller: { // Ref to the namespace, since you can't // do it via string lookup - packageRef: org.windmill.WMController, + packageRef: org.flex_pilot.FPController, // Gets filled with the list of public methods -- // used to generate the wrapped methods exposed // via ExternalInterface methodNames: [] }, assert: { - packageRef: org.windmill.WMAssert, + packageRef: org.flex_pilot.FPAssert, methodNames: [] } }; - // Initializes the Windmill Flash code + // Initializes the FlexPilot Flash code // 1. Saves a reference to the stage in config.context // this is the equivalent of the window obj in - // Windmill's JS impl. See WMLocator to see how + // FlexPilot's JS impl. See FPLocator to see how // it's used // 2. Does some introspection/metaprogramming to - // expose all the public methods in WMController - // and WMAsserts through the ExternalInterface + // expose all the public methods in FPController + // and FPAsserts through the ExternalInterface // as wrapped functions that return either the // Boolean true, or the Error object if an error // happens (as in the case of all failed tests) - // 3. Exposes the start/stop method of WMExplorer + // 3. Exposes the start/stop method of FPExplorer // to turn on and off the explorer public static function init(params:Object):void { var methodName:String; @@ -72,27 +72,27 @@ package org.windmill { // A reference to the Stage // ---------------- if (!(params.context is Stage || params.context is Application)) { - throw new Error('Windmill.config.context must be a reference to the Application or Stage.'); + throw new Error('FlexPilot.config.context must be a reference to the Application or Stage.'); } config.context = params.context; - // Allow script access to talk to the Windmill API + // Allow script access to talk to the FlexPilot API // via ExternalInterface from the following domains if ('domains' in params) { var domainsArr:Array = params.domain is Array ? params.domains : [params.domains]; config.domains = domainsArr; for each (var d:String in config.domains) { - Windmill.addDomain(d); + FlexPilot.addDomain(d); } } // Set up the locator map // ======== - WMLocator.init(); + FPLocator.init(); // Create dynamic asserts // ======== - WMAssert.init(); + FPAssert.init(); // Returns a wrapped version of the method that returns // the Error obj to JS-land instead of actually throwing @@ -133,7 +133,7 @@ package org.windmill { // show up via introspection with describeType, but // they *are there* -- add them manually by iterating // through the same list that used to build them - var asserts:* = WMAssert; + var asserts:* = FPAssert; for (methodName in asserts.assertTemplates) { ExternalInterface.addCallback('wm_' + methodName, genExtFunc(asserts[methodName])); @@ -143,12 +143,12 @@ package org.windmill { // Other misc ExternalInterface methods // ---------------- var miscMethods:Object = { - explorerStart: WMExplorer.start, - explorerStop: WMExplorer.stop, - recorderStart: WMRecorder.start, - recorderStop: WMRecorder.stop, + explorerStart: FPExplorer.start, + explorerStop: FPExplorer.stop, + recorderStart: FPRecorder.start, + recorderStop: FPRecorder.stop, runASTests: ASTest.run, - lookupFlash: WMLocator.lookupDisplayObjectBool + lookupFlash: FPLocator.lookupDisplayObjectBool } for (methodName in miscMethods) { ExternalInterface.addCallback('wm_' + methodName, @@ -186,8 +186,8 @@ package org.windmill { stage = context; } else { - throw new Error('Windmill.config.context must be a reference to an Application or Stage.' + - ' Perhaps Windmill.init has not run yet.'); + throw new Error('FlexPilot.config.context must be a reference to an Application or Stage.' + + ' Perhaps FlexPilot.init has not run yet.'); } return stage; } diff --git a/src/org/flex_pilot/TestCase.as b/src/org/flex_pilot/TestCase.as index 9639895..3686640 100644 --- a/src/org/flex_pilot/TestCase.as +++ b/src/org/flex_pilot/TestCase.as @@ -14,25 +14,25 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill { +package org.flex_pilot { import flash.display.Sprite; import flash.display.Stage; - import org.windmill.Windmill; - import org.windmill.WMAssert; - import org.windmill.WMWait; - import org.windmill.astest.ASTest; + import org.flex_pilot.FlexPilot; + import org.flex_pilot.FPAssert; + import org.flex_pilot.FPWait; + import org.flex_pilot.astest.ASTest; public class TestCase extends Sprite { - public var windmill:* = Windmill; - public var asserts:* = WMAssert; - public var waits:* = WMWait; + public var flex_pilot:* = FlexPilot; + public var asserts:* = FPAssert; + public var waits:* = FPWait; public var controller:* = ASTest.wrappedControllerMethods; // Reference to either an Application (Flex) // or the Stage (Flash) - public var context:* = Windmill.getContext(); + public var context:* = FlexPilot.getContext(); // Get a reference to the Stage in the base class // before the tests actually load so tests can all // reference it - private var fakeStage:Stage = Windmill.getStage(); + private var fakeStage:Stage = FlexPilot.getStage(); override public function get stage():Stage { return fakeStage; } diff --git a/src/org/flex_pilot/astest/ASTest.as b/src/org/flex_pilot/astest/ASTest.as index d97eda4..7edd48d 100644 --- a/src/org/flex_pilot/astest/ASTest.as +++ b/src/org/flex_pilot/astest/ASTest.as @@ -14,12 +14,12 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill.astest { - import org.windmill.Windmill; - import org.windmill.WMLocator; - import org.windmill.WMController; - import org.windmill.WMWait; - import org.windmill.WMLogger; +package org.flex_pilot.astest { + import org.flex_pilot.FlexPilot; + import org.flex_pilot.FPLocator; + import org.flex_pilot.FPController; + import org.flex_pilot.FPWait; + import org.flex_pilot.FPLogger; import flash.utils.*; import flash.external.ExternalInterface; @@ -52,18 +52,18 @@ package org.windmill.astest { public static var wrappedControllerMethods:Object = {}; public static function init():void { - var methodNames:Array = Windmill.packages.controller.methodNames; + var methodNames:Array = FlexPilot.packages.controller.methodNames; // Returns a controller action wrapped in a wait for the // desired DisplayObject -- action is passed as a callback - // to WMWait.forDisplayObject + // to FPWait.forDisplayObject var wrapAutoWait:Function = function (key:String):Function { return function (params:Object):void { - WMWait.forDisplayObject(params, function ():void { - WMController[key](params); + FPWait.forDisplayObject(params, function ():void { + FPController[key](params); }); } } - // For each controller-action method in WMController, + // For each controller-action method in FPController, // create an auto-wait-wrapped version to call from the // AS tests. 'controller' in the TestCase base class // points to wrappedControllerMethods @@ -164,10 +164,10 @@ package org.windmill.astest { res = ExternalInterface.call('wm_asTestResult', data); if (!res) { if (data.error) { - WMLogger.log('FAILURE: ' + data.error.message); + FPLogger.log('FAILURE: ' + data.error.message); } else { - WMLogger.log('SUCCESS'); + FPLogger.log('SUCCESS'); } } ASTest.previousTest = null; @@ -194,7 +194,7 @@ package org.windmill.astest { }; res = ExternalInterface.call('wm_asTestStart', data); if (!res) { - WMLogger.log('Running ' + test.className + '.' + test.methodName + ' ...'); + FPLogger.log('Running ' + test.className + '.' + test.methodName + ' ...'); } // Run the test diff --git a/src/org/flex_pilot/astest/ASTestLoader.as b/src/org/flex_pilot/astest/ASTestLoader.as index b830f47..58771e0 100644 --- a/src/org/flex_pilot/astest/ASTestLoader.as +++ b/src/org/flex_pilot/astest/ASTestLoader.as @@ -14,8 +14,8 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill.astest { - import org.windmill.WMLogger; +package org.flex_pilot.astest { + import org.flex_pilot.FPLogger; import flash.display.Loader; import flash.display.LoaderInfo; import flash.net.URLRequest; @@ -52,7 +52,7 @@ package org.windmill.astest { // Catch any error that occurs during async load loader.contentLoaderInfo.addEventListener( IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { - WMLogger.log('Could not load ' + url); + FPLogger.log('Could not load ' + url); }); // Handle successful load loader.contentLoaderInfo.addEventListener( diff --git a/src/org/flex_pilot/events/Events.as b/src/org/flex_pilot/events/Events.as index abd5280..d7efa82 100644 --- a/src/org/flex_pilot/events/Events.as +++ b/src/org/flex_pilot/events/Events.as @@ -14,8 +14,8 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill.events { - import org.windmill.events.*; +package org.flex_pilot.events { + import org.flex_pilot.events.*; import flash.events.* import mx.events.* @@ -78,7 +78,7 @@ package org.windmill.events { ['delta', 0] ]; var p:Object = Events.normalizeParams(defaults, args); - var ev:WMMouseEvent = new WMMouseEvent(type, p.bubbles, + var ev:FPMouseEvent = new FPMouseEvent(type, p.bubbles, p.cancelable, p.localX, p.localY, p.relatedObject, p.ctrlKey, p.altKey, p.shiftKey, p.buttonDown, p.delta); @@ -106,7 +106,7 @@ package org.windmill.events { ['text', ''] ]; var p:Object = Events.normalizeParams(defaults, args); - var ev:WMTextEvent = new WMTextEvent(type, p.bubbles, + var ev:FPTextEvent = new FPTextEvent(type, p.bubbles, p.cancelable, p.text); obj.dispatchEvent(ev); } @@ -122,7 +122,7 @@ package org.windmill.events { ['keyCode', 0] ]; var p:Object = Events.normalizeParams(defaults, args); - var ev:WMFocusEvent = new WMFocusEvent(type, p.bubbles, + var ev:FPFocusEvent = new FPFocusEvent(type, p.bubbles, p.cancelable, p.relatedObject, p.shiftKey, p.keyCode); obj.dispatchEvent(ev); } @@ -141,7 +141,7 @@ package org.windmill.events { ['shiftKey', false] ]; var p:Object = Events.normalizeParams(defaults, args); - var ev:WMKeyboardEvent = new WMKeyboardEvent(type, p.bubbles, + var ev:FPKeyboardEvent = new FPKeyboardEvent(type, p.bubbles, p.cancelable, p.charCode, p.keyCode, p.keyLocation, p.ctrlKey, p.altKey, p.shiftKey); obj.dispatchEvent(ev); @@ -158,7 +158,7 @@ package org.windmill.events { ['itemRenderer', null] ]; var p:Object = Events.normalizeParams(defaults, args); - var ev:WMListEvent = new WMListEvent(type, p.bubbles, + var ev:FPListEvent = new FPListEvent(type, p.bubbles, p.cancelable, p.columnIndex, p.rowIndex, p.reason, p.itemRenderer); obj.dispatchEvent(ev); diff --git a/src/org/flex_pilot/events/WMFocusEvent.as b/src/org/flex_pilot/events/FPFocusEvent.as similarity index 88% rename from src/org/flex_pilot/events/WMFocusEvent.as rename to src/org/flex_pilot/events/FPFocusEvent.as index 9c4d33d..b6c325e 100644 --- a/src/org/flex_pilot/events/WMFocusEvent.as +++ b/src/org/flex_pilot/events/FPFocusEvent.as @@ -14,12 +14,12 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill.events { +package org.flex_pilot.events { import flash.events.FocusEvent; import flash.display.InteractiveObject; - public class WMFocusEvent extends FocusEvent { - public function WMFocusEvent(type:String, + public class FPFocusEvent extends FocusEvent { + public function FPFocusEvent(type:String, bubbles:Boolean = true, cancelable:Boolean = false, relatedObject:InteractiveObject = null, shiftKey:Boolean = false, keyCode:uint = 0) { diff --git a/src/org/flex_pilot/events/WMKeyboardEvent.as b/src/org/flex_pilot/events/FPKeyboardEvent.as similarity index 87% rename from src/org/flex_pilot/events/WMKeyboardEvent.as rename to src/org/flex_pilot/events/FPKeyboardEvent.as index 947b661..dfb74cd 100644 --- a/src/org/flex_pilot/events/WMKeyboardEvent.as +++ b/src/org/flex_pilot/events/FPKeyboardEvent.as @@ -14,12 +14,12 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill.events { +package org.flex_pilot.events { import flash.events.KeyboardEvent; - public class WMKeyboardEvent extends KeyboardEvent { - public function WMKeyboardEvent(type:String, + public class FPKeyboardEvent extends KeyboardEvent { + public function FPKeyboardEvent(type:String, bubbles:Boolean = true, cancelable:Boolean = false, charCode:uint = 0, keyCode:uint = 0, keyLocation:uint = 0, ctrlKey:Boolean = false, diff --git a/src/org/flex_pilot/events/WMListEvent.as b/src/org/flex_pilot/events/FPListEvent.as similarity index 88% rename from src/org/flex_pilot/events/WMListEvent.as rename to src/org/flex_pilot/events/FPListEvent.as index 3d81ae6..fa745d2 100644 --- a/src/org/flex_pilot/events/WMListEvent.as +++ b/src/org/flex_pilot/events/FPListEvent.as @@ -14,12 +14,12 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill.events { +package org.flex_pilot.events { import mx.events.ListEvent; import mx.controls.listClasses.IListItemRenderer; - public class WMListEvent extends ListEvent { - public function WMListEvent(type:String, + public class FPListEvent extends ListEvent { + public function FPListEvent(type:String, bubbles:Boolean = false, cancelable:Boolean = false, columnIndex:int = -1, rowIndex:int = -1, reason:String = null, itemRenderer:IListItemRenderer = null) { diff --git a/src/org/flex_pilot/events/WMMouseEvent.as b/src/org/flex_pilot/events/FPMouseEvent.as similarity index 92% rename from src/org/flex_pilot/events/WMMouseEvent.as rename to src/org/flex_pilot/events/FPMouseEvent.as index 504b2ed..82fe2e1 100644 --- a/src/org/flex_pilot/events/WMMouseEvent.as +++ b/src/org/flex_pilot/events/FPMouseEvent.as @@ -14,16 +14,16 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill.events { +package org.flex_pilot.events { import flash.events.MouseEvent; import flash.display.InteractiveObject; - public class WMMouseEvent extends MouseEvent { + public class FPMouseEvent extends MouseEvent { private var fakeStageX:Number; private var fakeStageY:Number; - public function WMMouseEvent(type:String, + public function FPMouseEvent(type:String, bubbles:Boolean = false, cancelable:Boolean = false, localX:Number = NaN, localY:Number = NaN, relatedObject:InteractiveObject = null, diff --git a/src/org/flex_pilot/events/WMTextEvent.as b/src/org/flex_pilot/events/FPTextEvent.as similarity index 86% rename from src/org/flex_pilot/events/WMTextEvent.as rename to src/org/flex_pilot/events/FPTextEvent.as index a61107f..5d8a203 100644 --- a/src/org/flex_pilot/events/WMTextEvent.as +++ b/src/org/flex_pilot/events/FPTextEvent.as @@ -14,11 +14,11 @@ Copyright 2009, Matthew Eernisse (mde@fleegix.org) and Slide, Inc. limitations under the License. */ -package org.windmill.events { +package org.flex_pilot.events { import flash.events.TextEvent; - public class WMTextEvent extends TextEvent { - public function WMTextEvent(type:String, + public class FPTextEvent extends TextEvent { + public function FPTextEvent(type:String, bubbles:Boolean = false, cancelable:Boolean = false, text:String = "") { super(type, bubbles, cancelable, text); diff --git a/src/util/DOMEventDrag.as b/src/util/DOMEventDrag.as index c92b08f..110379c 100644 --- a/src/util/DOMEventDrag.as +++ b/src/util/DOMEventDrag.as @@ -24,7 +24,7 @@ package util { * Replacement for AS3 Sprite startDrag/stopDrag * using only DOM events. * This allows the drag/drop action to be automated - * using Windmill or other automation frameworks + * using FlexPilot or other automation frameworks * that rely on simulated user events */ public class DOMEventDrag { diff --git a/tests/TestAppCode.as b/tests/TestAppCode.as index 8d4fa7b..d745c1f 100644 --- a/tests/TestAppCode.as +++ b/tests/TestAppCode.as @@ -30,7 +30,7 @@ package { import flash.display.Sprite; import flash.geom.Point; import flash.external.ExternalInterface; - import org.windmill.WMBootstrap; + import org.flex_pilot.FPBootstrap; public class TestAppCode extends MovieClip { @@ -53,7 +53,7 @@ package { var panel:Panel = new Panel(); context.addChild(panel); panel.id = 'mainPanel'; - panel.title = "Windmill Flash Tests"; + panel.title = "FlexPilot Flash Tests"; // TextArea var txtArea:TextArea = new TextArea(); @@ -117,7 +117,7 @@ package { context.doubleClickEnabled = true; - WMBootstrap.init(context); + FPBootstrap.init(context); /* // Focus stg.addEventListener(FocusEvent.FOCUS_IN, evHandler); @@ -145,15 +145,15 @@ package { /* - org.windmill.WMController.click({ + org.flex_pilot.FPController.click({ label: 'Howdy' }); - org.windmill.WMController.click({ + org.flex_pilot.FPController.click({ link: 'This is a test link' }); - org.windmill.WMController.type({ + org.flex_pilot.FPController.type({ name: 'testText', text: 'Howdy, sir.' }); diff --git a/tests/TestBar.as b/tests/TestBar.as index 427a6e5..d43a4a7 100644 --- a/tests/TestBar.as +++ b/tests/TestBar.as @@ -1,5 +1,5 @@ package { - import org.windmill.TestCase; + import org.flex_pilot.TestCase; public class TestBar extends TestCase { public function testUiop():void { diff --git a/tests/TestFoo.as b/tests/TestFoo.as index ff8b51a..db3b9a1 100644 --- a/tests/TestFoo.as +++ b/tests/TestFoo.as @@ -1,5 +1,5 @@ package { - import org.windmill.TestCase; + import org.flex_pilot.TestCase; public class TestFoo extends TestCase { public var order:Array = ['testClick', 'testClickTimeout', 'testWaitCondition', 'testWaitConditionTimeout', 'testWaitSleep', 'testAssertDisplayObject', 'testWaitDisplayObject', 'testAssertEqualsString',