http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/FlowModelTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/FlowModelTest.as b/automation_tests/src/UnitTest/Tests/FlowModelTest.as index 501cd27..ea0d482 100644 --- a/automation_tests/src/UnitTest/Tests/FlowModelTest.as +++ b/automation_tests/src/UnitTest/Tests/FlowModelTest.as @@ -67,7 +67,9 @@ package UnitTest.Tests import mx.core.FTETextField; import mx.utils.LoaderUtil; - use namespace tlf_internal; + import org.flexunit.asserts.assertTrue; + + use namespace tlf_internal; public class FlowModelTest extends VellumTestCase { @@ -212,11 +214,11 @@ package UnitTest.Tests // put the two spans in the paragraph p.replaceChildren(0,0,s); - CONFIG::debug { assertTrue("debugCheckFlowElement() failed after adding one span", - p.debugCheckFlowElement() == 0); } + /*CONFIG::debug { assertTrue("debugCheckFlowElement() failed after adding one span", + p.debugCheckFlowElement() == 0); } */ p.replaceChildren(1,1,nextSpan); - CONFIG::debug { assertTrue("debugCheckFlowElement() failed after adding second span", - p.debugCheckFlowElement() == 0); } + /*CONFIG::debug { assertTrue("debugCheckFlowElement() failed after adding second span", + p.debugCheckFlowElement() == 0); } */ assertTrue("expected the element count to be 2, but it was " + p.numChildren, p.numChildren == 2); @@ -224,15 +226,15 @@ package UnitTest.Tests s = new SpanElement(); s.text = "Start:" p.replaceChildren(0,0,s); - CONFIG::debug { assertTrue("debugCheckFlowElement() failed after adding third span", - p.debugCheckFlowElement() == 0); } + /* CONFIG::debug { assertTrue("debugCheckFlowElement() failed after adding third span", + p.debugCheckFlowElement() == 0); } */ // put the paragraph in the TextFlow textFlow.replaceChildren(0,0,p); assertTrue("text flow should have one element but has " + textFlow.numChildren, textFlow.numChildren == 1); - CONFIG::debug { assertTrue("debugCheckFlowElement() failed after adding para to flow", - textFlow.debugCheckFlowElement() == 0) } + /* CONFIG::debug { assertTrue("debugCheckFlowElement() failed after adding para to flow", + textFlow.debugCheckFlowElement() == 0) } */ // make another paragraph p = new ParagraphElement(); @@ -249,8 +251,8 @@ package UnitTest.Tests // into the textFlow at the beginning textFlow.replaceChildren(0,0,p); - CONFIG::debug {assertTrue("debugCheckFlowElement() failed after adding para to beginning", - textFlow.debugCheckFlowElement() == 0); } + /*CONFIG::debug {assertTrue("debugCheckFlowElement() failed after adding para to beginning", + textFlow.debugCheckFlowElement() == 0); } */ // generic end to an API test endAPITest();
http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/FontEmbedTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/FontEmbedTest.as b/automation_tests/src/UnitTest/Tests/FontEmbedTest.as index f8488f2..52fe7c9 100644 --- a/automation_tests/src/UnitTest/Tests/FontEmbedTest.as +++ b/automation_tests/src/UnitTest/Tests/FontEmbedTest.as @@ -39,8 +39,10 @@ package UnitTest.Tests import mx.utils.LoaderUtil; + import org.flexunit.asserts.assertTrue; - public class FontEmbedTest extends VellumTestCase + + public class FontEmbedTest extends VellumTestCase { public function FontEmbedTest(methodName:String, testID:String, testConfig:TestConfig, testCaseXML:XML=null) { @@ -66,9 +68,9 @@ package UnitTest.Tests ldr = new Loader(); thing1.addChild(ldr); ldr.load(new URLRequest(LoaderUtil.createAbsoluteURL(baseURL,"../../asTestApps/moduleFontLoss.swf"))); - var func:Function = addAsync(finished_loading, 10000, null); + /* var func:Function = addAsync(finished_loading, 10000, null); ldr.contentLoaderInfo.addEventListener(Event.COMPLETE, func, false, 0, true); - ldr.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, func, false, 0, true); + ldr.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, func, false, 0, true); */ } public function embeddedFontsDisplayTest():void @@ -82,9 +84,9 @@ package UnitTest.Tests ldr = new Loader(); thing1.addChild(ldr); ldr.load(new URLRequest(LoaderUtil.createAbsoluteURL(baseURL,"../../asTestApps/moduleFontDisplay.swf"))); - var func:Function = addAsync(finished_loading, 10000, null); + /*var func:Function = addAsync(finished_loading, 10000, null); ldr.contentLoaderInfo.addEventListener(Event.COMPLETE, func, false, 0, true); - ldr.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, func, false, 0, true); + ldr.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, func, false, 0, true); */ } public function finished_loading (e:Event):void http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/GeneralFunctionsTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/GeneralFunctionsTest.as b/automation_tests/src/UnitTest/Tests/GeneralFunctionsTest.as index 955932e..134f99c 100644 --- a/automation_tests/src/UnitTest/Tests/GeneralFunctionsTest.as +++ b/automation_tests/src/UnitTest/Tests/GeneralFunctionsTest.as @@ -45,7 +45,11 @@ package UnitTest.Tests import flashx.textLayout.operations.UndoOperation; import flashx.textLayout.tlf_internal; import flashx.undo.UndoManager; - use namespace tlf_internal; + + import org.flexunit.asserts.assertTrue; + import org.flexunit.asserts.fail; + + use namespace tlf_internal; public class GeneralFunctionsTest extends VellumTestCase http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/HorizontalScrollingTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/HorizontalScrollingTest.as b/automation_tests/src/UnitTest/Tests/HorizontalScrollingTest.as index c658071..1ea08ae 100644 --- a/automation_tests/src/UnitTest/Tests/HorizontalScrollingTest.as +++ b/automation_tests/src/UnitTest/Tests/HorizontalScrollingTest.as @@ -29,9 +29,10 @@ package UnitTest.Tests import flashx.textLayout.formats.BlockProgression; import flashx.textLayout.container.ContainerController; + import org.flexunit.asserts.assertTrue; - public class HorizontalScrollingTest extends VellumTestCase + public class HorizontalScrollingTest extends VellumTestCase { // List of available keyboard gestures // Note that on Mac: CTRL == COMMAND @@ -96,17 +97,17 @@ package UnitTest.Tests VellumTestCase.suiteFromXML(testCaseClass, testListXML, testConfig, ts); } - public override function setUp():void + public override function setUpTest():void { // Booga - Need to load up the test file here. - super.setUp(); + super.setUpTest(); } - public override function tearDown():void + public override function tearDownTest():void { // Restore default configurations - super.tearDown(); + super.tearDownTest(); } http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/ImpliedParagraphTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/ImpliedParagraphTest.as b/automation_tests/src/UnitTest/Tests/ImpliedParagraphTest.as index 586f080..4d0c3fe 100644 --- a/automation_tests/src/UnitTest/Tests/ImpliedParagraphTest.as +++ b/automation_tests/src/UnitTest/Tests/ImpliedParagraphTest.as @@ -28,7 +28,9 @@ package UnitTest.Tests import flashx.textLayout.conversion.TextConverter; import flashx.textLayout.elements.TextFlow; - public class ImpliedParagraphTest extends VellumTestCase + import org.flexunit.asserts.assertTrue; + + public class ImpliedParagraphTest extends VellumTestCase { public function ImpliedParagraphTest(methodName:String, testID:String, testConfig:TestConfig, testCaseXML:XML=null) { http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/ImportAPITest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/ImportAPITest.as b/automation_tests/src/UnitTest/Tests/ImportAPITest.as index 7021fd9..b56746a 100644 --- a/automation_tests/src/UnitTest/Tests/ImportAPITest.as +++ b/automation_tests/src/UnitTest/Tests/ImportAPITest.as @@ -43,7 +43,9 @@ package UnitTest.Tests import flashx.textLayout.formats.Direction; import flashx.textLayout.tlf_internal; - use namespace tlf_internal; + import org.flexunit.asserts.assertTrue; + + use namespace tlf_internal; public class ImportAPITest extends VellumTestCase { http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/ImportTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/ImportTest.as b/automation_tests/src/UnitTest/Tests/ImportTest.as index 95981ea..696427c 100644 --- a/automation_tests/src/UnitTest/Tests/ImportTest.as +++ b/automation_tests/src/UnitTest/Tests/ImportTest.as @@ -44,7 +44,9 @@ package UnitTest.Tests import flashx.textLayout.formats.BlockProgression; import flashx.textLayout.formats.TextLayoutFormat; - public class ImportTest extends VellumTestCase + import org.flexunit.asserts.assertTrue; + + public class ImportTest extends VellumTestCase { //private var importFileName:String; @@ -86,10 +88,10 @@ package UnitTest.Tests checkForInlines(); } - override public function tearDown():void + override public function tearDownTest():void { compareResultsToFactory(); - super.tearDown(); + super.tearDownTest(); } @@ -140,8 +142,8 @@ package UnitTest.Tests for (var leaf:FlowLeafElement = textFlow.getFirstLeaf(); leaf != null; leaf = leaf.getNextLeaf()) if (leaf is InlineGraphicElement && InlineGraphicElement(leaf).status != InlineGraphicElementStatus.READY) notReadyGraphicsCount++; - if (notReadyGraphicsCount != 0) - textFlow.addEventListener(StatusChangeEvent.INLINE_GRAPHIC_STATUS_CHANGE,addAsync(checkForInlines,2500,null),false,0,true); + /*if (notReadyGraphicsCount != 0) + textFlow.addEventListener(StatusChangeEvent.INLINE_GRAPHIC_STATUS_CHANGE,addAsync(checkForInlines,2500,null),false,0,true);*/ } else { @@ -150,16 +152,16 @@ package UnitTest.Tests { case InlineGraphicElementStatus.LOADING: case InlineGraphicElementStatus.SIZE_PENDING: - textFlow.addEventListener(StatusChangeEvent.INLINE_GRAPHIC_STATUS_CHANGE,addAsync(checkForInlines,2500,null),false,0,true); + // textFlow.addEventListener(StatusChangeEvent.INLINE_GRAPHIC_STATUS_CHANGE,addAsync(checkForInlines,2500,null),false,0,true); break; case InlineGraphicElementStatus.READY: notReadyGraphicsCount--; - if (notReadyGraphicsCount != 0) + /* if (notReadyGraphicsCount != 0) textFlow.addEventListener(StatusChangeEvent.INLINE_GRAPHIC_STATUS_CHANGE,addAsync(checkForInlines,2500,null),false,0,true); else if (textFlow.flowComposer.composing) textFlow.addEventListener(UpdateCompleteEvent.UPDATE_COMPLETE,addAsync(updateCompletionHandler,2500,null),false,0,true); else - textFlow.flowComposer.updateAllControllers(); + textFlow.flowComposer.updateAllControllers(); */ break; default: assertTrue("unexpected StatusChangeEvent status: "+event.status,false); http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/KeyboardGestureTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/KeyboardGestureTest.as b/automation_tests/src/UnitTest/Tests/KeyboardGestureTest.as index b1e2777..f95e8a3 100644 --- a/automation_tests/src/UnitTest/Tests/KeyboardGestureTest.as +++ b/automation_tests/src/UnitTest/Tests/KeyboardGestureTest.as @@ -45,7 +45,10 @@ package UnitTest.Tests import mx.utils.LoaderUtil; - public class KeyboardGestureTest extends VellumTestCase + import org.flexunit.asserts.assertTrue; + import org.flexunit.asserts.fail; + + public class KeyboardGestureTest extends VellumTestCase { private var version:Number; @@ -70,9 +73,9 @@ package UnitTest.Tests private const BASIC_TEST:String = "This is a test of the keyboard gesture system."; private const HYPHEN_TEST:String = "This is-a test-of-the keyboard-gesture system.-"; - public override function setUp():void + public override function setUpTest():void { - super.setUp(); + super.setUpTest(); SelManager.selectAll(); SelManager.deleteNextCharacter(); http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/LeadingTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/LeadingTest.as b/automation_tests/src/UnitTest/Tests/LeadingTest.as index 8039461..5221386 100644 --- a/automation_tests/src/UnitTest/Tests/LeadingTest.as +++ b/automation_tests/src/UnitTest/Tests/LeadingTest.as @@ -51,7 +51,9 @@ package UnitTest.Tests import mx.core.UIComponent; import mx.utils.LoaderUtil; - use namespace tlf_internal; + import org.flexunit.asserts.assertTrue; + + use namespace tlf_internal; public class LeadingTest extends VellumTestCase { http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/LinkTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/LinkTest.as b/automation_tests/src/UnitTest/Tests/LinkTest.as index 6b4ea1a..dc56181 100644 --- a/automation_tests/src/UnitTest/Tests/LinkTest.as +++ b/automation_tests/src/UnitTest/Tests/LinkTest.as @@ -44,7 +44,9 @@ package UnitTest.Tests import mx.containers.Canvas; - use namespace tlf_internal; + import org.flexunit.asserts.assertTrue; + + use namespace tlf_internal; public class LinkTest extends VellumTestCase @@ -110,7 +112,7 @@ package UnitTest.Tests ts.addTestDescriptor(new TestDescriptor (LinkTest, "partlyComposingTest", customTestConfig ) ); } - override public function setUp() : void + override public function setUpTest() : void { if (containerType == "custom") { @@ -118,7 +120,7 @@ package UnitTest.Tests } else { - super.setUp(); + super.setUpTest(); } } @@ -996,7 +998,7 @@ package UnitTest.Tests var bounds:Rectangle = boundsInfo.rect as Rectangle; var textLine:TextLine = boundsInfo.textLine; - tf.addEventListener("customEvent", addAsync(checkEvent,2500,null),false,0,true); + //tf.addEventListener("customEvent", addAsync(checkEvent,2500,null),false,0,true); tf.flowComposer.updateAllControllers(); tf.interactionManager = null; @@ -1040,7 +1042,7 @@ package UnitTest.Tests tf.flowComposer.addController(cc); tf.flowComposer.updateAllControllers(); - link.getEventMirror().addEventListener("customEvent", addAsync(checkEvent,2500,null),false,0,true); + //link.getEventMirror().addEventListener("customEvent", addAsync(checkEvent,2500,null),false,0,true); tf.flowComposer.updateAllControllers(); var editmanager:EditManager = new EditManager(); @@ -1076,7 +1078,7 @@ package UnitTest.Tests var span:SpanElement = new SpanElement(); span.text = "Hello world"; span.fontSize = 16; - span.getEventMirror().addEventListener(FlowElementMouseEvent.MOUSE_DOWN, addAsync(checkMouseDownEvent,2500,null),false,0,true); + //span.getEventMirror().addEventListener(FlowElementMouseEvent.MOUSE_DOWN, addAsync(checkMouseDownEvent,2500,null),false,0,true); p.addChild(span); var container:Sprite = new Sprite(); var TestCanvas:Canvas = testApp.getDisplayObject(); @@ -1117,7 +1119,7 @@ package UnitTest.Tests var span:SpanElement = new SpanElement(); span.text = "Hello world"; span.fontSize = 16; - span.getEventMirror().addEventListener(FlowElementMouseEvent.CLICK, addAsync(checkMouseClickEvent,2500,null),false,0,true); + // span.getEventMirror().addEventListener(FlowElementMouseEvent.CLICK, addAsync(checkMouseClickEvent,2500,null),false,0,true); p.addChild(span); var container:Sprite = new Sprite(); var TestCanvas:Canvas = testApp.getDisplayObject(); @@ -1162,7 +1164,7 @@ package UnitTest.Tests var span:SpanElement = new SpanElement(); span.text = "Hello world"; span.fontSize = 16; - span.getEventMirror().addEventListener(FlowElementMouseEvent.MOUSE_MOVE, addAsync(checkMouseMoveEvent,2500,null),false,0,true); + //span.getEventMirror().addEventListener(FlowElementMouseEvent.MOUSE_MOVE, addAsync(checkMouseMoveEvent,2500,null),false,0,true); p.addChild(span); var container:Sprite = new Sprite(); var TestCanvas:Canvas = testApp.getDisplayObject(); @@ -1204,7 +1206,7 @@ package UnitTest.Tests var span:SpanElement = new SpanElement(); span.text = "Hello world"; span.fontSize = 16; - span.getEventMirror().addEventListener(FlowElementMouseEvent.MOUSE_UP, addAsync(checkMouseUpEvent,2500,null),false,0,true); + // span.getEventMirror().addEventListener(FlowElementMouseEvent.MOUSE_UP, addAsync(checkMouseUpEvent,2500,null),false,0,true); p.addChild(span); var container:Sprite = new Sprite(); var TestCanvas:Canvas = testApp.getDisplayObject(); @@ -1243,7 +1245,7 @@ package UnitTest.Tests var span:SpanElement = new SpanElement(); span.text = "Hello world"; span.fontSize = 16; - span.getEventMirror().addEventListener(FlowElementMouseEvent.ROLL_OVER, addAsync(checkMouseRollOverEvent,2500,null),false,0,true); + // span.getEventMirror().addEventListener(FlowElementMouseEvent.ROLL_OVER, addAsync(checkMouseRollOverEvent,2500,null),false,0,true); p.addChild(span); var container:Sprite = new Sprite(); var TestCanvas:Canvas = testApp.getDisplayObject(); @@ -1284,7 +1286,7 @@ package UnitTest.Tests var span:SpanElement = new SpanElement(); span.text = "Hello world"; span.fontSize = 16; - span.getEventMirror().addEventListener(FlowElementMouseEvent.ROLL_OUT, addAsync(checkMouseRollOutEvent,2500,null),false,0,true); + // span.getEventMirror().addEventListener(FlowElementMouseEvent.ROLL_OUT, addAsync(checkMouseRollOutEvent,2500,null),false,0,true); p.addChild(span); var container:Sprite = new Sprite(); var TestCanvas:Canvas = testApp.getDisplayObject(); @@ -1434,19 +1436,19 @@ package UnitTest.Tests //get the first paragraph var span1:SpanElement = textFlow.getFirstLeaf() as SpanElement; var para1:ParagraphElement = span1.parent as ParagraphElement; - assertTrue("The number of interactive children does not equal 2", para1._interactiveChildrenCount == 2); + assertTrue("The number of interactive children does not equal 2", para3::tlf_internal.interactiveChildrenCount == 2); //get the second paragraph var para2:ParagraphElement = para1.getNextSibling() as ParagraphElement; - assertTrue("The number of interactive children does not equal 0", para2._interactiveChildrenCount == 0); + assertTrue("The number of interactive children does not equal 0", para3::tlf_internal.interactiveChildrenCount == 0); //get the third paragraph var para3:ParagraphElement = textFlow.getChildAt(1) as ParagraphElement; - assertTrue("The number of interactive children does not equal 0", para3._interactiveChildrenCount == 0); + assertTrue("The number of interactive children does not equal 0", para3::tlf_internal.interactiveChildrenCount == 0); // editmanager.applyLink("www.adobe.com", "_self", false, new SelectionState(textFlow, 0, 6)); - assertTrue("The number of interactive children is incorrect after apply link", para1._interactiveChildrenCount == 3); + assertTrue("The number of interactive children is incorrect after apply link", para3::tlf_internal.interactiveChildrenCount == 3); // editmanager.applyLink(null, null, false, new SelectionState(textFlow, 0, 6)); - assertTrue("The number of interactive children is incorrect after cancel the link", para1._interactiveChildrenCount == 2); + assertTrue("The number of interactive children is incorrect after cancel the link", para3::tlf_internal.interactiveChildrenCount == 2); } public function partlyComposingTest():void http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/ListTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/ListTest.as b/automation_tests/src/UnitTest/Tests/ListTest.as index 46b1429..d1ca0d0 100644 --- a/automation_tests/src/UnitTest/Tests/ListTest.as +++ b/automation_tests/src/UnitTest/Tests/ListTest.as @@ -54,8 +54,10 @@ package UnitTest.Tests import flashx.textLayout.tlf_internal; import mx.containers.Canvas; - - use namespace tlf_internal; + + import org.flexunit.asserts.assertTrue; + + use namespace tlf_internal; public class ListTest extends VellumTestCase { @@ -66,7 +68,7 @@ package UnitTest.Tests // Note: These must correspond to a Watson product area (case-sensitive) metaData.productArea = "Lists"; } - override public function setUp() : void + override public function setUpTest() : void { if (containerType == "custom") { @@ -74,7 +76,7 @@ package UnitTest.Tests } else { - super.setUp(); + super.setUpTest(); } } public static function suite(testConfig:TestConfig, ts:TestSuiteExtended):void http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/LocaleTests.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/LocaleTests.as b/automation_tests/src/UnitTest/Tests/LocaleTests.as index 1b7281f..650f7d3 100644 --- a/automation_tests/src/UnitTest/Tests/LocaleTests.as +++ b/automation_tests/src/UnitTest/Tests/LocaleTests.as @@ -34,7 +34,9 @@ package UnitTest.Tests import flashx.textLayout.formats.TextLayoutFormat; import flashx.textLayout.tlf_internal; - use namespace tlf_internal; + import org.flexunit.asserts.assertTrue; + + use namespace tlf_internal; public class LocaleTests extends VellumTestCase { http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/MXMLCompilationTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/MXMLCompilationTest.as b/automation_tests/src/UnitTest/Tests/MXMLCompilationTest.as index 85a9b46..4af57bd 100644 --- a/automation_tests/src/UnitTest/Tests/MXMLCompilationTest.as +++ b/automation_tests/src/UnitTest/Tests/MXMLCompilationTest.as @@ -36,7 +36,9 @@ package UnitTest.Tests import flashx.textLayout.elements.TextFlow; import flashx.textLayout.tlf_internal; - import spark.components.Group; + import org.flexunit.asserts.assertTrue; + + import spark.components.Group; import spark.components.RichText; use namespace tlf_internal; @@ -58,7 +60,7 @@ package UnitTest.Tests public function MXMLCompilationTest(methodName:String, testID:String, testConfig:TestConfig, testCaseXML:XML=null) { //baseURL = testConfig.baseURL ; - super("LoadSWF", testConfig, testCaseXML); + super("LoadSWF", testID, testConfig, testCaseXML); } public static function suite(testConfig:TestConfig, ts:TestSuiteExtended):void @@ -81,9 +83,9 @@ package UnitTest.Tests var swfFile:String = (TestData.testFile as String).replace(".xml","") + ".swf"; swfLloader = new Loader(); - var func:Function = addAsync(onLoadSWFComplete, 10000, null); + /* var func:Function = addAsync(onLoadSWFComplete, 10000, null); swfLloader.contentLoaderInfo.addEventListener(Event.COMPLETE, func, false, 0, true); - swfLloader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, func, false, 0, true); + swfLloader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, func, false, 0, true); */ swfLloader.load(new URLRequest("./mxmlTestApps/"+swfFile)); } http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/MeasurementGridTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/MeasurementGridTest.as b/automation_tests/src/UnitTest/Tests/MeasurementGridTest.as index 2269583..9429309 100644 --- a/automation_tests/src/UnitTest/Tests/MeasurementGridTest.as +++ b/automation_tests/src/UnitTest/Tests/MeasurementGridTest.as @@ -50,8 +50,11 @@ package UnitTest.Tests import flashx.textLayout.formats.ITextLayoutFormat; import flashx.textLayout.formats.TextLayoutFormat; import flashx.textLayout.tlf_internal; - - use namespace tlf_internal; + + import org.flexunit.asserts.assertTrue; + import org.flexunit.asserts.fail; + + use namespace tlf_internal; import mx.containers.Canvas; import mx.utils.LoaderUtil; @@ -203,13 +206,13 @@ package UnitTest.Tests } // end of IEventDispatcher functions - override public function setUp() : void + override public function setUpTest() : void { cleanUpTestApp(); TestDisplayObject = testApp.getDisplayObject(); if (!TestDisplayObject) { - fail ("Did not get a blank canvas to work with"); + fail("Did not get a blank canvas to work with"); } } @@ -323,8 +326,8 @@ package UnitTest.Tests var textFlowArray:Array = createTextFlows(sampleText); if (notReadyGraphicsCount > 0) { - addEventListener("spriteInUse", addAsync(spriteHandler, 5000, - [xOrigin, yOrigin, width, height, sampleText, format]), false, 0, true); + /* addEventListener("spriteInUse", addAsync(spriteHandler, 5000, + [xOrigin, yOrigin, width, height, sampleText, format]), false, 0, true); */ addTestSet(xOrigin, yOrigin, width, height, textFlowArray, format, _creationType, _lineBreak, marginOfError); } else http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cad064e0/automation_tests/src/UnitTest/Tests/MeasurementTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/MeasurementTest.as b/automation_tests/src/UnitTest/Tests/MeasurementTest.as index 8ab970c..fb7742c 100644 --- a/automation_tests/src/UnitTest/Tests/MeasurementTest.as +++ b/automation_tests/src/UnitTest/Tests/MeasurementTest.as @@ -48,7 +48,9 @@ package UnitTest.Tests import flashx.textLayout.formats.VerticalAlign; import flashx.textLayout.tlf_internal; - use namespace tlf_internal; + import org.flexunit.asserts.assertTrue; + + use namespace tlf_internal;
