flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject git commit: [flex-tlf] [refs/heads/develop] - FLEX-34876 Added/fixed tests
Date Mon, 12 Oct 2015 20:40:03 GMT
Repository: flex-tlf
Updated Branches:
  refs/heads/develop 4a01f5708 -> 5eff80ef7


FLEX-34876
Added/fixed tests


Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/5eff80ef
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/5eff80ef
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/5eff80ef

Branch: refs/heads/develop
Commit: 5eff80ef7cb67e8385cb3b2519070bad38e9d1f2
Parents: 4a01f57
Author: Harbs <harbs@in-tools.com>
Authored: Mon Oct 12 23:39:43 2015 +0300
Committer: Harbs <harbs@in-tools.com>
Committed: Mon Oct 12 23:39:43 2015 +0300

----------------------------------------------------------------------
 automation_tests/src/AllTestsSuite.as                  | 4 +++-
 automation_tests/src/UnitTest/Tests/FLEX_34807_Test.as | 2 +-
 textLayout/src/flashx/textLayout/edit/TextFlowEdit.as  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/5eff80ef/automation_tests/src/AllTestsSuite.as
----------------------------------------------------------------------
diff --git a/automation_tests/src/AllTestsSuite.as b/automation_tests/src/AllTestsSuite.as
index 0cd93e9..62f2f45 100644
--- a/automation_tests/src/AllTestsSuite.as
+++ b/automation_tests/src/AllTestsSuite.as
@@ -33,6 +33,7 @@ package
     import UnitTest.Tests.CrossContainerTest;
     import UnitTest.Tests.ElementOperationTest;
     import UnitTest.Tests.EventOverrideTest;
+    import UnitTest.Tests.FLEX_34807_Test;
     import UnitTest.Tests.FactoryImportTest;
     import UnitTest.Tests.FloatTest;
     import UnitTest.Tests.FlowModelTest;
@@ -111,7 +112,8 @@ package
         public var measurementTest:MeasurementTest;
         public var leadingTest:LeadingTest;
         public var scrollToRangeTest:ScrollToRangeTest;
-        //public var pasteWithMultiParagraph:PasteWithMutliParagraph_FLEX_34876_Test;
+        public var pasteWithMultiParagraph:PasteWithMutliParagraph_FLEX_34876_Test;
+		public var flex_34807:FLEX_34807_Test;
     }
 
 }

http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/5eff80ef/automation_tests/src/UnitTest/Tests/FLEX_34807_Test.as
----------------------------------------------------------------------
diff --git a/automation_tests/src/UnitTest/Tests/FLEX_34807_Test.as b/automation_tests/src/UnitTest/Tests/FLEX_34807_Test.as
index 872250a..ff03a97 100644
--- a/automation_tests/src/UnitTest/Tests/FLEX_34807_Test.as
+++ b/automation_tests/src/UnitTest/Tests/FLEX_34807_Test.as
@@ -243,7 +243,7 @@ package UnitTest.Tests
         private function assertTextPastedCorrectlyAndExistingTextNotChanged(pastePosition:int):void
         {
             const currentSourceAsPlainText:String = TextConverter.export(testApp.getTextFlow(),
TextConverter.PLAIN_TEXT_FORMAT, ConversionType.STRING_TYPE) as String;
-            assertEquals("Not all the pasted content appears in the new TextFlow!", sourceAsPlainText.substr(0,
pastePosition) + PASTED_TEXT + sourceAsPlainText.substr(pastePosition), currentSourceAsPlainText);
+            assertEquals("Not all the pasted content appears in the new TextFlow!", sourceAsPlainText.substr(0,
pastePosition) + PASTED_TEXT + "\n" + sourceAsPlainText.substr(pastePosition), currentSourceAsPlainText);
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/5eff80ef/textLayout/src/flashx/textLayout/edit/TextFlowEdit.as
----------------------------------------------------------------------
diff --git a/textLayout/src/flashx/textLayout/edit/TextFlowEdit.as b/textLayout/src/flashx/textLayout/edit/TextFlowEdit.as
index 5908353..491994c 100644
--- a/textLayout/src/flashx/textLayout/edit/TextFlowEdit.as
+++ b/textLayout/src/flashx/textLayout/edit/TextFlowEdit.as
@@ -251,7 +251,7 @@ package flashx.textLayout.edit
 				}
 				else
 				{
-					if (applyFormat && firstParagraph)
+					if (applyFormat)
 					{
 						destinationElement = destinationLeaf ? findLowestPossibleParent(destinationLeaf.parent,
scrapElement) : findLowestPossibleParent(destinationElement, scrapElement);
 						var currentIndex:int = destinationElement.findChildIndexAtPosition(insertPosition -
destinationElement.getAbsoluteStart());


Mime
View raw message