diff options
author | Thanh Liem PHAN | 2017-03-31 14:47:48 +0000 |
---|---|---|
committer | vincent lorenzo | 2017-04-05 08:52:51 +0000 |
commit | 17c9c9cc3f8186eb3a9a418f67fb160f43691ae4 (patch) | |
tree | d3528d46298fb10d7edeb835d1df6688ff5c56cd | |
parent | c477952aa7e7ca4257cde6f94e56a7f375603697 (diff) | |
download | org.eclipse.papyrus-17c9c9cc3f8186eb3a9a418f67fb160f43691ae4.tar.gz org.eclipse.papyrus-17c9c9cc3f8186eb3a9a418f67fb160f43691ae4.tar.xz org.eclipse.papyrus-17c9c9cc3f8186eb3a9a418f67fb160f43691ae4.zip |
Bug 513963: [Table] Update NatTable dependency and build to use NatTable
1.5
https://bugs.eclipse.org/bugs/show_bug.cgi?id=513963
- Test cases for sorting name and type ascendingly and descendingly need
to be slightly adapted to NatTable 1.5
Change-Id: Ia9184d04e82d1dd1a909363a398785443c94059e
Signed-off-by: Thanh Liem PHAN <thanhliem.phan@all4tec.net>
8 files changed, 24 insertions, 24 deletions
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_NAME_ASC.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_NAME_ASC.txt index 11c55491c34..1aad83de0f9 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_NAME_ASC.txt +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_NAME_ASC.txt @@ -1,8 +1,8 @@ Class1 N/A -Attribute1 Type1 Attribute1 Type0 -Attribute2 Type1 +Attribute1 Type1 Attribute2 Type3 +Attribute2 Type1 Attribute3 Type2 NestedClass1 N/A NestedClass2 N/A @@ -20,10 +20,10 @@ Parameter1 Type3 Parameter2 Type1 Parameter3 Type2 Class2 N/A -Attribute1 Type1 Attribute1 Type0 -Attribute2 Type1 +Attribute1 Type1 Attribute2 Type3 +Attribute2 Type1 Attribute3 Type2 NestedClass1 N/A NestedClass2 N/A diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_NAME_DESC.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_NAME_DESC.txt index 469fd1a88dc..5ccd9b38dc6 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_NAME_DESC.txt +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_NAME_DESC.txt @@ -1,9 +1,9 @@ Class2 N/A Attribute3 Type2 -Attribute2 Type1 Attribute2 Type3 -Attribute1 Type1 +Attribute2 Type1 Attribute1 Type0 +Attribute1 Type1 NestedClass3 N/A NestedClass2 N/A NestedClass1 N/A @@ -21,10 +21,10 @@ Parameter2 Type1 Parameter1 Type3 Class1 N/A Attribute3 Type2 -Attribute2 Type1 Attribute2 Type3 -Attribute1 Type1 +Attribute2 Type1 Attribute1 Type0 +Attribute1 Type1 NestedClass3 N/A NestedClass2 N/A NestedClass1 N/A diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_TYPE_ASC.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_TYPE_ASC.txt index 536d8343ddf..a6cf5882731 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_TYPE_ASC.txt +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_TYPE_ASC.txt @@ -1,7 +1,7 @@ Class1 N/A Attribute1 Type0 -Attribute2 Type1 Attribute1 Type1 +Attribute2 Type1 Attribute3 Type2 Attribute2 Type3 NestedClass3 N/A @@ -21,8 +21,8 @@ Parameter3 Type2 Parameter1 Type3 Class2 N/A Attribute1 Type0 -Attribute2 Type1 Attribute1 Type1 +Attribute2 Type1 Attribute3 Type2 Attribute2 Type3 NestedClass3 N/A diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_TYPE_DESC.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_TYPE_DESC.txt index 4a813252813..72740a872e7 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_TYPE_DESC.txt +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_H1_H3_H1_TYPE_DESC.txt @@ -1,8 +1,8 @@ Class1 N/A Attribute2 Type3 Attribute3 Type2 -Attribute2 Type1 Attribute1 Type1 +Attribute2 Type1 Attribute1 Type0 NestedClass3 N/A NestedClass1 N/A @@ -22,8 +22,8 @@ Parameter2 Type1 Class2 N/A Attribute2 Type3 Attribute3 Type2 -Attribute2 Type1 Attribute1 Type1 +Attribute2 Type1 Attribute1 Type0 NestedClass3 N/A NestedClass1 N/A diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_NAME_ASC.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_NAME_ASC.txt index f4a05f01950..1e05ac9dcf7 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_NAME_ASC.txt +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_NAME_ASC.txt @@ -1,10 +1,10 @@ Class1 N/A -Attribute1 Type1 Attribute1 Type0 -Attribute2 Type1 +Attribute1 Type1 Attribute2 Type3 +Attribute2 Type1 Attribute3 Type2 NestedClass1 N/A @@ -28,10 +28,10 @@ Parameter2 Type1 Parameter3 Type2 Class2 N/A -Attribute1 Type1 Attribute1 Type0 -Attribute2 Type1 +Attribute1 Type1 Attribute2 Type3 +Attribute2 Type1 Attribute3 Type2 NestedClass1 N/A diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_NAME_DESC.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_NAME_DESC.txt index cc0d6bee409..2b8325d15ed 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_NAME_DESC.txt +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_NAME_DESC.txt @@ -2,10 +2,10 @@ Class2 N/A Attribute3 Type2 -Attribute2 Type1 Attribute2 Type3 -Attribute1 Type1 +Attribute2 Type1 Attribute1 Type0 +Attribute1 Type1 NestedClass3 N/A NestedClass2 N/A @@ -29,10 +29,10 @@ Parameter1 Type3 Class1 N/A Attribute3 Type2 -Attribute2 Type1 Attribute2 Type3 -Attribute1 Type1 +Attribute2 Type1 Attribute1 Type0 +Attribute1 Type1 NestedClass3 N/A NestedClass2 N/A diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_TYPE_ASC.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_TYPE_ASC.txt index da145344707..df7f2cf5584 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_TYPE_ASC.txt +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_TYPE_ASC.txt @@ -2,8 +2,8 @@ Class1 N/A Attribute1 Type0 -Attribute2 Type1 Attribute1 Type1 +Attribute2 Type1 Attribute3 Type2 Attribute2 Type3 @@ -29,8 +29,8 @@ Parameter1 Type3 Class2 N/A Attribute1 Type0 -Attribute2 Type1 Attribute1 Type1 +Attribute2 Type1 Attribute3 Type2 Attribute2 Type3 diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_TYPE_DESC.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_TYPE_DESC.txt index 8eb1c3f623d..9dad1ed7c28 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_TYPE_DESC.txt +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/sort/Sort_V1_V3_V1_TYPE_DESC.txt @@ -3,8 +3,8 @@ Class1 N/A Attribute2 Type3 Attribute3 Type2 -Attribute2 Type1 Attribute1 Type1 +Attribute2 Type1 Attribute1 Type0 NestedClass3 N/A @@ -30,8 +30,8 @@ Class2 N/A Attribute2 Type3 Attribute3 Type2 -Attribute2 Type1 Attribute1 Type1 +Attribute2 Type1 Attribute1 Type0 NestedClass3 N/A |