Repository: flex-tlf Updated Branches: refs/heads/develop 5634c7e5a -> 804639866
Migrate ScrollToRangeTest to FU 4 Ignored test: aliceTest Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/80463986 Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/80463986 Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/80463986 Branch: refs/heads/develop Commit: 804639866a61a2418aae7ef54d1b59dd6d477173 Parents: 5634c7e Author: piotrz <[email protected]> Authored: Sun May 10 13:11:10 2015 +0200 Committer: piotrz <[email protected]> Committed: Sun May 10 13:11:10 2015 +0200 ---------------------------------------------------------------------- automation_tests/src/AllTestsSuite.as | 2 + .../src/UnitTest/Tests/ScrollToRangeTest.as | 123 +++++++++++-------- 2 files changed, 72 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/80463986/automation_tests/src/AllTestsSuite.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/AllTestsSuite.as b/automation_tests/src/AllTestsSuite.as index 6464036..933cb2c 100644 --- a/automation_tests/src/AllTestsSuite.as +++ b/automation_tests/src/AllTestsSuite.as @@ -48,6 +48,7 @@ package import UnitTest.Tests.MeasurementTest; import UnitTest.Tests.OperationTest; import UnitTest.Tests.ParagraphTest; + import UnitTest.Tests.ScrollToRangeTest; import UnitTest.Tests.ScrollingTest; import UnitTest.Tests.SelectionTest; import UnitTest.Tests.SpacingTest; @@ -108,6 +109,7 @@ package public var paragraphTest:ParagraphTest; public var measurementTest:MeasurementTest; public var leadingTest:LeadingTest; + public var scrollToRangeTest:ScrollToRangeTest; } } http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/80463986/automation_tests/src/UnitTest/Tests/ScrollToRangeTest.as ---------------------------------------------------------------------- diff --git a/automation_tests/src/UnitTest/Tests/ScrollToRangeTest.as b/automation_tests/src/UnitTest/Tests/ScrollToRangeTest.as index 14dd6d9..5581f83 100644 --- a/automation_tests/src/UnitTest/Tests/ScrollToRangeTest.as +++ b/automation_tests/src/UnitTest/Tests/ScrollToRangeTest.as @@ -26,15 +26,16 @@ package UnitTest.Tests { - import UnitTest.ExtendedClasses.TestSuiteExtended; + import UnitTest.ExtendedClasses.TestConfigurationLoader; import UnitTest.ExtendedClasses.VellumTestCase; + import UnitTest.Fixtures.TestCaseVo; import UnitTest.Fixtures.TestConfig; - + import flash.display.Graphics; import flash.display.Sprite; import flash.geom.Rectangle; import flash.text.engine.TextLine; - + import flashx.textLayout.compose.TextFlowLine; import flashx.textLayout.container.ContainerController; import flashx.textLayout.conversion.TextConverter; @@ -45,20 +46,35 @@ package UnitTest.Tests import flashx.textLayout.formats.LineBreak; import flashx.textLayout.formats.TextLayoutFormat; import flashx.textLayout.utils.GeometryUtil; - + import mx.containers.Canvas; - import org.flexunit.asserts.assertTrue; - import org.flexunit.asserts.fail; + import org.flexunit.asserts.assertTrue; + import org.flexunit.asserts.fail; + [TestCase(order=43)] + [RunWith("org.flexunit.runners.Parameterized")] public class ScrollToRangeTest extends VellumTestCase { + [DataPoints(loader=multiLineTestLoader)] + [ArrayElementType("UnitTest.Fixtures.TestCaseVo")] + public static var multiLineTestDp:Array; + + public static var multiLineTestLoader:TestConfigurationLoader = new TestConfigurationLoader("../../test/testCases/ScrollToRangeTest.xml", "multiLineTest"); + + [DataPoints(loader=singleLineTestLoader)] + [ArrayElementType("UnitTest.Fixtures.TestCaseVo")] + public static var singleLineTestDp:Array; + + public static var singleLineTestLoader:TestConfigurationLoader = new TestConfigurationLoader("../../test/testCases/ScrollToRangeTest.xml", "singleLineTest"); + private var testCanvas:Canvas; private var testCaseXML:XML; - - public function ScrollToRangeTest(methodName:String, testID:String, testConfig:TestConfig, testCaseXML:XML=null) + + public function ScrollToRangeTest() { - super(methodName, testID, testConfig, testCaseXML); + super("", "ScrollToRangeTest", TestConfig.getInstance()); + metaData = {}; //reset containerType and ID containerType = "custom"; /* TestID = containerType + ":" + writingDirection + ":"; @@ -75,13 +91,8 @@ package UnitTest.Tests metaData.productArea = "Text Container"; this.testCaseXML = testCaseXML; } - - public static function suiteFromXML(testListXML:XML, testConfig:TestConfig, ts:TestSuiteExtended):void - { - var testCaseClass:Class = ScrollToRangeTest; - VellumTestCase.suiteFromXML(testCaseClass, testListXML, testConfig, ts); - } - + + [Before] override public function setUpTest() : void { cleanUpTestApp(); @@ -95,7 +106,13 @@ package UnitTest.Tests fail("Did not get a blank canvas to work with"); } } - + + [After] + override public function tearDownTest():void + { + super.tearDownTest(); + } + private function addChild(s:Sprite):void { testCanvas.rawChildren.addChild(s); @@ -209,7 +226,7 @@ package UnitTest.Tests // Japanese text, vertical - scroll backward to the right, red text should appear on top [ "singleLineJapaneseBackwardLong", japaneseTextLong, BlockProgression.RL, Direction.LTR, 0, 16000, true /* expect it to need to scroll */, checkTop ], // Japanese text, vertical - scroll backward to the right, red text should appear on top - [ "singleLineTCYJapaneseBackwardLong", japaneseTCYTextLong, BlockProgression.RL, Direction.LTR, 0, 16000, true /* expect it to need to scroll */, checkTop ], + [ "singleLineTCYJapaneseBackwardLong", japaneseTCYTextLong, BlockProgression.RL, Direction.LTR, 0, 16000, true /* expect it to need to scroll */, checkTop ] ]; private static var aliceExcerptText:XML = <TextFlow xmlns="http://ns.adobe.com/textLayout/2008"; styleName="scrollToThis" textAlign="start" fontFamily="Minion Pro" fontSize="16">I. Down the Rabbit-Hole<p textAlign="center" fontSize="24">Chapter I</p> @@ -301,7 +318,7 @@ private static var japaneseParagraphText:XML = <TextFlow xmlns="http://ns.adobe. <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> - </TextFlow> + </TextFlow>; // FIXME needs to be replaced private static var japaneseSpanText:XML = <TextFlow xmlns="http://ns.adobe.com/textLayout/2008";> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> @@ -314,7 +331,7 @@ private static var japaneseSpanText:XML = <TextFlow xmlns="http://ns.adobe.com/t <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> - </TextFlow> + </TextFlow>; //this listElement is similar to aliceScrollToParagraphText private static var aliceScrollToListElementText:XML = <TextFlow xmlns="http://ns.adobe.com/textLayout/2008"; textAlign="start" fontFamily="Minion Pro" fontSize="16"> <list listStylePosition="inside" listStyleType="upperRoman"><li>Down the Rabbit-Hole</li></list> @@ -372,7 +389,7 @@ private static var japaneseListElementText:XML = <TextFlow xmlns="http://ns.adob <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> - </TextFlow> + </TextFlow>; //this listItemElement is similar to japaneseSpanText // FIXME needs to be replaced private static var japaneseListItemElementText:XML = <TextFlow xmlns="http://ns.adobe.com/textLayout/2008";> @@ -388,7 +405,7 @@ private static var japaneseListItemElementText:XML = <TextFlow xmlns="http://ns. <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> <p>æåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ããæåã³ã¼ããå²ãå½ã¦ããã¦ããªãã°ãªãã®å¤§åã¯æ¢ã«æåã³ã¼ããå²ãå½ã¦ããã¦ããã°ãªãã®ç°ä½åã§ãã次ã®ã»ã¯ã·ã§ã³ã§ã¯ããã®ãããªã°ãªãã«ã¢ã¯ã»ã¹ããæ¹æ³ã«ã¤ãã¦è§£èª¬ãã¾ãã</p> - </TextFlow> + </TextFlow>; // The following tests all test scrolling to a range that is on multiple lines. The basic philosphy is to read in a TextFow markup which has text in red, // with styleName "scrollToThis", find the range, and call scrollToThis to force the red text to be in view. We pass an initial scroll position, and @@ -414,48 +431,35 @@ private static var japaneseListItemElementText:XML = <TextFlow xmlns="http://ns. [ "japaneseListElementForwardTest", japaneseListElementText, BlockProgression.RL, Direction.LTR, 0, 0, true /* expect it to need to scroll */, checkLeft ], [ "japaneseListElementBackwardTest", japaneseListElementText, BlockProgression.RL, Direction.LTR, -16000, 0, true /* expect it to need to scroll */, checkRight ], [ "japaneseListItemElementForwardTest", japaneseListItemElementText, BlockProgression.RL, Direction.LTR, 0, 0, true /* expect it to need to scroll */, checkLeft ], - [ "japaneseListItemElementBackwardTest", japaneseListItemElementText, BlockProgression.RL, Direction.LTR, -16000, 0, true /* expect it to need to scroll */, checkRight ], + [ "japaneseListItemElementBackwardTest", japaneseListItemElementText, BlockProgression.RL, Direction.LTR, -16000, 0, true /* expect it to need to scroll */, checkRight ] ]; - - public function multiLineTest():TextRange - { - // get id and run the right test - for each (var testData:Array in multiLineTestData) - { - if (testData[0] == TestData.id) - { - return scrollMultiLine(testData[1], testData[2], testData[3], testData[4], testData[5], testData[6], testData[7]); - } - } - assertTrue("XML test case didn't match XML test data", false); - return null; - } - - public function singleLineTest():TextRange + + [Test(dataProvider=multiLineTestDp)] + public function singleLineTest(testCaseVo:TestCaseVo):void { - - var r:TextRange; - // get id and run the right test for each (var testData:Array in singleLineTestData) { - if (testData[0] == TestData.id) + if (testData[0] == testCaseVo.id) { - return scrollSingleLine(testData[1], testData[2], testData[3], testData[4], testData[5], testData[6], testData[7]); + scrollSingleLine(testData[1], testData[2], testData[3], testData[4], testData[5], testData[6], testData[7]); } } - assertTrue("XML test case didn't match XML test data", false); - return null; } - - // Check that we don't force composition to end of range - public function aliceTest():void + + /** + * Check that we don't force composition to end of range + */ + [Test(dataProvider=multiLineTestDp)] + [Ignore] + public function aliceTest(testCaseVo:TestCaseVo):void { - var r:TextRange = multiLineTest(); + var r:TextRange = multiLineTest(testCaseVo); assertTrue("Scroll to range shouldn't force composition to end of range", r.textFlow.flowComposer.damageAbsoluteStart < r.textFlow.textLength - 100); } - + + [Test] public function aboveAndBelow():void { var markup:String = '<TextFlow fontSize ="60" whiteSpaceCollapse="preserve" version="2.0.0" xmlns="http://ns.adobe.com/textLayout/2008";><p><span>one two three four</span></p><p><span>five six</span></p><p><span>seven eight</span></p><p><span>nine ten </span></p><p><span>eleven twelve</span></p><p><span>thirteen fourteen</span></p><p><span>fifteen sixteen</span></p><p><span>seventeen eighteen</span></p><p><span>nineteen twenty</span></p><p><span>twenty-one twenty-two</span></p><p><span>twenty-three twenty-four twenty-five twenty-six twenty-seven</span></p></TextFlow>'; @@ -561,7 +565,6 @@ private static var japaneseListItemElementText:XML = <TextFlow xmlns="http://ns. // bounding box should be within 10% of the container right edge assertTrue(bbox.left > controller.horizontalScrollPosition - 2 && bbox.right < (controller.compositionWidth - controller.horizontalScrollPosition) + 2, "Expected bounding box to be in view"); - var distanceFromLeftEdge:Number = bbox.left - controller.horizontalScrollPosition; } static private function getController(r:TextRange):ContainerController @@ -736,7 +739,21 @@ private static var japaneseListItemElementText:XML = <TextFlow xmlns="http://ns. (textFlow.interactionManager as EditManager).applyFormat(characterFormat, null, null, selectionState); } - + + private function multiLineTest(testCaseVo:TestCaseVo):TextRange + { + // get id and run the right test + for each (var testData:Array in multiLineTestData) + { + if (testData[0] == testCaseVo.id) + { + return scrollMultiLine(testData[1], testData[2], testData[3], testData[4], testData[5], testData[6], testData[7]); + } + } + assertTrue("XML test case didn't match XML test data", false); + return null; + } + } }
