diff options
author | Thanh Liem PHAN | 2017-08-31 10:18:19 +0000 |
---|---|---|
committer | vincent lorenzo | 2017-10-04 14:20:07 +0000 |
commit | 11b1f30a0da3a6394b15719b1734298263df28b6 (patch) | |
tree | bad44e00ed0857f388d840765c94421b8de2f77d /tests | |
parent | e0305477ddd0a0ea49cf0949a61f3a0e0f066fc4 (diff) | |
download | org.eclipse.papyrus-11b1f30a0da3a6394b15719b1734298263df28b6.tar.gz org.eclipse.papyrus-11b1f30a0da3a6394b15719b1734298263df28b6.tar.xz org.eclipse.papyrus-11b1f30a0da3a6394b15719b1734298263df28b6.zip |
Bug 519383: [Table] Increment action throws a NPE in some case
https://bugs.eclipse.org/bugs/show_bug.cgi?id=519383
- Correct the NPE by converting row index to row position when there is
any hidden rows
- Correct the StringIndexOutOfBoundsException
- Unit Tests for prefix and suffix fill action
Change-Id: Ie325f20c796e3c7bf513885e16e759c15f1b73e9
Signed-off-by: Thanh Liem PHAN <thanhliem.phan@all4tec.net>
Diffstat (limited to 'tests')
22 files changed, 766 insertions, 1 deletions
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.di new file mode 100644 index 00000000000..f784d67691a --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.di @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.sysml.architecture.SysML14"/> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.notation new file mode 100644 index 00000000000..08f0e584042 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.notation @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_53xdoJ4CEeemMZnq7oijAg" name="RequirementTreeTable" currentRowAxisProvider="_53xdpZ4CEeemMZnq7oijAg" currentColumnAxisProvider="_53xdop4CEeemMZnq7oijAg" tableKindId="org.eclipse.papyrus.sysml14.table.requirementTree"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_53yrwJ4CEeemMZnq7oijAg" source="http://www.eclipse.org/papyrus/infra/nattable/version"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_53yrwZ4CEeemMZnq7oijAg" key="version" value="1.3.0"/> + </eAnnotations> + <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_WPIfUJ4EEeemMZnq7oijAg" name="rowHeaderWidth" intValue="163"/> + <context xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.uml#_5Vny0J4CEeemMZnq7oijAg"/> + <owner xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.uml#_5Vny0J4CEeemMZnq7oijAg"/> + <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration#/"/> + <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_53xdop4CEeemMZnq7oijAg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider"> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_GzXxYJ4DEeemMZnq7oijAg"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/> + </axis> + </columnAxisProvidersHistory> + <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_53xdpZ4CEeemMZnq7oijAg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/> + <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_NZR48J4EEeemMZnq7oijAg" indexStyle="NUMERIC"> + <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_NZR48Z4EEeemMZnq7oijAg" name="rowLabelWidth" intValue="163"/> + </localRowHeaderAxisConfiguration> +</nattable:Table> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.uml new file mode 100644 index 00000000000..b5409cdc86f --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.uml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Requirements="http://www.eclipse.org/papyrus/sysml/1.4/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/sysml/1.4/SysML/Requirements http://www.eclipse.org/papyrus/sysml/1.4/SysML#//requirements"> + <uml:Model xmi:id="_5Vny0J4CEeemMZnq7oijAg" name="FillHandleHiddenRows"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_52gSUJ4CEeemMZnq7oijAg"> + <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> + </packageImport> + <packageImport xmi:type="uml:PackageImport" xmi:id="_522QkJ4CEeemMZnq7oijAg"> + <importedPackage xmi:type="uml:Package" href="pathmap://SysML14_LIBRARIES/SysML-Standard-Library.uml#SysML.package_packagedElement_Libraries"/> + </packageImport> + <packagedElement xmi:type="uml:Class" xmi:id="_9bMhEJ4CEeemMZnq7oijAg" name="10Requirement100"> + <nestedClassifier xmi:type="uml:Class" xmi:id="_eP_M0J4DEeemMZnq7oijAg" name="10Requirement101"/> + <nestedClassifier xmi:type="uml:Class" xmi:id="_f0z1kJ4DEeemMZnq7oijAg" name="10Requirement102"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_UQdBkJ4DEeemMZnq7oijAg" name="20Requirement200"> + <nestedClassifier xmi:type="uml:Class" xmi:id="_hQvoEJ4DEeemMZnq7oijAg" name="20Requirement201"/> + <nestedClassifier xmi:type="uml:Class" xmi:id="_iG07gJ4DEeemMZnq7oijAg" name="20Requirement202"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_VQF5oJ4DEeemMZnq7oijAg" name="30Requirement300"> + <nestedClassifier xmi:type="uml:Class" xmi:id="_lJy9QJ4DEeemMZnq7oijAg" name="30Requirement301"/> + <nestedClassifier xmi:type="uml:Class" xmi:id="_luxSkJ4DEeemMZnq7oijAg" name="30Requirement302"/> + </packagedElement> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52Y9kJ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52aLsJ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#/"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52bZ0J4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52bZ0Z4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//activities"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Activities"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52cn8J4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52cn8Z4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//allocations"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Allocations"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52dPAJ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52dPAZ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//blocks"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Blocks"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52dPAp4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52dPA54CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//constraintblocks"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_ConstraintBlocks"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52d2EJ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52d2EZ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//deprecatedelements"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_DeprecatedElements"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52d2Ep4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52edIJ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//modelelements"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_ModelElements"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52edIZ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52edIp4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//portsandflows"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Ports_u0026Flows"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52edI54CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52fEMJ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//requirements"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Requirements"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52fEMZ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52fEMp4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/> + </profileApplication> + </uml:Model> + <Requirements:Requirement xmi:id="_9ddx8J4CEeemMZnq7oijAg" base_Class="_9bMhEJ4CEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_UQpO0J4DEeemMZnq7oijAg" base_Class="_UQdBkJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_VQF5oZ4DEeemMZnq7oijAg" base_Class="_VQF5oJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_eQKL8J4DEeemMZnq7oijAg" base_Class="_eP_M0J4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_f0z1kZ4DEeemMZnq7oijAg" base_Class="_f0z1kJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_hQ4yAJ4DEeemMZnq7oijAg" base_Class="_hQvoEJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_iG07gZ4DEeemMZnq7oijAg" base_Class="_iG07gJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_lKAYoJ4DEeemMZnq7oijAg" base_Class="_lJy9QJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_luxSkZ4DEeemMZnq7oijAg" base_Class="_luxSkJ4DEeemMZnq7oijAg"/> +</xmi:XMI> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_Initial.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_Initial.txt new file mode 100644 index 00000000000..aaa7be2a846 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_Initial.txt @@ -0,0 +1,9 @@ +10Requirement100 +10Requirement101 +10Requirement102 +20Requirement200 +20Requirement201 +20Requirement202 +30Requirement300 +30Requirement301 +30Requirement302
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultCopy.txt new file mode 100644 index 00000000000..2f450419fac --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultCopy.txt @@ -0,0 +1,9 @@ +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultDecrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultDecrementDown.txt new file mode 100644 index 00000000000..9f22c4ff137 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultDecrementDown.txt @@ -0,0 +1,9 @@ +10Requirement100 +09Requirement100 +08Requirement100 +07Requirement100 +06Requirement100 +05Requirement100 +04Requirement100 +03Requirement100 +02Requirement100
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultDecrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultDecrementUp.txt new file mode 100644 index 00000000000..655fb5b8322 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultDecrementUp.txt @@ -0,0 +1,9 @@ +22Requirement302 +23Requirement302 +24Requirement302 +25Requirement302 +26Requirement302 +27Requirement302 +28Requirement302 +29Requirement302 +30Requirement302
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultIncrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultIncrementDown.txt new file mode 100644 index 00000000000..40768dca8f2 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultIncrementDown.txt @@ -0,0 +1,9 @@ +10Requirement100 +11Requirement100 +12Requirement100 +13Requirement100 +14Requirement100 +15Requirement100 +16Requirement100 +17Requirement100 +18Requirement100
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultIncrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultIncrementUp.txt new file mode 100644 index 00000000000..b51895b61f4 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_ResultIncrementUp.txt @@ -0,0 +1,9 @@ +38Requirement302 +37Requirement302 +36Requirement302 +35Requirement302 +34Requirement302 +33Requirement302 +32Requirement302 +31Requirement302 +30Requirement302
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.di new file mode 100644 index 00000000000..f784d67691a --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.di @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.sysml.architecture.SysML14"/> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.notation new file mode 100644 index 00000000000..aa60a921221 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.notation @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_53xdoJ4CEeemMZnq7oijAg" name="RequirementTreeTable" currentRowAxisProvider="_53xdpZ4CEeemMZnq7oijAg" currentColumnAxisProvider="_53xdop4CEeemMZnq7oijAg" tableKindId="org.eclipse.papyrus.sysml14.table.requirementTree"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_53yrwJ4CEeemMZnq7oijAg" source="http://www.eclipse.org/papyrus/infra/nattable/version"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_53yrwZ4CEeemMZnq7oijAg" key="version" value="1.3.0"/> + </eAnnotations> + <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_WPIfUJ4EEeemMZnq7oijAg" name="rowHeaderWidth" intValue="163"/> + <context xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.uml#_5Vny0J4CEeemMZnq7oijAg"/> + <owner xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.uml#_5Vny0J4CEeemMZnq7oijAg"/> + <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration#/"/> + <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_53xdop4CEeemMZnq7oijAg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider"> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_GzXxYJ4DEeemMZnq7oijAg"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/> + </axis> + </columnAxisProvidersHistory> + <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_53xdpZ4CEeemMZnq7oijAg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/> + <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_NZR48J4EEeemMZnq7oijAg" indexStyle="NUMERIC"> + <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_NZR48Z4EEeemMZnq7oijAg" name="rowLabelWidth" intValue="163"/> + </localRowHeaderAxisConfiguration> +</nattable:Table> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.uml new file mode 100644 index 00000000000..b5409cdc86f --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.uml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Requirements="http://www.eclipse.org/papyrus/sysml/1.4/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/sysml/1.4/SysML/Requirements http://www.eclipse.org/papyrus/sysml/1.4/SysML#//requirements"> + <uml:Model xmi:id="_5Vny0J4CEeemMZnq7oijAg" name="FillHandleHiddenRows"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_52gSUJ4CEeemMZnq7oijAg"> + <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> + </packageImport> + <packageImport xmi:type="uml:PackageImport" xmi:id="_522QkJ4CEeemMZnq7oijAg"> + <importedPackage xmi:type="uml:Package" href="pathmap://SysML14_LIBRARIES/SysML-Standard-Library.uml#SysML.package_packagedElement_Libraries"/> + </packageImport> + <packagedElement xmi:type="uml:Class" xmi:id="_9bMhEJ4CEeemMZnq7oijAg" name="10Requirement100"> + <nestedClassifier xmi:type="uml:Class" xmi:id="_eP_M0J4DEeemMZnq7oijAg" name="10Requirement101"/> + <nestedClassifier xmi:type="uml:Class" xmi:id="_f0z1kJ4DEeemMZnq7oijAg" name="10Requirement102"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_UQdBkJ4DEeemMZnq7oijAg" name="20Requirement200"> + <nestedClassifier xmi:type="uml:Class" xmi:id="_hQvoEJ4DEeemMZnq7oijAg" name="20Requirement201"/> + <nestedClassifier xmi:type="uml:Class" xmi:id="_iG07gJ4DEeemMZnq7oijAg" name="20Requirement202"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_VQF5oJ4DEeemMZnq7oijAg" name="30Requirement300"> + <nestedClassifier xmi:type="uml:Class" xmi:id="_lJy9QJ4DEeemMZnq7oijAg" name="30Requirement301"/> + <nestedClassifier xmi:type="uml:Class" xmi:id="_luxSkJ4DEeemMZnq7oijAg" name="30Requirement302"/> + </packagedElement> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52Y9kJ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52aLsJ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#/"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52bZ0J4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52bZ0Z4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//activities"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Activities"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52cn8J4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52cn8Z4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//allocations"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Allocations"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52dPAJ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52dPAZ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//blocks"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Blocks"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52dPAp4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52dPA54CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//constraintblocks"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_ConstraintBlocks"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52d2EJ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52d2EZ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//deprecatedelements"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_DeprecatedElements"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52d2Ep4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52edIJ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//modelelements"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_ModelElements"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52edIZ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52edIp4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//portsandflows"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Ports_u0026Flows"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52edI54CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52fEMJ4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//requirements"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Requirements"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_52fEMZ4CEeemMZnq7oijAg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52fEMp4CEeemMZnq7oijAg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/> + </profileApplication> + </uml:Model> + <Requirements:Requirement xmi:id="_9ddx8J4CEeemMZnq7oijAg" base_Class="_9bMhEJ4CEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_UQpO0J4DEeemMZnq7oijAg" base_Class="_UQdBkJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_VQF5oZ4DEeemMZnq7oijAg" base_Class="_VQF5oJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_eQKL8J4DEeemMZnq7oijAg" base_Class="_eP_M0J4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_f0z1kZ4DEeemMZnq7oijAg" base_Class="_f0z1kJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_hQ4yAJ4DEeemMZnq7oijAg" base_Class="_hQvoEJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_iG07gZ4DEeemMZnq7oijAg" base_Class="_iG07gJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_lKAYoJ4DEeemMZnq7oijAg" base_Class="_lJy9QJ4DEeemMZnq7oijAg"/> + <Requirements:Requirement xmi:id="_luxSkZ4DEeemMZnq7oijAg" base_Class="_luxSkJ4DEeemMZnq7oijAg"/> +</xmi:XMI> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_Initial.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_Initial.txt new file mode 100644 index 00000000000..aaa7be2a846 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_Initial.txt @@ -0,0 +1,9 @@ +10Requirement100 +10Requirement101 +10Requirement102 +20Requirement200 +20Requirement201 +20Requirement202 +30Requirement300 +30Requirement301 +30Requirement302
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultCopy.txt new file mode 100644 index 00000000000..2f450419fac --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultCopy.txt @@ -0,0 +1,9 @@ +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100 +10Requirement100
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultDecrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultDecrementDown.txt new file mode 100644 index 00000000000..4d4b84bbd4b --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultDecrementDown.txt @@ -0,0 +1,9 @@ +10Requirement100 +10Requirement099 +10Requirement098 +10Requirement097 +10Requirement096 +10Requirement095 +10Requirement094 +10Requirement093 +10Requirement092
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultDecrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultDecrementUp.txt new file mode 100644 index 00000000000..e25b1e3bc24 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultDecrementUp.txt @@ -0,0 +1,9 @@ +30Requirement294 +30Requirement295 +30Requirement296 +30Requirement297 +30Requirement298 +30Requirement299 +30Requirement300 +30Requirement301 +30Requirement302
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultIncrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultIncrementDown.txt new file mode 100644 index 00000000000..d7adfb018c3 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultIncrementDown.txt @@ -0,0 +1,9 @@ +10Requirement100 +10Requirement101 +10Requirement102 +10Requirement103 +10Requirement104 +10Requirement105 +10Requirement106 +10Requirement107 +10Requirement108
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultIncrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultIncrementUp.txt new file mode 100644 index 00000000000..1b6e16288b3 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_ResultIncrementUp.txt @@ -0,0 +1,9 @@ +30Requirement310 +30Requirement309 +30Requirement308 +30Requirement307 +30Requirement306 +30Requirement305 +30Requirement304 +30Requirement303 +30Requirement302
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.java new file mode 100644 index 00000000000..a25c77204b2 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.java @@ -0,0 +1,202 @@ +/***************************************************************************** + * Copyright (c) 2017 CEA LIST, ALL4TEC and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle; + +import org.eclipse.nebula.widgets.nattable.NatTable; +import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; +import org.eclipse.nebula.widgets.nattable.fillhandle.command.FillHandlePasteCommand.FillHandleOperation; +import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum; +import org.eclipse.papyrus.infra.nattable.fillhandle.command.PapyrusFillHandlePasteCommand; +import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager; +import org.eclipse.papyrus.junit.utils.rules.ActiveTable; +import org.eclipse.papyrus.junit.utils.rules.PluginResource; +import org.eclipse.swt.graphics.Rectangle; +import org.junit.Test; + +/** + * This test protects the prefix fill actions for table with hidden rows. + * As showed in the bug 519383, the fill action can not handle correctly when some rows are hiding in the table, + * as a result of Hide All Categories, Show Level-x Categories or using row filter in the column header. + */ +@PluginResource("resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.di") +public class FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test extends AbstractFillHandleTest { + + /** + * Constructor. + */ + public FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test() { + super(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testCopy() throws Exception { + super.testCopy(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testIncrementUp() throws Exception { + super.testIncrementUp(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testIncrementDown() throws Exception { + super.testIncrementDown(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testDecrementUp() throws Exception { + super.testDecrementUp(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testDecrementDown() throws Exception { + super.testDecrementDown(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Override + @Test + @ActiveTable("RequirementTreeTable") + public void checkTestConsistency() { + super.checkTestConsistency(); + } + + /** + * {@inheritDoc} + */ + @Override + protected void selectCellToFillToUp(final TreeNattableModelManager treeManager) { + treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 8); + } + + /** + * {@inheritDoc} + */ + @Override + protected void selectCellToFillToDown(final TreeNattableModelManager treeManager) { + treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 0); + } + + /** + * {@inheritDoc} + */ + @Override + protected void setFillHandlerRegionToUp(final TreeNattableModelManager treeManager) { + treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 0, 1, 13)); + } + + /** + * {@inheritDoc} + */ + @Override + protected void setFillHandlerRegionToDown(final TreeNattableModelManager treeManager) { + treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 0, 1, 13)); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getCopyCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.COPY, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, true); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getIncrementUpCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), true, true); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getIncrementDownCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), true, true); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getDecrementUpCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), false, true); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getDecrementDownCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, true); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to hide all categories in the table before doing the command. + * </pre> + */ + @Override + protected void executeCommand(final TreeNattableModelManager treeManager, final ILayerCommand command, final String resultPostFileName, final boolean isUpDirection) throws Exception { + // Hiding all categories before executing the command + hideAllCategories(treeManager); + super.executeCommand(treeManager, command, resultPostFileName, isUpDirection); + } +} diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.java new file mode 100644 index 00000000000..a001bb7cb60 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.java @@ -0,0 +1,202 @@ +/***************************************************************************** + * Copyright (c) 2017 CEA LIST, ALL4TEC and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle; + +import org.eclipse.nebula.widgets.nattable.NatTable; +import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; +import org.eclipse.nebula.widgets.nattable.fillhandle.command.FillHandlePasteCommand.FillHandleOperation; +import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum; +import org.eclipse.papyrus.infra.nattable.fillhandle.command.PapyrusFillHandlePasteCommand; +import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager; +import org.eclipse.papyrus.junit.utils.rules.ActiveTable; +import org.eclipse.papyrus.junit.utils.rules.PluginResource; +import org.eclipse.swt.graphics.Rectangle; +import org.junit.Test; + +/** + * This test protects the suffix fill actions for table with hidden rows. + * As showed in the bug 519383, the fill action can not handle correctly when some rows are hiding in the table, + * as a result of Hide All Categories, Show Level-x Categories or using row filter in the column header. + */ +@PluginResource("resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.di") +public class FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test extends AbstractFillHandleTest { + + /** + * Constructor. + */ + public FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test() { + super(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testCopy() throws Exception { + super.testCopy(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testIncrementUp() throws Exception { + super.testIncrementUp(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testIncrementDown() throws Exception { + super.testIncrementDown(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testDecrementUp() throws Exception { + super.testDecrementUp(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Test + @ActiveTable("RequirementTreeTable") + @Override + public void testDecrementDown() throws Exception { + super.testDecrementDown(); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to use RequirementTreeTable as active table instead of the default one. + * </pre> + */ + @Override + @Test + @ActiveTable("RequirementTreeTable") + public void checkTestConsistency() { + super.checkTestConsistency(); + } + + /** + * {@inheritDoc} + */ + @Override + protected void selectCellToFillToUp(final TreeNattableModelManager treeManager) { + treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 8); + } + + /** + * {@inheritDoc} + */ + @Override + protected void selectCellToFillToDown(final TreeNattableModelManager treeManager) { + treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 0); + } + + /** + * {@inheritDoc} + */ + @Override + protected void setFillHandlerRegionToUp(final TreeNattableModelManager treeManager) { + treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 0, 1, 13)); + } + + /** + * {@inheritDoc} + */ + @Override + protected void setFillHandlerRegionToDown(final TreeNattableModelManager treeManager) { + treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 0, 1, 13)); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getCopyCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.COPY, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, false); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getIncrementUpCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), true, false); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getIncrementDownCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), true, false); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getDecrementUpCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), false, false); + } + + /** + * {@inheritDoc} + */ + @Override + protected ILayerCommand getDecrementDownCommand(final NatTable natTable) { + return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, false); + } + + /** + * <pre> + * {@inheritDoc} + * Overridden to hide all categories in the table before doing the command. + * </pre> + */ + @Override + protected void executeCommand(final TreeNattableModelManager treeManager, final ILayerCommand command, final String resultPostFileName, final boolean isUpDirection) throws Exception { + // Hiding all categories before executing the command + hideAllCategories(treeManager); + super.executeCommand(treeManager, command, resultPostFileName, isUpDirection); + } +} diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractTableTest.java index b0ae462d2dd..2bba3126bcb 100755..100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractTableTest.java +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractTableTest.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests; +import java.util.ArrayList; import java.util.List; import org.eclipse.emf.common.util.URI; @@ -228,4 +229,22 @@ public class AbstractTableTest extends AbstractPapyrusTest { Assert.assertEquals(str, clipboard); } + /** + * Method to hide all categories in the tree table manager. + * + * @param treeManager The tree table manager + */ + protected void hideAllCategories(final TreeNattableModelManager treeManager) { + final Table table = treeManager.getTable(); + final int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(table); + final List<Integer> toHide = new ArrayList<Integer>(); + int start = 0; + if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) { + start = 1; + } + for (int i = start; i <= maxDepth; i++) { + toHide.add(Integer.valueOf(i)); + } + treeManager.hideShowCategories(toHide, null); + } } diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java index 101502ad0d0..b8f01bbae56 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java @@ -9,7 +9,7 @@ * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation * Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 515806 + * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 515806, 519383 *****************************************************************************/ package org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests; @@ -41,6 +41,8 @@ import org.eclipse.papyrus.uml.nattable.clazz.config.tests.creation.outside.Crea import org.eclipse.papyrus.uml.nattable.clazz.config.tests.creation.outside.CreateElementDepth2_V1_H3_V1_Test; import org.eclipse.papyrus.uml.nattable.clazz.config.tests.creation.outside.CreateElementDepth2_V1_V3_H1_Test; import org.eclipse.papyrus.uml.nattable.clazz.config.tests.creation.outside.CreateElementDepth2_V1_V3_V1_Test; +import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test; +import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test; import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleInteger_V1_V3_V1_Test; import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test; import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test; @@ -439,6 +441,10 @@ import org.junit.runners.Suite.SuiteClasses; // Bug 515806 - Provide a preference to choose the string to display instead of N/A UnsupportedColumnCellTextTest.class, + + // Bug 519383 - Increment action in table throws a NPE in some cases + FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test.class, + FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test.class }) public class AllTests { // JUnit 4 test suite |