diff options
author | Axel Richard | 2015-02-09 17:00:28 +0000 |
---|---|---|
committer | Axel Richard | 2015-02-09 17:03:06 +0000 |
commit | 269ae28466d09836c2dc55ab117e7b263d6ef566 (patch) | |
tree | da275a07a6038c4ccec99983d67ff059856f64d5 | |
parent | c660f346e73cadaf58837cb8efe5c5fc47fe99ef (diff) | |
download | org.eclipse.emf.compare-269ae28466d09836c2dc55ab117e7b263d6ef566.tar.gz org.eclipse.emf.compare-269ae28466d09836c2dc55ab117e7b263d6ef566.tar.xz org.eclipse.emf.compare-269ae28466d09836c2dc55ab117e7b263d6ef566.zip |
[UI] Update q7 tests
Tests from ts015 are still failing. Raise platform UI bug:459479
Change-Id: I0a58b0256e4bc3f4378a779c381154e24d7587ff
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
7 files changed, 103 insertions, 47 deletions
diff --git a/plugins/org.eclipse.emf.compare.q7.tests/contexts/DefaultPreferenceContext.ctx b/plugins/org.eclipse.emf.compare.q7.tests/contexts/DefaultPreferenceContext.ctx index 1b56303d1..f230a8d9d 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/contexts/DefaultPreferenceContext.ctx +++ b/plugins/org.eclipse.emf.compare.q7.tests/contexts/DefaultPreferenceContext.ctx @@ -6,17 +6,20 @@ Element-Name: DefaultPreferenceContext Element-Type: context Element-Version: 2.0 Id: _SapwEL4pEeOsAoUpt_cnqw -Q7-Runtime-Version: 1.3.11.201403141124 -Save-Time: 4/7/14 9:50 AM +Q7-Runtime-Version: 1.3.14.201410230950 +Save-Time: 2/9/15 12:09 PM ------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf Content-Type: q7/binary Entry-Name: .q7.content -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnR1jssKwjAQRfd+RZi9iYpQKaYi6kJQ -LIjgTko6rYXm0TQ1/Xyj+Nq4Gy5n7rnzRS9rckPbVlpxGNMREFRC55UqOXSuGM5gkQzmQkvaa4s5bSJq -LBZoA4ZtnH7vlVYOe0d6WcWfxsmjMThUG4ecw9U5EzPmvadallTbkp332zfyT/P5Y4FgT4I1EfshKIqQ -AlGZRA5rLLKudt9xr21AqpzD5ZgZv9lNzQYP7VKfjLsI1XggosZMpb9aZzsElgzuUEsHCArPVd6+AAAA -KAEAAFBLAQIUABQACAgIAAAAIQAKz1XevgAAACgBAAAIAAAAAAAAAAAAAAAAAAAAAAAuY29udGVudFBL -BQYAAAAAAQABADYAAAD0AAAAAAA= +UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnS1U9tKAzEQfRf8h5B3k3oBZekqokUE +b1gE3yRmZ9vQzaXJrFv/3kmt2wqKCPq2yZw558yZzfBkYRv2AjEZ70q+KwacgdO+Mm5S8hbrnSN+cry9 +NdTeioWPUIn5oQgRaoiEg1Tcrb/PvENYIFtYU/SUe5mSRFwq6L7kU8RQSNl1nfB2InycyMfryx6SPkO6 +/SVibzDYJdjVWE/Bqh3jEipS/Oj6zlxPJQkhlwg5P5QbCAGabjlzykLJz6FWbYPrkVYTcWaqkj+NVehG +VwdhBLfp1D8EfNJu3nGmG1DublMWYwucYmOMgiMKhyuF3vmymMtT01RpVaVRyVBjQgLhvQ1TkQDbIFrz +gaeOSqFilFOBr4F6vl3MGCMtMds6pw7OZvBa8jQzQZCFmGlRpVni7EU1Law8yz/SAaeeG9jAiZiTriD2 +erVq0lpwKN+T+DGXzGMtOKJKeRI9w6jyJqMOf5US7aw2k5bg/5OO0khvo+e+vLi5vR99HQUd3n+g/Ajl +L14h4d8AUEsHCNQmotKEAQAA3QMAAFBLAQIUABQACAgIAAAAIQDUJqLShAEAAN0DAAAIAAAAAAAAAAAA +AAAAAAAAAAAuY29udGVudFBLBQYAAAAAAQABADYAAAC6AQAAAAA= ------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf-- diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/egit/ts005_tc020_merge_branch1_into_master.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/egit/ts005_tc020_merge_branch1_into_master.test index af0a41353..b55096ce6 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/egit/ts005_tc020_merge_branch1_into_master.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/egit/ts005_tc020_merge_branch1_into_master.test @@ -1,13 +1,14 @@ --- Q7 testcase --- Format-Version: 1.0 +Q7-vendor: www.xored.com/q7 Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_qbXc8Zi4EeScr6JtPPBZKw,_zFx5wJKhEeSdjeXOy8KSHw Element-Name: ts005_tc020_merge_branch1_into_master Element-Type: testcase Element-Version: 3.0 External-Reference: Id: _I0mWoJKiEeSdjeXOy8KSHw -Q7-Runtime-Version: 1.3.10.201312200736 -Save-Time: 1/8/15 10:53 AM +Q7-Runtime-Version: 1.3.14.201410230950 +Save-Time: 2/9/15 11:16 AM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -30,10 +31,10 @@ Content-Type: text/ecl Entry-Name: .content get-view "Package Explorer" | get-tree - | select "library \\[emf-compare-library-egit-multiple-branches master\\]/library.ecore" | double-click + | select "(> )?library .*/(> )?library.ecore" | double-click get-view "Package Explorer" | get-tree - | select "library \\[emf-compare-library-egit-multiple-branches master\\]/library.ecore" + | select "(> )?library .*/(> )?library.ecore" | get-menu "Team/Show in History" | click with [get-view History] { diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc003_logicalmodel_view.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc003_logicalmodel_view.test index 0dcc7f40b..6f7bb6c26 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc003_logicalmodel_view.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc003_logicalmodel_view.test @@ -8,7 +8,7 @@ Element-Version: 3.0 External-Reference: Id: _YOzEYWM6EeSnVZVQFV_quQ Q7-Runtime-Version: 1.3.14.201410230950 -Save-Time: 12/16/14 10:19 AM +Save-Time: 2/9/15 5:28 PM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -36,14 +36,23 @@ with [get-window "Show View"] { } //3. Assert that the view has been opened and is active. get-tab-folder -index 3 | get-property activePage | equals "Logical Model View" | verify-true + //4. Assert that the synchro button is not active. -with [get-view "Logical Model View" | get-button "Synchronize with Editor and Selection"] { - get-property selected | equals false | verify-true - get-property "image.path" | equals "org.eclipse.emf.compare.ide.ui/icons/full/eobj16/synced.gif" | verify-true +try -command {//From Mars release + with [get-view "Logical Model View" | get-button "Synchronize with Editor and Selection"] { + get-property selected | equals false | verify-true + get-property "image.path" | equals "org.eclipse.emf.compare.ide.ui/icons/full/eobj16/synced.gif" | verify-true + } +} -catch {//Before Mars release + with [get-button "Synchronize with Editor and Selection"] { + get-property selected | equals false | verify-true + get-property "image.path" | equals "org.eclipse.emf.compare.ide.ui/icons/full/eobj16/synced.gif" | verify-true + } } //5. Assert that the list presentation is active. get-button "View Menu" -index 1 | get-property selected | equals false | verify-true get-button "View Menu" -index 1 | click get-menu "List" | get-property selection | equals true | verify-true get-menu "Tree" | get-property selection | equals false | verify-true + ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac-- diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc004_logicalmodel_view_synchro_selection.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc004_logicalmodel_view_synchro_selection.test index dab4c7732..21055480a 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc004_logicalmodel_view_synchro_selection.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc004_logicalmodel_view_synchro_selection.test @@ -8,7 +8,7 @@ Element-Version: 3.0 External-Reference: Id: _Mjwf8GNCEeSnVZVQFV_quQ Q7-Runtime-Version: 1.3.14.201410230950 -Save-Time: 11/3/14 11:51 AM +Save-Time: 2/9/15 5:53 PM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -45,15 +45,26 @@ with [get-window "Show View"] { } //3. Click on a model -// Assert that the view is not populated (because the synchronization is not active) get-view "Package Explorer" | get-tree | select "UML-Library/left/model.di" -get-view "Logical Model View" | get-tree | get-property itemCount | equals 0 | verify-true + +//Create variable to store the logical model view tree +//From mars release, get-view Logical Model View return null, so we have to find another way to retrive the tree. +//It's ugly but I didn't found a proper way. +let [val lmvTree [try -command {get-view "Logical Model View" | get-tree} -catch {get-tree -index 1}]] { + +// Assert that the view is not populated (because the synchronization is not active) +$lmvTree | get-property itemCount | equals 0 | verify-true + //4. Activate the synchronization -get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +try -command {//From Mars release + get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +} -catch {//Before Mars release + get-button "Synchronize with Editor and Selection" | click +} //5. Click on a model // Assert that the view is populated with the logical models computing from the selected model(because the synchronization is active) get-view "Package Explorer" | get-tree | select "UML-Library/right/model.notation" -with [get-view "Logical Model View" | get-tree] { +with [$lmvTree] { get-property itemCount | equals 3 | verify-true get-property "getItems().TreeItem[0].getText()" | equals "model.di - /UML-Library/right" | verify-true get-property "getItems().TreeItem[1].getText()" | equals "model.notation - /UML-Library/right" | verify-true @@ -62,7 +73,7 @@ with [get-view "Logical Model View" | get-tree] { //6. Click on another model // Assert that the view is populated with the logical models computing from the new selected model get-view "Package Explorer" | get-tree | select "UML-Library/left/model.uml" -with [get-view "Logical Model View" | get-tree] { +with [$lmvTree] { get-property itemCount | equals 3 | verify-true get-property "getItems().TreeItem[0].getText()" | equals "model.di - /UML-Library/left" | verify-true get-property "getItems().TreeItem[1].getText()" | equals "model.notation - /UML-Library/left" | verify-true @@ -71,20 +82,25 @@ with [get-view "Logical Model View" | get-tree] { //7. Click on a folder // Assert that the view is populated with the logical models computing from the old selected model get-view "Package Explorer" | get-tree | select OtherProject -with [get-view "Logical Model View" | get-tree] { +with [$lmvTree] { get-property itemCount | equals 3 | verify-true get-property "getItems().TreeItem[0].getText()" | equals "model.di - /UML-Library/left" | verify-true get-property "getItems().TreeItem[1].getText()" | equals "model.notation - /UML-Library/left" | verify-true get-property "getItems().TreeItem[2].getText()" | equals "model.uml - /UML-Library/left" | verify-true } //8. Deactivate the synchronization -get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +try -command {//From Mars release + get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +} -catch {//Before Mars release + get-button "Synchronize with Editor and Selection" | click +} //9. Click on a model // Assert that the view is populated with the logical models computing from old selected model -with [get-view "Logical Model View" | get-tree] { +with [$lmvTree] { get-property itemCount | equals 3 | verify-true get-property "getItems().TreeItem[0].getText()" | equals "model.di - /UML-Library/left" | verify-true get-property "getItems().TreeItem[1].getText()" | equals "model.notation - /UML-Library/left" | verify-true get-property "getItems().TreeItem[2].getText()" | equals "model.uml - /UML-Library/left" | verify-true } +} ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac-- diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc005_logicalmodel_view_synchro_editor.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc005_logicalmodel_view_synchro_editor.test index 71cf519c3..65e4f53ed 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc005_logicalmodel_view_synchro_editor.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc005_logicalmodel_view_synchro_editor.test @@ -8,7 +8,7 @@ Element-Version: 3.0 External-Reference: Id: _cfl4QGNHEeSnVZVQFV_quQ Q7-Runtime-Version: 1.3.14.201410230950 -Save-Time: 11/3/14 5:27 PM +Save-Time: 2/9/15 5:52 PM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -52,23 +52,33 @@ with [get-window "Show View"] { } //3. Open a model editor (double-click on a model) -// Assert that the view is not populated (because the synchronization is not active) get-view "Package Explorer" | get-tree | select "UML-Library/left/model.uml" | double-click -get-view "Logical Model View" | get-tree | get-property itemCount | equals 0 | verify-true + +//Create variable to store the logical model view tree +//From mars release, get-view Logical Model View return null, so we have to find another way to retrive the tree. +//It's ugly but I didn't found a proper way. +let [val lmvTree [try -command {get-view "Logical Model View" | get-tree} -catch {get-tree -index 2}]] { + +// Assert that the view is not populated (because the synchronization is not active) +$lmvTree | get-property itemCount | equals 0 | verify-true //4. Focus on the opened editor. // Assert that the view is not populated (because the synchronization is not active) get-editor "model.uml" | get-tree | select "platform:\\/resource\\/UML-Library\\/left\\/model.uml" -get-view "Logical Model View" | get-tree | get-property itemCount | equals 0 | verify-true +$lmvTree | get-property itemCount | equals 0 | verify-true //5. Open another model editor // Assert that the view is not populated (because the synchronization is not active) get-view "Package Explorer" | get-tree | select "UML-Library/origin/model.di" | double-click -get-view "Logical Model View" | get-tree | get-property itemCount | equals 0 | verify-true +$lmvTree | get-property itemCount | equals 0 | verify-true //6. Activate synchronization -get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +try -command {//From Mars release + get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +} -catch {//Before Mars release + get-button "Synchronize with Editor and Selection" | click +} //7. Focus on the first opened editor. // Assert that the view is populated (because the synchronization is active) get-editor "model.uml" | get-tree | select "platform:\\/resource\\/UML-Library\\/left\\/model.uml" -with [get-view "Logical Model View" | get-tree] { +with [$lmvTree] { get-property itemCount | equals 3 | verify-true get-property "getItems().TreeItem[0].getText()" | equals "model.di - /UML-Library/left" | verify-true get-property "getItems().TreeItem[1].getText()" | equals "model.notation - /UML-Library/left" | verify-true @@ -81,7 +91,7 @@ with [get-editor "model.di"] { mouse-move 543 80 -height 1055 -width 1315 } } -with [get-view "Logical Model View" | get-tree] { +with [$lmvTree] { get-property itemCount | equals 3 | verify-true get-property "getItems().TreeItem[0].getText()" | equals "model.di - /UML-Library/origin" | verify-true get-property "getItems().TreeItem[1].getText()" | equals "model.notation - /UML-Library/origin" | verify-true @@ -91,24 +101,28 @@ with [get-view "Logical Model View" | get-tree] { // Assert that the view is populated with the logical models computing from the old selected editor get-view "Package Explorer" | get-tree | select "UML-Library/.project" | double-click get-editor ".project" | get-text-viewer | set-caret-pos 5 15 -with [get-view "Logical Model View" | get-tree] { +with [$lmvTree] { get-property itemCount | equals 3 | verify-true get-property "getItems().TreeItem[0].getText()" | equals "model.di - /UML-Library/origin" | verify-true get-property "getItems().TreeItem[1].getText()" | equals "model.notation - /UML-Library/origin" | verify-true get-property "getItems().TreeItem[2].getText()" | equals "model.uml - /UML-Library/origin" | verify-true } //10. Deactivate the synchronization -get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +try -command {//From Mars release + get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +} -catch {//Before Mars release + get-button "Synchronize with Editor and Selection" | click +} //9. Click on an editor // Assert that the view is populated with the logical models computing from old selected model get-editor "model.uml" | get-tree | select "platform:\\/resource\\/UML-Library\\/left\\/model.uml" -with [get-view "Logical Model View" | get-tree] { +with [$lmvTree] { get-property itemCount | equals 3 | verify-true get-property "getItems().TreeItem[0].getText()" | equals "model.di - /UML-Library/origin" | verify-true get-property "getItems().TreeItem[1].getText()" | equals "model.notation - /UML-Library/origin" | verify-true get-property "getItems().TreeItem[2].getText()" | equals "model.uml - /UML-Library/origin" | verify-true } - +} get-button "View Menu" | click get-view "Package Explorer" | get-menu "Filters..." | click with [get-window "Java Element Filters"] { diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc006_logicalmodel_view_tree_presentation.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc006_logicalmodel_view_tree_presentation.test index a6d5b5142..9fae51351 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc006_logicalmodel_view_tree_presentation.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/logicalmodel/ts009_tc006_logicalmodel_view_tree_presentation.test @@ -8,7 +8,7 @@ Element-Version: 3.0 External-Reference: Id: _ofJJwGNjEeS6ovqwxdtU-w Q7-Runtime-Version: 1.3.14.201410230950 -Save-Time: 11/3/14 5:58 PM +Save-Time: 2/9/15 5:54 PM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -45,15 +45,28 @@ with [get-window "Show View"] { } //3. Select Tree Presentation get-button "View Menu" -index 1 | click -get-view "Logical Model View" | get-menu Tree | click +try -command {//From Mars release + get-view "Logical Model View" | get-menu Tree | click +} -catch {//Before Mars release + get-menu Tree | click +} //4. Activate synchronization -get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +try -command {//From Mars release + get-view "Logical Model View" | get-button "Synchronize with Editor and Selection" | click +} -catch {//Before Mars release + get-button "Synchronize with Editor and Selection" | click +} //5. Click on a model // Assert that the view is populated as a Tree presentation get-view "Package Explorer" | get-tree | select "Project1/left.uml" -get-view "Logical Model View" | get-tree | select "Project1/left.uml" -get-view "Logical Model View" | get-tree | select "Project2/folder1/folder11/leftFragment.uml" -with [get-view "Logical Model View" | get-tree] { + +//Create variable to store the logical model view tree +//From mars release, get-view Logical Model View return null, so we have to find another way to retrive the tree. +//It's ugly but I didn't found a proper way. +let [val lmvTree [try -command {get-view "Logical Model View" | get-tree} -catch {get-tree -index 1}]] { +$lmvTree | select "Project1/left.uml" +$lmvTree | select "Project2/folder1/folder11/leftFragment.uml" +with [$lmvTree] { get-property "getItems().length" | equals 2 | verify-true get-property "getItems().TreeItem[0].getItems().length" | equals 1 | verify-true get-property "getItems().TreeItem[0].getItems().TreeItem[0].getItems().length" | equals 0 | verify-true @@ -72,7 +85,7 @@ with [get-view "Logical Model View" | get-tree] { get-property "getItems().TreeItem[1].getItems().TreeItem[0].getText()" | equals folder1 | verify-true get-property "getItems().TreeItem[1].getText()" | equals Project2 | verify-true } - +} get-preferences-menu | click with [get-window Preferences] { get-tree | select "EMF Compare/Resolution strategy" diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/propertiesview/ts015_tc004_properties_view_egit.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/propertiesview/ts015_tc004_properties_view_egit.test index cc2f7cde1..d013b6323 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/propertiesview/ts015_tc004_properties_view_egit.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/propertiesview/ts015_tc004_properties_view_egit.test @@ -8,7 +8,7 @@ Element-Version: 3.0 External-Reference: Id: _F_3xEOrYEeKHh5YNAPhy9Q Q7-Runtime-Version: 1.3.14.201410230950 -Save-Time: 1/7/15 10:48 AM +Save-Time: 2/9/15 11:29 AM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -35,13 +35,13 @@ get-view "Package Explorer" | get-tree | select "(> )?library .*/(> )?library.ec with [get-editor "Compare library.ecore Current and db84a95"] { get-tree | select "> Local: library.ecore/> library/Library \\[eClassifiers delete\\]" | double-click //CMV right : non editable - get-tree -after [get-label "(Remote: library/library.ecore)(library.ecore db84a95 (Axel Richard))"] -index 1 | select "library/Library" + get-tree -after [get-label "(Remote: library/library.ecore)|(library.ecore db84a95 \(Axel Richard\))"] -index 1 | select "library/Library" } get-view Properties | get-tree | select Name | double-click //CMV left : editable get-editor "Compare library.ecore Current and db84a95" | get-tree - -after [get-label "(Remote: library/library.ecore)|(library.ecore db84a95 (Axel Richard))"] | select "library/Book" + -after [get-label "(Remote: library/library.ecore)|(library.ecore db84a95 \(Axel Richard\))"] | select "library/Book" with [get-view Properties | get-tree] { select Name | activate-cell-edit -column 1 get-editbox | key-type "TRAVERSE_ESCAPE" |