[UI Tests] Update ui tests
Change-Id: Ie4bd59be784282f4e094648d7d1f0ea85368de18
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
diff --git a/plugins/org.eclipse.emf.compare.q7.tests/contexts/Library-EGit-Init.ctx b/plugins/org.eclipse.emf.compare.q7.tests/contexts/Library-EGit-Init.ctx
index 0a21847..d300a15 100644
--- a/plugins/org.eclipse.emf.compare.q7.tests/contexts/Library-EGit-Init.ctx
+++ b/plugins/org.eclipse.emf.compare.q7.tests/contexts/Library-EGit-Init.ctx
@@ -6,8 +6,8 @@
Element-Type: context
Element-Version: 2.0
Id: _pj0X4HBcEeKTzKjv1SXOgA
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 12/12/14 11:47 AM
+Q7-Runtime-Version: 1.3.15.201412220512
+Save-Time: 4/14/15 10:26 AM
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
Content-Type: text/plain
@@ -79,4 +79,8 @@
}
}
}
+
+//remove from the workspace the project that contains repo
+get-view "Package Explorer" | get-tree | select "Library-EGit" | get-menu Delete | click
+get-window "Delete Resources" | get-button OK | click
------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--
diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/notloadedfragment/ts012_tc006_case5.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/notloadedfragment/ts012_tc006_case5.test
index 33932ad..42e7471 100644
--- a/plugins/org.eclipse.emf.compare.q7.tests/tests/notloadedfragment/ts012_tc006_case5.test
+++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/notloadedfragment/ts012_tc006_case5.test
@@ -8,7 +8,7 @@
External-Reference:
Id: _q2uw0LhVEeSt3uBPf4Syeg
Q7-Runtime-Version: 1.3.15.201412220512
-Save-Time: 3/18/15 2:40 PM
+Save-Time: 4/13/15 6:13 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -51,27 +51,27 @@
get-property "selection[0].path[2]" | equals "> F" | verify-true
get-property "selection[0].path[3]" | equals "H \\[eSubpackages delete\\]" | verify-true
}
- with [get-tree -after [get-label "(Local: /)?case5/right/R1.ecore"]] {
+ with [get-tree -after [get-label "(Local: /)?case5/right/R[16].ecore"]] {
get-property "selection[0].path[0]" | equals "\\[ ... \\]" | verify-true
- get-property "selection[0].path[1]" | equals "\\[ ... \\] \\( R6.ecore \\)" | verify-true
+ get-property "selection[0].path[1]" | equals "\\[ ... \\] \\(R6.ecore\\)" | verify-true
get-property "selection[0].path[2]" | equals F | verify-true
get-property "selection[0].path[3]" | equals H | verify-true
}
- with [get-tree -after [get-label "(Local: /)?case5/right/R1.ecore"] -index 1] {
+ with [get-tree -after [get-label "(Local: /)?case5/right/R[16].ecore"] -index 1] {
get-property "selection[0].path[0]" | equals "\\[ ... \\]" | verify-true
- get-property "selection[0].path[1]" | equals "\\[ ... \\] \\( R6.ecore \\)" | verify-true
+ get-property "selection[0].path[1]" | equals "\\[ ... \\] \\(R6.ecore\\)" | verify-true
get-property "selection[0].path[2]" | equals F | verify-true
get-property "selection[0].path[3]" | equals " " | verify-true
}
- with [get-tree -after [get-label "(Local: /)?case5/right/R1.ecore"] -index 2] {
+ with [get-tree -after [get-label "(Local: /)?case5/right/R[16].ecore"] -index 2] {
get-property "selection[0].path[0]" | equals "\\[ ... \\]" | verify-true
- get-property "selection[0].path[1]" | equals "\\[ ... \\] \\( R6.ecore \\)" | verify-true
+ get-property "selection[0].path[1]" | equals "\\[ ... \\] \\(R6.ecore\\)" | verify-true
get-property "selection[0].path[2]" | equals F | verify-true
get-property "selection[0].path[3]" | equals H | verify-true
}
// Expand CMV's trees
- get-tree -after [get-label "(Local: /)?case5/right/R1.ecore"] -index 1 | select "\\[ ... \\]" | expand-all
+ get-tree -after [get-label "(Local: /)?case5/right/R[16].ecore"] -index 1 | select "\\[ ... \\]" | expand-all
// Check content of SMV
with [get-tree] {
@@ -102,7 +102,7 @@
get-property "getItems().TreeItem[1].getText()" | equals "> case5/right/R1.ecore" | verify-true
}
// Check content of ancestor CMV
- with [get-tree -after [get-label "(Local: /)?case5/right/R1.ecore"]] {
+ with [get-tree -after [get-label "(Local: /)?case5/right/R[16].ecore"]] {
get-property "getItems().length" | equals 1 | verify-true
get-property "getItems().TreeItem[0].getItems().length" | equals 2 | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().length" | equals 1 | verify-true
@@ -114,7 +114,7 @@
| equals H | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals F
| verify-true
- get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "[ ... ] ( R6.ecore )"
+ get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "[ ... ] (R6.ecore)"
| verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().length" | equals 1 | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getItems().length"
@@ -125,12 +125,12 @@
| equals I | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getText()" | equals G
| verify-true
- get-property "getItems().TreeItem[0].getItems().TreeItem[1].getText()" | equals "[ ... ] ( R7.ecore )"
+ get-property "getItems().TreeItem[0].getItems().TreeItem[1].getText()" | equals "[ ... ] (R7.ecore)"
| verify-true
get-property "getItems().TreeItem[0].getText()" | equals "[ ... ]" | verify-true
}
// Check content of left CMV
- with [get-tree -after [get-label "(Local: /)?case5/right/R1.ecore"] -index 1] {
+ with [get-tree -after [get-label "(Local: /)?case5/right/R[16].ecore"] -index 1] {
get-property "getItems().length" | equals 1 | verify-true
get-property "getItems().TreeItem[0].getItems().length" | equals 2 | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().length" | equals 1 | verify-true
@@ -142,7 +142,7 @@
| equals "" | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals F
| verify-true
- get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "[ ... ] ( R6.ecore )"
+ get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "[ ... ] (R6.ecore)"
| verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().length" | equals 1 | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getItems().length"
@@ -153,12 +153,12 @@
| equals I | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getText()" | equals G
| verify-true
- get-property "getItems().TreeItem[0].getItems().TreeItem[1].getText()" | equals "[ ... ] ( R7.ecore )"
+ get-property "getItems().TreeItem[0].getItems().TreeItem[1].getText()" | equals "[ ... ] (R7.ecore)"
| verify-true
get-property "getItems().TreeItem[0].getText()" | equals "[ ... ]" | verify-true
}
// Check content of right CMV
- with [get-tree -after [get-label "(Local: /)?case5/right/R1.ecore"] -index 2] {
+ with [get-tree -after [get-label "(Local: /)?case5/right/R[16].ecore"] -index 2] {
get-property "getItems().length" | equals 1 | verify-true
get-property "getItems().TreeItem[0].getItems().length" | equals 2 | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().length" | equals 1 | verify-true
@@ -170,7 +170,7 @@
| equals H | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals F
| verify-true
- get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "[ ... ] ( R6.ecore )"
+ get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "[ ... ] (R6.ecore)"
| verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().length" | equals 1 | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getItems().length"
@@ -181,7 +181,7 @@
| equals "" | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getText()" | equals G
| verify-true
- get-property "getItems().TreeItem[0].getItems().TreeItem[1].getText()" | equals "[ ... ] ( R7.ecore )"
+ get-property "getItems().TreeItem[0].getItems().TreeItem[1].getText()" | equals "[ ... ] (R7.ecore)"
| verify-true
get-property "getItems().TreeItem[0].getText()" | equals "[ ... ]" | verify-true
}
@@ -196,15 +196,15 @@
}
with [get-tree -after [get-label "case5/right/R1.ecore"]] {
get-property "selection[0].path[0]" | equals "\\[ ... \\]" | verify-true
- get-property "selection[0].path[1]" | equals "\\[ ... \\] \\( R7.ecore \\)" | verify-true
+ get-property "selection[0].path[1]" | equals "\\[ ... \\] \\(R7.ecore\\)" | verify-true
}
with [get-tree -after [get-label "case5/right/R1.ecore"] -index 1] {
get-property "selection[0].path[0]" | equals "\\[ ... \\]" | verify-true
- get-property "selection[0].path[1]" | equals "\\[ ... \\] \\( R7.ecore \\)" | verify-true
+ get-property "selection[0].path[1]" | equals "\\[ ... \\] \\(R7.ecore\\)" | verify-true
}
with [get-tree -after [get-label "case5/right/R1.ecore"] -index 2] {
get-property "selection[0].path[0]" | equals "\\[ ... \\]" | verify-true
- get-property "selection[0].path[1]" | equals "\\[ ... \\] \\( R7.ecore \\)" | verify-true
+ get-property "selection[0].path[1]" | equals "\\[ ... \\] \\(R7.ecore\\)" | verify-true
}
}
// Default Group Provider
@@ -226,7 +226,7 @@
| equals "H [eSubpackages delete]" | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "> F"
| verify-true
- get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "> [ ... ] ( R6.ecore )"
+ get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "> [ ... ] (R6.ecore)"
| verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().length" | equals 1 | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getItems().length" | equals 1
@@ -237,7 +237,7 @@
| equals "I [eSubpackages delete]" | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getText()" | equals "> G"
| verify-true
- get-property "getItems().TreeItem[0].getItems().TreeItem[1].getText()" | equals "> [ ... ] ( R7.ecore )"
+ get-property "getItems().TreeItem[0].getItems().TreeItem[1].getText()" | equals "> [ ... ] (R7.ecore)"
| verify-true
get-property "getItems().TreeItem[0].getText()" | equals "> [ ... ]" | verify-true
}
@@ -261,7 +261,7 @@
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[0].getText()"
| equals "> F" | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[0].getText()"
- | equals "> [ ... ] ( R6.ecore )" | verify-true
+ | equals "> [ ... ] (R6.ecore)" | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[1].getItems().length" | equals 1
| verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getItems().length"
@@ -273,7 +273,7 @@
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[1].getItems().TreeItem[0].getText()"
| equals "> G" | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().TreeItem[1].getText()"
- | equals "> [ ... ] ( R7.ecore )" | verify-true
+ | equals "> [ ... ] (R7.ecore)" | verify-true
get-property "getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "> [ ... ]" | verify-true
get-property "getItems().TreeItem[0].getText()" | equals "> Deletions" | verify-true
}
diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/treeviewer/ts008_tc004_rac_right_fragment.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/treeviewer/ts008_tc004_rac_right_fragment.test
index f45b9a8..2622452 100644
--- a/plugins/org.eclipse.emf.compare.q7.tests/tests/treeviewer/ts008_tc004_rac_right_fragment.test
+++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/treeviewer/ts008_tc004_rac_right_fragment.test
@@ -7,8 +7,8 @@
Element-Version: 3.0
External-Reference:
Id: _XgOJcN2SEeKlP8eyY8UqWw
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 1/7/15 11:40 AM
+Q7-Runtime-Version: 1.3.15.201412220512
+Save-Time: 4/14/15 10:38 AM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -49,7 +49,7 @@
| verify-true
}
with [get-tree -after [get-label "(Local: /)?TreeViewerResourceAttachmentChange/fragmentOnRightSide/right.uml"] -index 1] {
- get-item "<Model> root" | get-property childCount | equals 2 | verify-true
+ get-item "<Model> root" | get-property childCount | equals 3 | verify-true
get-item "<Model> root/<Package> package3" | get-property selected | equals true | verify-true
}
}
