diff --git a/pom.xml b/pom.xml index b6d88beec..103ed389a 100644 --- a/pom.xml +++ b/pom.xml @@ -378,13 +378,55 @@ releng/org.obeonetwork.m2doc.update - + features/org.obeonetwork.m2doc.rcptt.feature + + tests/org.obeonetwork.m2doc.tests + tests/org.obeonetwork.m2doc.ide.tests + tests/org.obeonetwork.m2doc.sirius.tests + tests/org.obeonetwork.m2doc.genconf.tests + tests/org.obeonetwork.m2doc.genconf.edit.tests + tests/org.obeonetwork.m2doc.cdo.tests + tests/org.obeonetwork.m2doc.html.tests + tests/org.obeonetwork.m2doc.wikitext.tests + + tests/org.xtext.example.mydsl + tests/org.xtext.example.mydsl.ide + tests/org.xtext.example.mydsl.ui + + http://download.eclipse.org/releases/2024-03 + + + + + org.eclipse.tycho + target-platform-configuration + + + + org.obeonetwork.m2doc + m2doc-rcptt + 3.3.3-SNAPSHOT + + + + + + tests diff --git a/releng/org.obeonetwork.m2doc.rcpttproduct/m2doc.product b/releng/org.obeonetwork.m2doc.rcpttproduct/m2doc.product index 6d96c0256..518a0e072 100644 --- a/releng/org.obeonetwork.m2doc.rcpttproduct/m2doc.product +++ b/releng/org.obeonetwork.m2doc.rcpttproduct/m2doc.product @@ -7,7 +7,7 @@ M2Doc -Version 3.3.2 +Version 3.3.3 Visit https://github.com/ObeoNetwork/M2Doc diff --git a/releng/org.obeonetwork.m2doc.rcpttproduct/pom.xml b/releng/org.obeonetwork.m2doc.rcpttproduct/pom.xml index 00b8ba799..29d43feb7 100644 --- a/releng/org.obeonetwork.m2doc.rcpttproduct/pom.xml +++ b/releng/org.obeonetwork.m2doc.rcpttproduct/pom.xml @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt-SDK.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt-SDK.tpd new file mode 100644 index 000000000..0ebd5bc8f --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt-SDK.tpd @@ -0,0 +1,5 @@ +target "M2Doc RCPTT Target Platform SDK" + +with source requirements + +include "m2doc-rcptt.tpd" diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt.target b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt.target new file mode 100644 index 000000000..6cb08e4ac --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt.target @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt.tpd new file mode 100644 index 000000000..a1cad7549 --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt.tpd @@ -0,0 +1,106 @@ +target "M2Doc RCPTT Target Platform" + +with requirements + +location Eclipse-Shared-License "https://download.eclipse.org/cbi/updates/license" { + org.eclipse.license.feature.group lazy +} + +location Eclipse "https://download.eclipse.org/releases/2022-12" { + org.eclipse.platform.sdk lazy + org.eclipse.equinox.core.feature.feature.group lazy + org.eclipse.equinox.executable.feature.group lazy + org.eclipse.core.runtime lazy + org.eclipse.ui lazy + org.eclipse.ui.views.log lazy + org.eclipse.epp.mpc.feature.group lazy + + org.eclipse.emf.sdk.feature.group lazy + org.junit [4.0.0,5.0.0) + org.eclipse.gmf lazy + org.eclipse.gmf.runtime.diagram.ui lazy + org.eclipse.gmf.runtime.diagram.ui.render lazy + org.eclipse.jdt.feature.group lazy + org.w3c.dom.svg lazy + org.w3c.dom.smil lazy + org.w3c.css.sac lazy + + // for testing purpose only + org.eclipse.uml2.feature.group lazy + org.eclipse.pde.feature.group lazy + + // Sirius + org.eclipse.sirius.runtime.feature.group lazy + org.eclipse.sirius lazy + org.eclipse.sirius.diagram lazy + org.eclipse.sirius.diagram.ui lazy + org.eclipse.sirius.table lazy + org.eclipse.sirius.table.ui lazy + org.eclipse.sirius.runtime.ide.ui.feature.group lazy + org.apache.xerces lazy + + // AQL + org.eclipse.acceleo.query.feature.group lazy + org.eclipse.acceleo.query.source.feature.group lazy + org.antlr.runtime [4.7.2,4.7.3) + + // wikitext + org.eclipse.mylyn.wikitext [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.asciidoc [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.confluence [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.html [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.markdown [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.mediawiki [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.textile [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.tracwiki [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.twiki [3.0.0,3.1.0) +} + +location GMF-Runtime-1.16.3 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202401081627/" { + org.apache.batik.ext [1.17.0,1.17.1) + org.apache.batik.codec [1.17.0,1.17.1) + org.apache.batik.bridge [1.17.0,1.17.1) + org.apache.batik.script [1.17.0,1.17.1) + + org.apache.batik.transcoder [1.17.0,1.17.1) + org.apache.batik.util [1.17.0,1.17.1) + org.apache.batik.constants [1.17.0,1.17.1) + org.apache.batik.dom [1.17.0,1.17.1) + org.apache.batik.css [1.17.0,1.17.1) + org.apache.batik.gvt [1.17.0,1.17.1) + org.apache.batik.anim [1.17.0,1.17.1) + org.apache.batik.i18n [1.17.0,1.17.1) + org.apache.batik.dom.svg [1.17.0,1.17.1) + org.apache.batik.xml [1.17.0,1.17.1) + org.apache.batik.parser [1.17.0,1.17.1) + org.apache.batik.awt.util [1.17.0,1.17.1) + org.apache.batik.svggen [1.17.0,1.17.1) + org.apache.xmlgraphics [2.9.0,2.9.1) +} + +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/" { + org.kohsuke.args4j [2.0.21,2.1.0) + javax.servlet [3.1.0,3.2.0) +} + +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/" { + com.google.guava [15.0.0,16.0.0) +} + +location ObeoNetworkBits "https://obeo-networkaggregation-releases.s3.eu-west-1.amazonaws.com/bits/master/thirdparties" { + org.apache.poi.feature.feature.group lazy +} + +location CDO "https://download.eclipse.org/modeling/emf/cdo/drops/R20230307-0126/" { + org.eclipse.emf.cdo.sdk.feature.group lazy + org.eclipse.net4j.feature.group lazy +} + +location XText "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.29.0/" { + // for testing purpose only + org.eclipse.xtext.sdk.feature.group [2.29.0,2.30.0) +} + +location "https://download.eclipse.org/rcptt/release/2.5.4/repository" { + org.eclipse.rcptt.platform.feature.group lazy +} diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/pom.xml b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/pom.xml new file mode 100644 index 000000000..b87d8efe8 --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + org.obeonetwork.m2doc + org.obeonetwork.m2doc.parent + 3.3.3-SNAPSHOT + ../../.. + + + org.obeonetwork.m2doc + m2doc-rcptt + 3.3.3-SNAPSHOT + eclipse-target-definition + + diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.target b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.target index 064cd19da..cfd6f6a13 100644 --- a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.target +++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.target b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.target index a699d12aa..b9a6ce094 100644 --- a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.target +++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.tpd index cab9c6c68..fb5e830c9 100644 --- a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.tpd +++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.tpd @@ -78,7 +78,7 @@ location GEF-Classic "https://download.eclipse.org/tools/gef/classic/releases/3 org.eclipse.draw2d.sdk.feature.group lazy } -location "https://download.eclipse.org/sirius/updates/stable/7.4.0-S20240215-101501/2023-03/" { +location "https://download.eclipse.org/sirius/updates/releases/7.4.0/2023-03/" { org.eclipse.sirius.runtime.feature.group lazy org.eclipse.sirius lazy org.eclipse.sirius.diagram lazy diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Generation Configurations/Generation Selected - Mismatch M2Doc versions.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Generation Configurations/Generation Selected - Mismatch M2Doc versions.test index 3ffdc8c40..4a912183a 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Generation Configurations/Generation Selected - Mismatch M2Doc versions.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Generation Configurations/Generation Selected - Mismatch M2Doc versions.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _PpL8wJPuEei_a6q1mG9iYw Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:08 PM +Save-Time: 4/9/24, 11:05 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -27,7 +27,7 @@ with [get-window "Generation configuration"] { get-label "" -after [get-label "Select files"] | get-property "image.path" | equals "org.eclipse.jface/icons/full/message_warning.png" | verify-true get-editbox -after [get-label "Select files"] | get-property text - | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2" | verify-true + | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3" | verify-true } get-window "Generation configuration" | get-button Cancel | click ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac-- diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page edit version.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page edit version.test index 553aaeace..8024c320f 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page edit version.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page edit version.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _fz4iIH6XEei72vRv1zbFOA Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:08 PM +Save-Time: 4/9/24, 11:06 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -25,7 +25,7 @@ with [get-window "Template properties"] { get-editbox -after [get-label "M2Doc version:"] | set-text "" } get-window "Template properties" | get-button "Current version" | click -get-window "Template properties" | get-editbox -after [get-label "M2Doc version:"] | get-property text | equals "3.3.2" +get-window "Template properties" | get-editbox -after [get-label "M2Doc version:"] | get-property text | equals "3.3.3" | verify-true get-window "Template properties" | get-button Cancel | click ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac-- diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page initialization.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page initialization.test index b174b2209..63a13c69e 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page initialization.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page initialization.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _QxL0cH6WEei72vRv1zbFOA Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:08 PM +Save-Time: 4/9/24, 11:06 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -20,7 +20,7 @@ get-window "Template properties" | get-button "Next >" | click with [get-window "Template properties"] { get-button "Edit" | get-property enablement | equals false | verify-true get-table | get-property itemCount | equals 17 | verify-true - get-editbox -after [get-label "M2Doc version:"] | get-property text | equals "3.3.2" | verify-true + get-editbox -after [get-label "M2Doc version:"] | get-property text | equals "3.3.3" | verify-true get-button "Current version" | get-property enablement | equals true | verify-true } with [get-window "Template properties"] { diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page validation.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page validation.test index 52a043432..bd84ffa2e 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page validation.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Edit Template Properties/Variables page validation.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _c5JeUIBjEeiCOM4dUe4XbQ Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:08 PM +Save-Time: 4/9/24, 11:06 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -20,7 +20,7 @@ get-window "Template properties" | get-button "Next >" | click with [get-window "Template properties"] { get-button "Edit" | get-property enablement | equals false | verify-true get-table | get-property itemCount | equals 17 | verify-true - get-editbox -after [get-label "M2Doc version:"] | get-property text | equals "3.3.2" | verify-true + get-editbox -after [get-label "M2Doc version:"] | get-property text | equals "3.3.3" | verify-true get-button "Current version" | get-property enablement | equals true | verify-true } with [get-window "Template properties"] { diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Generate Documentation/M2Doc versions mismatch Cancel.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Generate Documentation/M2Doc versions mismatch Cancel.test index 223760196..e3958bac5 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Generate Documentation/M2Doc versions mismatch Cancel.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Generate Documentation/M2Doc versions mismatch Cancel.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _mQalIBWoEeqNEaKdKpcCSw Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:09 PM +Save-Time: 4/9/24, 11:06 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -25,8 +25,8 @@ exec-with-options { get-view "Project Explorer" | get-tree | get-menu -path "Generate Documentation" | click } get-window "M2Doc generation" - | get-label "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2. Do you want to continue ?" - | get-property caption | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2. Do you want to continue ?" + | get-label "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3. Do you want to continue ?" + | get-property caption | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3. Do you want to continue ?" | verify-true get-window "M2Doc generation" | get-button Cancel | click get-view "Project Explorer" | get-tree | get-item -path test | get-property childCount | equals 4 | verify-true diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Generate Documentation/M2Doc versions mismatch.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Generate Documentation/M2Doc versions mismatch.test index a089b72e6..f3da07d38 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Generate Documentation/M2Doc versions mismatch.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Generate Documentation/M2Doc versions mismatch.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _wyfqgJPvEei_a6q1mG9iYw Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:09 PM +Save-Time: 4/9/24, 11:06 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -25,8 +25,8 @@ exec-with-options { get-view "Project Explorer" | get-tree | get-menu -path "Generate Documentation" | click } get-window "M2Doc generation" - | get-label "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2. Do you want to continue ?" - | get-property caption | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2. Do you want to continue ?" + | get-label "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3. Do you want to continue ?" + | get-property caption | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3. Do you want to continue ?" | verify-true get-window "M2Doc generation" | get-button OK | click get-window "M2Doc generation" diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Initialize Generation/Initialize Generation - M2Doc versions mismatch.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Initialize Generation/Initialize Generation - M2Doc versions mismatch.test index ca14a75bf..4212170ad 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Initialize Generation/Initialize Generation - M2Doc versions mismatch.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Initialize Generation/Initialize Generation - M2Doc versions mismatch.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _UIn1IJPxEei_a6q1mG9iYw Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:09 PM +Save-Time: 4/9/24, 11:06 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -31,7 +31,7 @@ with [get-window "Generation configuration"] { get-label "" -after [get-label "Select files"] | get-property "image.path" | equals "org.eclipse.jface/icons/full/message_warning.png" | verify-true get-editbox -after [get-label "Select files"] | get-property text - | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2" | verify-true + | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3" | verify-true get-editbox -after [get-label "Generation file:"] | get-property text | equals "platform:/resource/test/asImageByRepresentationDescriptionName-template.genconf" | verify-true diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/New Generation Wizard/Template Selected/Template Selected - M2Doc versions mismatch.test b/tests/org.obeonetwork.m2doc.rcptt/commands/New Generation Wizard/Template Selected/Template Selected - M2Doc versions mismatch.test index 72e1517da..6cea5beaf 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/New Generation Wizard/Template Selected/Template Selected - M2Doc versions mismatch.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/New Generation Wizard/Template Selected/Template Selected - M2Doc versions mismatch.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _8seB0JPyEei_a6q1mG9iYw Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:09 PM +Save-Time: 4/9/24, 11:07 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -31,7 +31,7 @@ with [get-window -class WizardDialog] { get-label "" -after [get-label "Select files"] | get-property "image.path" | equals "org.eclipse.jface/icons/full/message_warning.png" | verify-true get-editbox -after [get-label "Select files"] | get-property text - | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2" | verify-true + | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3" | verify-true get-editbox -after [get-label "Generation file:"] | get-property text | equals "platform:/resource/test/asImageByRepresentationDescriptionName-template.genconf" | verify-true diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Validate Generation/Validate generation M2Doc versions missmatch Cancel.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Validate Generation/Validate generation M2Doc versions missmatch Cancel.test index 22d3587ee..5243335a5 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Validate Generation/Validate generation M2Doc versions missmatch Cancel.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Validate Generation/Validate generation M2Doc versions missmatch Cancel.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _uJ3DEBWnEeqNEaKdKpcCSw Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:10 PM +Save-Time: 4/9/24, 11:07 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -24,8 +24,8 @@ with [get-window "Template properties"] { get-view "Project Explorer" | get-tree | select "test/nominal-template.genconf" | get-menu -path "Validate Documentation Template" | click get-window "M2Doc validation" - | get-label "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2. Do you want to continue ?" - | get-property caption | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2. Do you want to continue ?" + | get-label "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3. Do you want to continue ?" + | get-property caption | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3. Do you want to continue ?" | verify-true get-window "M2Doc validation" | get-button Cancel | click get-view "Project Explorer" | get-tree | get-item -path test | get-property childCount | equals 3 | verify-true diff --git a/tests/org.obeonetwork.m2doc.rcptt/commands/Validate Generation/Validate generation M2Doc versions missmatch.test b/tests/org.obeonetwork.m2doc.rcptt/commands/Validate Generation/Validate generation M2Doc versions missmatch.test index dcef863ec..8409a382e 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/commands/Validate Generation/Validate generation M2Doc versions missmatch.test +++ b/tests/org.obeonetwork.m2doc.rcptt/commands/Validate Generation/Validate generation M2Doc versions missmatch.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _9b3B8JPzEei_a6q1mG9iYw Runtime-Version: 2.5.4.202210020716 -Save-Time: 7/7/23, 2:10 PM +Save-Time: 4/9/24, 11:07 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -24,8 +24,8 @@ with [get-window "Template properties"] { get-view "Project Explorer" | get-tree | select "test/nominal-template.genconf" | get-menu -path "Validate Documentation Template" | click get-window "M2Doc validation" - | get-label "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2. Do you want to continue ?" - | get-property caption | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.2. Do you want to continue ?" + | get-label "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3. Do you want to continue ?" + | get-property caption | equals "M2Doc version mismatch: template version is -1 and current M2Doc version is 3.3.3. Do you want to continue ?" | verify-true get-window "M2Doc validation" | get-button OK | click get-window "M2Doc validation" diff --git a/tests/org.obeonetwork.m2doc.rcptt/pom.xml b/tests/org.obeonetwork.m2doc.rcptt/pom.xml index 234dc52bc..451c6b651 100644 --- a/tests/org.obeonetwork.m2doc.rcptt/pom.xml +++ b/tests/org.obeonetwork.m2doc.rcptt/pom.xml @@ -29,7 +29,7 @@ RCPTT Maven repository https://repo.eclipse.org/content/repositories/rcptt-releases/ - + 2.5.4 @@ -47,15 +47,9 @@ ${project.basedir}/../../releng/org.obeonetwork.m2doc.rcpttproduct/target/products/M2Doc-linux.gtk.x86_64.tar.gz - - - ${eclipse-rcptt-inject-site} - - org.eclipse.sirius.runtime.feature.group - org.eclipse.sirius.runtime.ide.ui.feature.group - - - + + -Xmx2048m + fail