[UI tests] Fix papyrus RCPTT tests

Fix test ts017_tc004.5
Add timer around some graphical asserts

Change-Id: I79ed3470020c961f91d2c4345ce68b54e37e614f
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>

4 files changed, 39 insertions, 9 deletions

diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/EGitPreferenceContext.ctx b/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/EGitPreferenceContext.ctx
new file mode 100644
index 000000000..fc000e2e8
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/EGitPreferenceContext.ctx
@@ -0,0 +1,26 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.preferences
+Element-Name: EGitPreferenceContext
+Element-Type: context
+Element-Version: 2.0
+Id: _aLjwYHc5EeW4qNishx0z-w
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/20/15 4:48 PM
+
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf
+Content-Type: q7/binary
+Entry-Name: .q7.content
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAAC1VMtu2zAQvPsrCN5N
+OWkLFILloEiNNGgeRnxIewpYaiWzFkmVXFlyv77LWFGcImiQwrkR5OzM7CzJ6UlnKrYBH7SzGT8SE87A
+KpdrW2a8wWL8kZ/MRlPnSwGq0nUA4VWNKBR2ovZQgCc8hHTxuD51FqFD1hmdDtTHkZrEbEhpP+MrxDpN
+krZthTOlIIHk2+X5AAlPIe27e8TxZHJEsIulWoGRY20DSlJ8qHrR5cD5gIqk98iEkMkekjMrDWR8fqbx
+sbW+M850nvE7efGz/f5FfZjD7ftfVzqsusnvccuZqkDaxb4q+gb4bMTYVEUGiz370EA8i6crXeWhP9zv
+xjlTr0QAbGrR6B5OBblEySisFLf1XyXPj2mJnkYbzX2mUs7WsM14WOtakBMf6VGGNbW/kVUDvfPkwHpg
+5Y8K9nDCg3I+Bz/oFrIKg/A02QXzUkqRxRiwRBRiP2qNXpKL6O3QmdEgC102HvK3zUoqpPczaJyfXV3f
+zF8bDJSa5JyHw6fg4W6HoiQuwZdAOIlQbgfLxuVQMZpNQ1/B5tVDBVOQdVNLD0Ln8AbX/99qT69pcFUT
+B7JUroahxdvrm6/LxafTZwdD692jp380+Z+PdDb6A1BLBwhpuexx0AEAAKcFAABQSwECFAAUAAgICAAA
+ACEAabnscdABAACnBQAACAAJAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRVVAUAAQAAAABQSwUGAAAAAAEA
+AQA/AAAADwIAAAAA
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc004.1_merge_resource_location_test.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc004.1_merge_resource_location_test.test
index 41e055c5c..bfe243fb6 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc004.1_merge_resource_location_test.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc004.1_merge_resource_location_test.test
@@ -54,7 +54,9 @@ with [get-view "Model Explorer" | get-tree] {
 }
 with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Package2] {
     get-edit-part -name Class1 | get-edit-part -text Class1 | get-property text | equals Class1 | verify-true
-    get-edit-part -name Class2 | get-edit-part -text Class2 | get-property text | equals Class2 | verify-true
+    try -command {
+    	get-edit-part -name Class2 | get-edit-part -text Class2 | get-property text | equals Class2 | verify-true
+	} -catch { wait 500 } -times 30
 }
 with [get-view "Model Explorer" | get-tree] {
     get-item "root/Diagram NewPackageDiagram" | click
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc004.4_cherrypick_resource_location_test.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc004.4_cherrypick_resource_location_test.test
index bc27c07ce..52451a4c0 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc004.4_cherrypick_resource_location_test.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc004.4_cherrypick_resource_location_test.test
@@ -7,7 +7,7 @@ Element-Version: 3.0
 External-Reference: 
 Id: _yrW4UHMhEeWJlLI5frq0hw
 Runtime-Version: 2.0.0.201506120617
-Save-Time: 10/20/15 2:14 PM
+Save-Time: 10/20/15 5:25 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -65,8 +65,10 @@ with [get-view "Model Explorer" | get-tree] {
     get-item "root/Package2/Diagram ClassDiagramP2" | click
     select "root/Package2/Diagram ClassDiagramP2" | double-click
 }
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Package2] {
-    get-edit-part -name Class1 | get-edit-part -text Class1 | get-property text | equals Class1 | verify-true
-    get-edit-part -name Class2 | get-edit-part -text Class2 | get-property text | equals Class2 | verify-true
-}
+try -command {
+	with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Package2] {
+    	get-edit-part -name Class1 | get-edit-part -text Class1 | get-property text | equals Class1 | verify-true
+    	get-edit-part -name Class2 | get-edit-part -text Class2 | get-property text | equals Class2 | verify-true
+	}
+} -catch { wait 500 } -times 30
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc007_merge_multiple_projects_with_conflicts.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc007_merge_multiple_projects_with_conflicts.test
index d8e2f29cc..bcbdc2af1 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc007_merge_multiple_projects_with_conflicts.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc007_merge_multiple_projects_with_conflicts.test
@@ -1,13 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_iRDjwHJKEeW0UJaeREW8jA,_d_GLMHDdEeWhSZQCADl_Kg
+Contexts: _aLjwYHc5EeW4qNishx0z-w,_LOMGYGrvEeK_JdLra2Bk5A,_iRDjwHJKEeW0UJaeREW8jA,_d_GLMHDdEeWhSZQCADl_Kg
 Element-Name: ts017_tc007_merge_multiple_projects_with_conflicts
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _AXnCoHKCEeW0UJaeREW8jA
 Runtime-Version: 2.0.0.201506120617
-Save-Time: 10/20/15 2:18 PM
+Save-Time: 10/20/15 5:06 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -75,7 +75,7 @@ get-view "Package Explorer" | get-tree
 // Open Model Merge Tool
 get-view "Package Explorer" | get-tree 
     | select "Design_EMFCompare  [emf-compare-papyrus-egit|Conflicts conflict_add_postprocessor]/Main.notation" 
-    | get-menu "Team/Merge Tool" | click
+    | get-menu "Team/Model Merge Tool \\(with EMFCompare\\)" | click
     
 // Assert their is 4 conflict categories
 with [get-editor "Repository 'emf-compare-papyrus-egit': Merging 'Add IMerger and UMLMerger' into 'refs/heads/conflict_add_postprocessor'"