From 223fb7874e850c3e8d267bd96fae09d3ee6938c7 Mon Sep 17 00:00:00 2001 From: Arthur Daussy Date: Mon, 13 Oct 2014 15:04:58 +0200 Subject: [PATCH] Corrects labels after enhancement on conflicts label. Change-Id: I27d7d3a62f8846b45bbd516086766026c6213ddb --- .../MatchEngineConfigurationWorkspaceContext.ctx | 207 +++++++++++---------- .../org.eclipse.emf.compare.q7.tests/q7.properties | 6 +- .../groups/ts004_tc004_trees_under_groups.test | 6 +- .../groups/ts004_tc005_by_side_conflicts.test | 12 +- .../ts004_tc007_group_item_double_click.test | 2 +- ...016_tc004_match_engine_configuration_never.test | 3 - 6 files changed, 117 insertions(+), 119 deletions(-) diff --git a/plugins/org.eclipse.emf.compare.q7.tests/contexts/preferences/MatchEngineConfigurationWorkspaceContext.ctx b/plugins/org.eclipse.emf.compare.q7.tests/contexts/preferences/MatchEngineConfigurationWorkspaceContext.ctx index 6a13e5cfc..b4ecb34ae 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/contexts/preferences/MatchEngineConfigurationWorkspaceContext.ctx +++ b/plugins/org.eclipse.emf.compare.q7.tests/contexts/preferences/MatchEngineConfigurationWorkspaceContext.ctx @@ -6,9 +6,79 @@ Element-Name: MatchEngineConfigurationWorkspaceContext Element-Type: context Element-Version: 2.0 Id: _q_dzsL8bEeO668you7X_bw -Q7-Runtime-Version: 1.3.10.201312200736 -Save-Time: 6/3/14 6:05 PM +Q7-Runtime-Version: 1.3.13.201408151228 +Save-Time: 10/13/14 2:42 PM +------=_contents/Models/WithId/extlibraryOrigin.ecore-b385922f-02b9-38f1-b195-ce1193e690e5 +Content-Type: q7/binary +Entry-Name: contents/Models/WithId/extlibraryOrigin.ecore + +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 +dGVudFBLBQYAAAAAAQABADYAAADmBQAAAAA= +------=_contents/Models/WithId/extlibraryOrigin.ecore-b385922f-02b9-38f1-b195-ce1193e690e5-- +------=_contents/Models/WithoutID/verySmallLeft.ecore-5cc3f95d-f381-3415-8885-59ca4e119593 +Content-Type: q7/binary +Entry-Name: contents/Models/WithoutID/verySmallLeft.ecore + +UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSVkdFKwzAUhu/7FCH3a7p6I6XtEDdh +oDDUibchnnQHm6Qk0bZv72l1Y7sZmNv//76cnJSrwbTsG3xAZyu+TDPOwCr3gbap+P71YXHLV3VSgnIe +is1Oqk/ZABsMFicoJyhhdEhlQ0FZxQ8xdoUQfd+nzjSp8414f9ryYyVcVvqbuZFn2ZJqjy/qAEYu0IYo +rYJz+TzHBQuqxS7ALACjJ0kuNlONMysNlc24dkai/fXYsH/eXjUoZzrpQUQIMYgTTeTOg8bhzFiTsoT7 +VoaAGmkhjJ5WxLGja/9WNofHUd7Aj2vUGjzYyBnaCF5LRUn0X8DFf313E1KKy9+pkx9QSwcILXJpW/wA +AADWAQAAUEsBAhQAFAAICAgAAAAhAC1yaVv8AAAA1gEAAAgAAAAAAAAAAAAAAAAAAAAAAC5jb250ZW50 +UEsFBgAAAAABAAEANgAAADIBAAAAAA== +------=_contents/Models/WithoutID/verySmallLeft.ecore-5cc3f95d-f381-3415-8885-59ca4e119593-- +------=_contents/Models/WithId/ExpectedResult_ConfUsingId.csv-0cf42c0e-892c-37fe-8e36-2f9cd32a13e4 +Content-Type: q7/binary +Entry-Name: contents/Models/WithId/ExpectedResult_ConfUsingId.csv + +UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSdU2Fv0zAQ/Z5fYe2z6aAZX5CINMqQ +Kq0IsQmEqgq58SU5cOzKPneUX88lzWhourXlUxLf83t3916+o9VgSRL8ouSlzMTE2cJgTiF51fsS87Fw +kYQrxFjkjxARrYfgzBr0IhlLA7akSsytqkHklbLl9rxGGwnCfuF8fhXoY0PxRtzckUdbijnwS8wpemU+ +gOIn62gwQLBIUlmoGs2mvbMVD0D7wumjcPqk8Cfw6DTmyogXmZgS1Cw84XYCFgi+r3iPZEB3kLu4An+/ +WXFPSrdMF0MqKZ67c9GaMnOsEC6/IlVTfclWGVx65Te3UNAIcuehHWpXYKlMvHPu50QRlI4PUnlj801u +3Ao0KvGWx53DLRLw5rr2Uvmeh0dnmYABVwPAltR796CWBhi/+xi6ngmeNTjbzHmtNe8zdLcyMXQyuZJ/ +Pf2h1mpkmGi0PVlwI81G2JXWP/Y1GnNKErqxCvTnJafrfs8pZhqatLMeQ4gQ+No3UL5Rmlo6JjNTpfqN +FhqJCfo8GkXc3YGItaM8l4XPWFZHwnBA5VhkUxnikhrEibvmH51mbn0UXjOmxZ/C3fdlL9UzzslTceZa +9dAUXx+M8nXU6L5giMq00//Pds5sv+93L2AHrB7/qzyo/wFQSwcIt0Qui90BAAC5BQAAUEsBAhQAFAAI +CAgAAAAhALdELovdAQAAuQUAAAgAAAAAAAAAAAAAAAAAAAAAAC5jb250ZW50UEsFBgAAAAABAAEANgAA +ABMCAAAAAA== +------=_contents/Models/WithId/ExpectedResult_ConfUsingId.csv-0cf42c0e-892c-37fe-8e36-2f9cd32a13e4-- +------=_contents/Models/.project-1c3abfda-0ad6-32cb-85ee-dd0fd03c2ba8 +Content-Type: q7/binary +Entry-Name: contents/Models/.project + +UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSzsa/IzVEoSy0qzszPs1Uy1DNQUkjN +S85PycxLt1UKDXHTtVCyt+OyKSjKz0pNLnFJLU4uyiwoASq24+K0yUvMTbXzzU9JzSm20QdzgILJ+bm5 +qXkldjb6MBZQEKq/GMTWR+YklWbmpAQXpCaDZVB4eYklpUWpEC1wNlw3ilMAUEsHCKD4XfF/AAAAxwAA +AFBLAQIUABQACAgIAAAAIQCg+F3xfwAAAMcAAAAIAAAAAAAAAAAAAAAAAAAAAAAuY29udGVudFBLBQYA +AAAAAQABADYAAAC1AAAAAAA= +------=_contents/Models/.project-1c3abfda-0ad6-32cb-85ee-dd0fd03c2ba8-- ------=_contents/Models/WithId/extlibraryLeft.ecore-e9480c04-b83f-3fa6-8726-a503db33b244 Content-Type: q7/binary Entry-Name: contents/Models/WithId/extlibraryLeft.ecore @@ -41,33 +111,6 @@ j1Xnk1b/GvdkUYRyqaUNJYjFmXDIEMvf4ZI3zU+s/sUVfi0Sk5+UL63nzdGsu9D8FT2vEXHDqfDhb4r+ dI875VbbQflXfrj0P1BLBwigB4XVwwUAACAoAABQSwECFAAUAAgICAAAACEAoAeF1cMFAAAgKAAACAAA AAAAAAAAAAAAAAAAAAAALmNvbnRlbnRQSwUGAAAAAAEAAQA2AAAA+QUAAAAA ------=_contents/Models/WithId/extlibraryLeft.ecore-e9480c04-b83f-3fa6-8726-a503db33b244-- -------=_contents/Models/WithoutID/verySmallRight.ecore-d54a8ad8-9022-341d-8a3a-077cf824f732 -Content-Type: q7/binary -Entry-Name: contents/Models/WithoutID/verySmallRight.ecore - -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnR9kMGKwjAQhu99ipC7Te1eJLQVURcE -F2R3hb2GOK3BJimZsK1vv2N3FXvZXOf7v8z8xXKwLfuGgMa7ks/TjDNw2p+Ma0p+/HydLfiySgrQPoDc -HpS+qAbYYI18hHIKJYweqRxKmpX8HGMnhej7PvW2SX1oxNfbjt8RnCL9y0jkWTYnbP+hz2DVzDiMyml4 -lo97TLKgW9MhjAKw9U2Si+0N48wpS7C9brxVxv16HB7fd/8atLedCiAiYETxSFPyEKA2w5OxYoykBaxb -hWhqQ5UwOk7Ga0cf/5U2Du/LrLigOsW0zyr5AVBLBwjcPv/b5gAAAIgBAABQSwECFAAUAAgICAAAACEA -3D7/2+YAAACIAQAACAAAAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRQSwUGAAAAAAEAAQA2AAAAHAEAAAAA - -------=_contents/Models/WithoutID/verySmallRight.ecore-d54a8ad8-9022-341d-8a3a-077cf824f732-- -------=_contents/Models/WithId/ExpectedResult_ConfUsingId.csv-0cf42c0e-892c-37fe-8e36-2f9cd32a13e4 -Content-Type: q7/binary -Entry-Name: contents/Models/WithId/ExpectedResult_ConfUsingId.csv - -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSdU9Fu00AQfPdXnPpsUqjLCxKWSihS -pAYhWlGhKqo2vrW9cL6L7vZawtezdixi4rRJebJ9OzezuzO+J6vRcsr4i5PXaa6mzpaGCg7Jm8FXcpYa -tBXX6s5Cg6qowVaoF3LekI2MYbewexsCf24B79TlNXuylbpDeYkFRw/mE4I8hUWjQcZFkqUlNGTW3Z0N -dUAe0X5BT05TAUa9ytWMsRHaqYgFKgn9kO+G2KDuIddxhf5mvRJF0N0YJ2OqVD1356Rb19yJQji9Ja5n -+lSWaGjpwa+vsOQJFs5j1/K2IFK5+uDczykwVk4OsvTSFuvCuBVqAvVeZSJ2RYyyl769LP0o85KzQiCA -8xFgQ+q9e4SlQcFvP8aO5UpmDc62c15oLWsP/a1cjX1KztO/jv2AB5gYIZpsThbSSLsRFW3njrgWjTnG -536skvzLctF3v+OUMI1N2lpPIUQMcu07gm+VZpYPycyhgt9ksZWYki+iAZbu9kSsG+W5LHylqj4Qhj0q -hyKbpSEuuUUcuWv5SXnuHg7CG8F0+GO4h77spHouOXkqzlKrH9vi271Rvoia3DcKEUw3/f9s54XtD/0e -BGyP1Wf/Ko/qfwBQSwcIZXsIocUBAABTBQAAUEsBAhQAFAAICAgAAAAhAGV7CKHFAQAAUwUAAAgAAAAA -AAAAAAAAAAAAAAAAAC5jb250ZW50UEsFBgAAAAABAAEANgAAAPsBAAAAAA== -------=_contents/Models/WithId/ExpectedResult_ConfUsingId.csv-0cf42c0e-892c-37fe-8e36-2f9cd32a13e4-- ------=_contents/Models/WithoutID/ExpectedResult_ConfUsingId.csv-73e8f78b-f9e1-3ec1-9963-0f87668f0e33 Content-Type: q7/binary Entry-Name: contents/Models/WithoutID/ExpectedResult_ConfUsingId.csv @@ -76,33 +119,35 @@ UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnQrSa0o4QIAUEsHCCfa7DcHAAAABQAA AFBLAQIUABQACAgIAAAAIQAn2uw3BwAAAAUAAAAIAAAAAAAAAAAAAAAAAAAAAAAuY29udGVudFBLBQYA AAAAAQABADYAAAA9AAAAAAA= ------=_contents/Models/WithoutID/ExpectedResult_ConfUsingId.csv-73e8f78b-f9e1-3ec1-9963-0f87668f0e33-- -------=_contents/Models/.project-1c3abfda-0ad6-32cb-85ee-dd0fd03c2ba8 -Content-Type: q7/binary -Entry-Name: contents/Models/.project - -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSzsa/IzVEoSy0qzszPs1Uy1DNQUkjN -S85PycxLt1UKDXHTtVCyt+OyKSjKz0pNLnFJLU4uyiwoASq24+K0yUvMTbXzzU9JzSm20QdzgILJ+bm5 -qXkldjb6MBZQEKq/GMTWR+YklWbmpAQXpCaDZVB4eYklpUWpEC1wNlw3ilMAUEsHCKD4XfF/AAAAxwAA -AFBLAQIUABQACAgIAAAAIQCg+F3xfwAAAMcAAAAIAAAAAAAAAAAAAAAAAAAAAAAuY29udGVudFBLBQYA -AAAAAQABADYAAAC1AAAAAAA= -------=_contents/Models/.project-1c3abfda-0ad6-32cb-85ee-dd0fd03c2ba8-- ------=_contents/Models/WithId/ExpectedResult_ConfUsingContent.csv-e9e2f2fe-e74d-3003-81ee-a11a944b7dac Content-Type: q7/binary Entry-Name: contents/Models/WithId/ExpectedResult_ConfUsingContent.csv -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSVVFFv2kAMfudXnHjOaLuwl0mL1NJO -QoJpWqtVE0LTkTPB63GH7nxl7NfPCSlJExroS5KL7c+f7c/3G40CQxHBX+pdRokYWbPUmJLvXdVOvY/R -Mmj9Ta5BzEz+TFfSZKDmuQWdp2OmJoJco94Vjp/F3T05NJmYAX+ElIKT+itIfoMXa/sM815cj9hDe6DX -GU8AKdBAHVANhms0gcBPwGS0yrHHhk4B673z26CEpM+s+Eznl+SNRN/BoVWYSi0+JGJMsObwkZbe4xLB -1Uk/5GlU6XIfNuAedhtGlqqYaL8NFYmumH6hnanlDP7iEWk1VhesKI0LJ91uAksaQGodFJQrA6dKxI11 -zm7lQgMTqw5tnXECmcl/aCAnNUKXBi2Ju5Rz4th+41dFvY7aph5HG5nxqWveZWMSwZ3x1uTQ10qxxZfE -E3FYkMP0esPoUsy03YK7scGoqpjCvy1iDjgM/o98lgPN/oP9nzkTy1mLYMotyFtnn0aSILPcyzi6M+ku -1XYDCqX4ImKOmCAB11EWEEe3LBW0hnvPDsOWQ1lhY/Yc1x57JSb0PoDnsF8g3Vlb0yWWH5itOtVin46P -v1PTceTD4h2bOKz8GzqM+a70NGWvc3f6lG4T0SD2XhlcB4X2J/og9Yvuj2XR9Wstz1HMCQ01MU/2srwn -z9uYhkinXMtb6mTbapsbPx1R5itO9WutsP8HUEsHCL5hDT4RAgAAyQYAAFBLAQIUABQACAgIAAAAIQC+ -YQ0+EQIAAMkGAAAIAAAAAAAAAAAAAAAAAAAAAAAuY29udGVudFBLBQYAAAAAAQABADYAAABHAgAAAAA= - +UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSlVduO2jAQfecrLJ5TdkvoS6Ui7dKt +hARV1V11VSFUmXgI0zU2ssdQ+vWdhEAC4aq+APbMnDOXM+YXGgWGIoI/1LiPuqJnzVRjQr7xvnISo7aw +gYSdirZIti4iGAfe6iWocaMdTYPWX+UcxMhkn8lMmrSwoPN0zLTPEW854tMcco56nUN9FE/P5NCkYgT8 +IyQUnNRfQPI3eDG3Sxg34mrEhtwD7ed0AUiBBjoDdXOf5mgCgR+ASWmWsfcNXaLWG+f/oSUkfWXXrnTe +pnfzFL+BQ6swkVq864o+wZwJelp6j1MEVy38JUtEFS7PYQHuZb1gbqlypGYdKhLnYpq5yoeWGfzdK9Ks +r+5Y+xonTrr1AKbUgsQ6yIsqDUzVFY/WvvUkQWr5Io6eTLJOtF2AQik+cbkjGCABd6hIL44+c/FoDQOw +Q6fmsAF1zq7kRAP7l4f6EnHWMpV/0UBWaQ9dErQkHk5WKMc2D67KflRR6/2Io4VM+XROiLtsud3emgz6 +QSm2+CLxrtht/040jU50L0barsA92mBUWUzuX98/Dtjp7bdcypZm/9bmZsyJZVmzkooFzpM5mD0j18de +igm9D+A57CdId9XmnRPLd0xn16tlyLWckgnbZqvM+OGEROzb8Zmf3Y448mFyw9Z3Sv8D8cX8/+BpyF7X +vh+XxNoVB4ndOvuHoND+QB+k3or9GIuuPrIZRz5xNHSIebGXxat9zZrsIVWftdz+D1BLBwjrbfrRJwIA +AHMHAABQSwECFAAUAAgICAAAACEA62360ScCAABzBwAACAAAAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRQ +SwUGAAAAAAEAAQA2AAAAXQIAAAAA ------=_contents/Models/WithId/ExpectedResult_ConfUsingContent.csv-e9e2f2fe-e74d-3003-81ee-a11a944b7dac-- +------=_contents/Models/WithoutID/verySmallRight.ecore-d54a8ad8-9022-341d-8a3a-077cf824f732 +Content-Type: q7/binary +Entry-Name: contents/Models/WithoutID/verySmallRight.ecore + +UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnR9kMGKwjAQhu99ipC7Te1eJLQVURcE +F2R3hb2GOK3BJimZsK1vv2N3FXvZXOf7v8z8xXKwLfuGgMa7ks/TjDNw2p+Ma0p+/HydLfiySgrQPoDc +HpS+qAbYYI18hHIKJYweqRxKmpX8HGMnhej7PvW2SX1oxNfbjt8RnCL9y0jkWTYnbP+hz2DVzDiMyml4 +lo97TLKgW9MhjAKw9U2Si+0N48wpS7C9brxVxv16HB7fd/8atLedCiAiYETxSFPyEKA2w5OxYoykBaxb +hWhqQ5UwOk7Ga0cf/5U2Du/LrLigOsW0zyr5AVBLBwjcPv/b5gAAAIgBAABQSwECFAAUAAgICAAAACEA +3D7/2+YAAACIAQAACAAAAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRQSwUGAAAAAAEAAQA2AAAAHAEAAAAA + +------=_contents/Models/WithoutID/verySmallRight.ecore-d54a8ad8-9022-341d-8a3a-077cf824f732-- ------=_contents/Models/WithoutID/ExpectedResult_ConfUsingContent.csv-26d83bf8-18ac-394f-959a-0778aed6e28d Content-Type: q7/binary Entry-Name: contents/Models/WithoutID/ExpectedResult_ConfUsingContent.csv @@ -112,63 +157,19 @@ TczM4zLUCUstqnTJTEtLLQKqUIhOdc5JLC7OTMtMLSpWSExJieUCAFBLBwgq1KRyPgAAAD0AAABQSwEC FAAUAAgICAAAACEAKtSkcj4AAAA9AAAACAAAAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRQSwUGAAAAAAEA AQA2AAAAdAAAAAAA ------=_contents/Models/WithoutID/ExpectedResult_ConfUsingContent.csv-26d83bf8-18ac-394f-959a-0778aed6e28d-- -------=_contents/Models/WithoutID/verySmallLeft.ecore-5cc3f95d-f381-3415-8885-59ca4e119593 -Content-Type: q7/binary -Entry-Name: contents/Models/WithoutID/verySmallLeft.ecore - -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSVkdFKwzAUhu/7FCH3a7p6I6XtEDdh -oDDUibchnnQHm6Qk0bZv72l1Y7sZmNv//76cnJSrwbTsG3xAZyu+TDPOwCr3gbap+P71YXHLV3VSgnIe -is1Oqk/ZABsMFicoJyhhdEhlQ0FZxQ8xdoUQfd+nzjSp8414f9ryYyVcVvqbuZFn2ZJqjy/qAEYu0IYo -rYJz+TzHBQuqxS7ALACjJ0kuNlONMysNlc24dkai/fXYsH/eXjUoZzrpQUQIMYgTTeTOg8bhzFiTsoT7 -VoaAGmkhjJ5WxLGja/9WNofHUd7Aj2vUGjzYyBnaCF5LRUn0X8DFf313E1KKy9+pkx9QSwcILXJpW/wA -AADWAQAAUEsBAhQAFAAICAgAAAAhAC1yaVv8AAAA1gEAAAgAAAAAAAAAAAAAAAAAAAAAAC5jb250ZW50 -UEsFBgAAAAABAAEANgAAADIBAAAAAA== -------=_contents/Models/WithoutID/verySmallLeft.ecore-5cc3f95d-f381-3415-8885-59ca4e119593-- ------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf Content-Type: q7/binary Entry-Name: .q7.content -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnTNU89vgjAUvi/Z/0B6X7vtoIbAPDgP -JBoTl0VvBGmBbqXFtgjur9/DARq3GI67tf1+vPc+Ht60zoVzYNpwJX30hB+Rw2SsKJepj0qbPEzQ9OX+ -zotVjmulGcX7Ma6U/jRFFDN3051mSlpWW6fOudvbPTd2UEAaF959lFlbuIRUVYVVnmKlU7JdBh3l7xK9 -igBOTjjZj0mPYxbDG3JklAN3Gdk4m8uUy6ajhKeljiz0ct0ncjj1UbgP6ZdZTHZzthqNJkdVjrfhrkIw -sOPAyECV9nSBa6HVB4ut6SopyoRBLQp4wgXrQNySEbnAlaAQTMvYcJsF9Cy/MpjXBcgZXTNTChs2s7wb -+Cazn55wbA4X3gPFAb2tg1wE3+lIHxcssW2wA9grzSHw4fw1T7Pf9h5pE7oVmSpt8Pq/UoNtP77lkRBD -QuvJwzLwSLd1PytJzjvZnAf9ksD9BlBLBwjsIwc5WAEAAOYDAABQSwECFAAUAAgICAAAACEA7CMHOVgB -AADmAwAACAAAAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRQSwUGAAAAAAEAAQA2AAAAjgEAAAAA +UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnS1U0FvgjAYvfsrSO9rtx3UENCD80Ci +MXFZ9EaQFuhWWmyL4H79PhxgZrbpYbt99L3v9XuvH960zoVzYNpwJX30gO+Rw2SsKJepj0qb3I3RdDLw +YpXjWmlG8X6EK6XfTBHFzN101UxJy2rr1Dl3e7XHRg30pXHh3EeZtYVLSFVVWOUpVjol22XQUb6/ou8i +gJMTTvYj0uOYxXCGHBnlwF1GNs7mMuWymSjhaakjC7NczokcTn0U7kP6bhbj3ZythsPxUZWjbbir0GTg +OOAYmNI2NXwVWr2y2JruHkWZMOgTBDjhgnUYbrmInGElKITSEjbcZqq0wVPff6EwrwvoZ3TNTCls2Dh5 +MfAgAcWxOZx1L9og9+NzHgmx5mlm22Cukhcsucb9aZ7ZZ0Rfh/JI6/YX9wH9Y+vwpILvdKSPt3g/s1ea +w67cTP/nrDzSrdlpA0m/gk150/83GXwAUEsHCEHB7eJaAQAA0QMAAFBLAQIUABQACAgIAAAAIQBBwe3i +WgEAANEDAAAIAAAAAAAAAAAAAAAAAAAAAAAuY29udGVudFBLBQYAAAAAAQABADYAAACQAQAAAAA= ------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf-- -------=_contents/Models/WithId/extlibraryOrigin.ecore-b385922f-02b9-38f1-b195-ce1193e690e5 -Content-Type: q7/binary -Entry-Name: contents/Models/WithId/extlibraryOrigin.ecore - -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 -dGVudFBLBQYAAAAAAQABADYAAADmBQAAAAA= -------=_contents/Models/WithId/extlibraryOrigin.ecore-b385922f-02b9-38f1-b195-ce1193e690e5-- ------=_contents/Models/WithId/extlibraryRight.ecore-04f82fdc-b293-3196-8fe4-958a911f2bc0 Content-Type: q7/binary Entry-Name: contents/Models/WithId/extlibraryRight.ecore diff --git a/plugins/org.eclipse.emf.compare.q7.tests/q7.properties b/plugins/org.eclipse.emf.compare.q7.tests/q7.properties index 9aaf1685f..4ff42adde 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/q7.properties +++ b/plugins/org.eclipse.emf.compare.q7.tests/q7.properties @@ -4,7 +4,7 @@ Q7-vendor: www.xored.com/q7 Element-Name: Project Settings Element-Type: projectMetadata Element-Version: 2.0 -Id: _FvGgARxCEeOvMsdEm-eT7w -Q7-Runtime-Version: 1.3.7.201309090800 -Save-Time: 9/13/13 8:59 AM +Id: _O3teUFLVEeSjNpUXbiXtwQ +Q7-Runtime-Version: 1.3.13.201408151228 +Save-Time: 10/13/14 2:34 PM diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc004_trees_under_groups.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc004_trees_under_groups.test index 700886336..dd61d0c54 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc004_trees_under_groups.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc004_trees_under_groups.test @@ -64,7 +64,7 @@ with [get-editor "Compare .*" get-item "> Conflicts" | get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItemCount()" | equals 0 | verify-true get-item "> Conflicts" - | get-property "getItems().TreeItem[0].getText()" | equals "> Conflict" | verify-true + | get-property "getItems().TreeItem[0].getText()" | equals "> Conflict [2 out of 2 conflicts unresolved]" | verify-true get-item "> Conflicts" | get-property "getItems().TreeItem[1].getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "familyName [name set]" | verify-true @@ -77,7 +77,7 @@ with [get-editor "Compare .*" get-item "> Conflicts" | get-property "getItems().TreeItem[1].getItems().TreeItem[0].getItemCount()" | equals 1 | verify-true get-item "> Conflicts" - | get-property "getItems().TreeItem[1].getText()" | equals "> Conflict" | verify-true + | get-property "getItems().TreeItem[1].getText()" | equals "> Conflict [2 out of 2 conflicts unresolved]" | verify-true get-item "> Conflicts" | get-property "getItems().TreeItem[2].getItems().TreeItem[0].getItems().TreeItem[0].getText()" | equals "TitledItem [eSuperTypes add]" | verify-true @@ -95,7 +95,7 @@ with [get-editor "Compare .*" get-item "> Conflicts" | get-property "getItems().TreeItem[2].getItems().TreeItem[1].getItemCount()" | equals 0 | verify-true get-item "> Conflicts" - | get-property "getItems().TreeItem[2].getText()" | equals "> Conflict" | verify-true + | get-property "getItems().TreeItem[2].getText()" | equals "> Conflict [3 out of 3 conflicts unresolved]" | verify-true } get-editor "Compare .*" | get-tree | select "> Library\\/extlibraryLeft.ecore" | expand-all diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc005_by_side_conflicts.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc005_by_side_conflicts.test index 0f0ee2877..5aff297c5 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc005_by_side_conflicts.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc005_by_side_conflicts.test @@ -62,7 +62,7 @@ with [get-editor "Compare .*" get-item "> Conflicts" | get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItemCount()" | equals 0 | verify-true get-item "> Conflicts" - | get-property "getItems().TreeItem[0].getText()" | equals "> Conflict" | verify-true + | get-property "getItems().TreeItem[0].getText()" | equals "> Conflict [2 out of 2 conflicts unresolved]" | verify-true get-item "> Conflicts" | get-property "getItems().TreeItem[0].getItemCount()" | equals 2 | verify-true get-item "> Conflicts" @@ -80,7 +80,7 @@ with [get-editor "Compare .*" get-item "> Conflicts" | get-property "getItems().TreeItem[2].getItems().TreeItem[1].getItemCount()" | equals 0 | verify-true get-item "> Conflicts" - | get-property "getItems().TreeItem[2].getText()" | equals "> Conflict" | verify-true + | get-property "getItems().TreeItem[2].getText()" | equals "> Conflict [3 out of 3 conflicts unresolved]" | verify-true get-item "> Conflicts" | get-property "getItems().TreeItem[2].getItemCount()" | equals 2 | verify-true } @@ -101,7 +101,7 @@ get-editor "Compare .*" with [get-editor "Compare .*" | get-tree] { get-item "> Conflicts" - | get-property "getItems().TreeItem[1].getText()" | equals "> Pseudo Conflict" | verify-true + | get-property "getItems().TreeItem[1].getText()" | equals "> Pseudo Conflict [4 out of 4 conflicts unresolved]" | verify-true get-item "> Conflicts" | get-property "getItems().TreeItem[1].getItemCount()" | equals 2 | verify-true get-item "> Conflicts" @@ -115,7 +115,7 @@ with [get-editor "Compare .*" get-item "> Conflicts" | get-property "getItems().TreeItem[1].getItems().TreeItem[1].getItemCount()" | equals 1 | verify-true get-item "> Conflicts" - | get-property "getItems().TreeItem[0].getText()" | equals "> Conflict" | verify-true + | get-property "getItems().TreeItem[0].getText()" | equals "> Conflict [2 out of 2 conflicts unresolved]" | verify-true get-item "> Conflicts" | get-property "getItems().TreeItem[0].getItemCount()" | equals 2 | verify-true get-item "> Conflicts" @@ -123,7 +123,7 @@ with [get-editor "Compare .*" get-item "> Conflicts" | get-property "getItems().TreeItem[0].getItems().TreeItem[1].getItemCount()" | equals 0 | verify-true get-item "> Conflicts" - | get-property "getItems().TreeItem[2].getText()" | equals "> Conflict" | verify-true + | get-property "getItems().TreeItem[2].getText()" | equals "> Conflict [2 out of 2 conflicts unresolved]" | verify-true get-item "> Conflicts" | get-property "getItems().TreeItem[2].getItemCount()" | equals 1 | verify-true get-item "> Conflicts" @@ -132,7 +132,7 @@ with [get-editor "Compare .*" get-item "> Conflicts" | get-property "getItems().TreeItem[2].getItems().TreeItem[0].getItemCount()" | equals 1 | verify-true get-item "> Conflicts" - | get-property "getItems().TreeItem[4].getText()" | equals "> Conflict" | verify-true + | get-property "getItems().TreeItem[4].getText()" | equals "> Conflict [3 out of 3 conflicts unresolved]" | verify-true get-item "> Conflicts" | get-property "getItemCount()" | equals 5 | verify-true get-item "> Conflicts" | get-property "getItems().TreeItem[4].getItems().TreeItem[0].getItems().TreeItem[0].getItemCount()" | equals 0 diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc007_group_item_double_click.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc007_group_item_double_click.test index c4a80813f..c4ebb295a 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc007_group_item_double_click.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc007_group_item_double_click.test @@ -49,7 +49,7 @@ get-tab-folder -index 1 | get-property activePage | contains "Compare" | verify- with [get-editor "Compare (\'Library/extlibraryRight.ecore\' - \'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"] { - get-tree | get-item "> Conflicts/> Conflict/length \\[name changed\\]" | get-property selected | equals true + get-tree | get-item "> Conflicts/> Conflict [2 out of 2 conflicts unresolved]/length \\[name changed\\]" | get-property selected | equals true | verify-true get-text-viewer | get-property text | equals length | verify-true get-text-viewer -after [get-label "Library/extlibraryRight.ecore"] -index 1 | get-property text | equals minutes diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc004_match_engine_configuration_never.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc004_match_engine_configuration_never.test index 606e08bda..f31a33f63 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc004_match_engine_configuration_never.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc004_match_engine_configuration_never.test @@ -50,9 +50,6 @@ get-editor "Compare (\'Models/WithId/extlibraryRight.ecore\' - \'Models/WithId/e | click get-editor "Compare (\'Models/WithId/extlibraryRight.ecore\' - \'Models/WithId/extlibraryLeft.ecore\' - \'Models/WithId/extlibraryRight.ecore\')" | get-tree - | get-table-data | write-csv-file "workspace:/Models/WithId/ExpectedResult_ConfUsingContentWrite.csv" - -get-editor "Compare (\'Models/WithId/extlibraryRight.ecore\' - \'Models/WithId/extlibraryLeft.ecore\' - \'Models/WithId/extlibraryRight.ecore\')" | get-tree | get-table-data | eq[read-csv-file "workspace:/Models/WithId/ExpectedResult_ConfUsingContent.csv"] | assert-true "Unexpected diff tree" get-editor "Compare (\'Models/WithId/extlibraryRight.ecore\' - \'Models/WithId/extlibraryLeft.ecore\' - \'Models/WithId/extlibraryRight.ecore\')" -- 2.11.4.GIT