diff --git a/Docgen/business/tests/rcptt/org.polarsys.kitalpha.doc.gen.business.ecore.test.rcptt/verification/documentationContentVerification.verification b/Docgen/business/tests/rcptt/org.polarsys.kitalpha.doc.gen.business.ecore.test.rcptt/verification/documentationContentVerification.verification index b0c397668..ed9efe9d7 100644 --- a/Docgen/business/tests/rcptt/org.polarsys.kitalpha.doc.gen.business.ecore.test.rcptt/verification/documentationContentVerification.verification +++ b/Docgen/business/tests/rcptt/org.polarsys.kitalpha.doc.gen.business.ecore.test.rcptt/verification/documentationContentVerification.verification @@ -4,47 +4,47 @@ Element-Name: documentationContentVerification Element-Type: verification Element-Version: 2.0 Id: _G0PVgFWkEeuNu7cI_rjBtg -Runtime-Version: 2.5.2.202109092356 -Save-Time: 11/17/21, 9:27 AM +Runtime-Version: 2.5.5.202312181455 +Save-Time: 3/27/24, 2:47 PM Verification-Type: org.eclipse.rcptt.verifications.workspace ------=_contents/org.eclipse.emf.ecore.doc/output/output/ecore/EClass_ecore_EClass.html-9ce37fb6-3a5c-3924-8b6d-1f6adbb2834f Content-Type: q7/binary Entry-Name: contents/org.eclipse.emf.ecore.doc/output/output/ecore/EClass_ecore_EClass.html -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 ------=_contents/org.eclipse.emf.ecore.doc/output/output/ecore/EClass_ecore_EClass.html-9ce37fb6-3a5c-3924-8b6d-1f6adbb2834f-- ------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf Content-Type: q7/binary diff --git a/Jenkinsfile b/Jenkinsfile index 87558ab78..fd7af70d8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,23 +8,23 @@ pipeline { environment { BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '') JACOCO_VERSION = "0.8.10" - MVN_QUALITY_PROFILES = '-P core -P product -P test' + MVN_QUALITY_PROFILES = '-P core -P product -P test -P rcptt' JACOCO_EXEC_FILE_PATH = '${WORKSPACE}/jacoco.exec' } stages { stage('Generate Target Platform') { steps { - sh 'mvn verify -f releng/plugins/org.polarsys.kitalpha.releng.targets/pom.xml' + sh 'mvn verify -P targetPlatform' } } - stage('Package Kitalpha') { + stage('Package & Install Kitalpha') { steps { wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { script { def jacocoPrepareAgent = "-Djacoco.destFile=$JACOCO_EXEC_FILE_PATH -Djacoco.append=true org.jacoco:jacoco-maven-plugin:$JACOCO_VERSION:prepare-agent" - def sign = github.isPullRequest() ? '' : '-Psign' + def sign = github.isPullRequest() ? false : true currentBuild.description = BUILD_KEY - sh "mvn -Dmaven.test.failure.ignore=true ${jacocoPrepareAgent} package -P core -P product -P test ${sign} -e -f releng/plugins/org.polarsys.kitalpha.releng.parent/pom.xml" + sh "mvn -Dmaven.test.failure.ignore=true ${jacocoPrepareAgent} install -P core -P product -DBUILD_SIGN=${sign} -e " } } } @@ -69,21 +69,37 @@ pipeline { } } } + } + + stage('Run RCPTT Tests') { + steps { + wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { + script { + sh 'mvn -Dmaven.test.failure.ignore=true verify -P rcptt -e' + + } + } + } } - stage('Test Kitalpha') { + + stage('Run JUnit Tests') { steps { wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { script { - def jacocoPrepareAgent = "-Djacoco.destFile=$JACOCO_EXEC_FILE_PATH -Djacoco.append=true org.jacoco:jacoco-maven-plugin:$JACOCO_VERSION:prepare-agent" - def sign = github.isPullRequest() ? '' : '' - currentBuild.description = BUILD_KEY - sh "mvn -Dmaven.test.failure.ignore=true ${jacocoPrepareAgent} verify -P core ${sign} -P product -P test -P rcptt -e -f releng/plugins/org.polarsys.kitalpha.releng.parent/pom.xml" - junit allowEmptyResults: true, testResults: '*.xml,**/target/surefire-reports/*.xml' - sh "mvn -Djacoco.dataFile=$JACOCO_EXEC_FILE_PATH org.jacoco:jacoco-maven-plugin:$JACOCO_VERSION:report $MVN_QUALITY_PROFILES -e -f releng/plugins/org.polarsys.kitalpha.releng.parent/pom.xml" + sh "mvn -Dmaven.test.failure.ignore=true verify -P test -e" } } } } + + stage('Publish tests results') { + steps { + junit allowEmptyResults: true, testResults: '*.xml,**/target/surefire-reports/*.xml' + sh "mvn -Djacoco.dataFile=$JACOCO_EXEC_FILE_PATH org.jacoco:jacoco-maven-plugin:$JACOCO_VERSION:report $MVN_QUALITY_PROFILES -e -f pom.xml" + } + } + + stage('Perform Sonar analysis') { environment { PROJECT_NAME = 'kitalpha' @@ -91,7 +107,7 @@ pipeline { SONAR_PROJECT_KEY = 'eclipse_kitalpha' } steps { - withEnv(['MAVEN_OPTS=-Xmx4g']) { + withEnv(['MAVEN_OPTS=-Xmx3g']) { script { def jacocoParameters = "-Dsonar.coverage.jacoco.xmlReportPaths='target/site/jacoco/jacoco.xml,target/surefire-reports/TEST*.xml' -Dsonar.java.coveragePlugin=jacoco -Dsonar.core.codeCoveragePlugin=jacoco " def sonarExclusions = "-Dsonar.exclusions='**/generated/**/*.java,**/src-gen/**/*.java' " diff --git a/detachment/tests/rcptt/org.polarsys.kitalpha.detachment.tests.rcptt/test_cases/SessionClosedViewpointBackupOldExtension.test b/detachment/tests/rcptt/org.polarsys.kitalpha.detachment.tests.rcptt/test_cases/SessionClosedViewpointBackupOldExtension.test index 2a54190ba..f42b59d8d 100644 --- a/detachment/tests/rcptt/org.polarsys.kitalpha.detachment.tests.rcptt/test_cases/SessionClosedViewpointBackupOldExtension.test +++ b/detachment/tests/rcptt/org.polarsys.kitalpha.detachment.tests.rcptt/test_cases/SessionClosedViewpointBackupOldExtension.test @@ -6,8 +6,8 @@ Element-Type: testcase Element-Version: 3.0 External-Reference: Id: _bnNuYMVZEeiKtJ96oKG8ig -Runtime-Version: 2.2.0.201706152316 -Save-Time: 10/1/18 11:54 AM +Runtime-Version: 2.5.5.202312181455 +Save-Time: 4/4/24, 11:21 AM Testcase-Type: ecl ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac @@ -22,7 +22,7 @@ get-window Information | get-button Yes | click get-window "Detachment..." | get-button OK | click get-eclipse-window | key-type "M1+M2+r" get-window "Open Resource" | get-editbox - -after [get-label "Enter resource name prefix, path prefix or pattern (?, * or camel case):"] | set-text "*.old" + -after [get-label "Enter resource name, path or pattern (?, * or camel case):"] | set-text "*.old" get-window "Open Resource" | get-table | get-property itemCount | equals 3 | verify-true get-window "Open Resource" | get-button Cancel | click get-view "Project Explorer" | get-tree | select "org.polarsys.kitalpha.vp.componentsample.runtime.model" | get-menu diff --git a/releng/plugins/org.polarsys.kitalpha.releng.aggregator.tests.rcptt/.project b/releng/plugins/org.polarsys.kitalpha.releng.aggregator.tests.rcptt/.project new file mode 100644 index 000000000..fb88b70b6 --- /dev/null +++ b/releng/plugins/org.polarsys.kitalpha.releng.aggregator.tests.rcptt/.project @@ -0,0 +1,11 @@ + + + org.polarsys.kitalpha.releng.aggregator.tests.rcptt + + + + + + + + diff --git a/releng/plugins/org.polarsys.kitalpha.releng.aggregator.tests.rcptt/pom.xml b/releng/plugins/org.polarsys.kitalpha.releng.aggregator.tests.rcptt/pom.xml new file mode 100644 index 000000000..407c9ffb3 --- /dev/null +++ b/releng/plugins/org.polarsys.kitalpha.releng.aggregator.tests.rcptt/pom.xml @@ -0,0 +1,52 @@ + + + + 4.0.0 + + org.polarsys + org.polarsys.kitalpha.releng.aggregator.tests.rcptt + 7.0.0-SNAPSHOT + pom + + Kitalpha Aggregator Module : RCPTT Tests + + + org.polarsys + org.polarsys.kitalpha + 7.0.0-SNAPSHOT + ../org.polarsys.kitalpha.releng.parent + + + + + Eclipse Public License v2.0 + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License 2.0 which is available at + http://www.eclipse.org/legal/epl-2.0 + + SPDX-License-Identifier: EPL-2.0 + + + + + + + ../../../tests/architecture_description/core/org.polarsys.kitalpha.ad.core.rcptt + ../../../tests/resource_reuse/org.polarsys.kitalpha.resourcereuse.emfscheme.test.rcptt + ../../../Docgen/business/tests/rcptt/org.polarsys.kitalpha.doc.gen.test.rcptt + ../../../Docgen/business/tests/rcptt/org.polarsys.kitalpha.doc.gen.business.ecore.test.rcptt + ../../../detachment/tests/rcptt/org.polarsys.kitalpha.detachment.tests.rcptt + ../../../tests/architecture_description/dsl/org.polarsys.kitalpha.ad.viewpoint.test.rcptt + ../../../tests/architecture_description/core/org.polarsys.kitalpha.ad.rcptt + ../../../common/tests/org.polarsys.kitalpha.common.rcptt + ../../../emde/tests/org.polarsys.kitalpha.emde.rcptt + ../../../transposer/tests/plugins/rcptt/org.polarsys.kitalpha.transposer.rcptt.tests + + + diff --git a/releng/plugins/org.polarsys.kitalpha.releng.parent/pom.xml b/releng/plugins/org.polarsys.kitalpha.releng.parent/pom.xml index fa0059922..498a5078a 100644 --- a/releng/plugins/org.polarsys.kitalpha.releng.parent/pom.xml +++ b/releng/plugins/org.polarsys.kitalpha.releng.parent/pom.xml @@ -48,9 +48,9 @@ **/*TestSuite.java false - 0.8.6 + 0.8.10 - 2.5.3 + 2.5.5-MO kitalpha @@ -127,7 +127,6 @@ - cbi @@ -155,22 +154,33 @@ false + + + rcptt-releases + RCPTT Maven repository + https://repo.eclipse.org/content/repositories/rcptt-releases/ + + + rcptt-snapshots + RCPTT Maven Snapshots repository + + always + + https://repo.eclipse.org/content/repositories/rcptt-snapshots/ + + - - - - ../../../tests/architecture_description/core/org.polarsys.kitalpha.ad.core.rcptt - ../../../tests/resource_reuse/org.polarsys.kitalpha.resourcereuse.emfscheme.test.rcptt - ../../../Docgen/business/tests/rcptt/org.polarsys.kitalpha.doc.gen.test.rcptt - ../../../Docgen/business/tests/rcptt/org.polarsys.kitalpha.doc.gen.business.ecore.test.rcptt - ../../../detachment/tests/rcptt/org.polarsys.kitalpha.detachment.tests.rcptt - ../../../tests/architecture_description/dsl/org.polarsys.kitalpha.ad.viewpoint.test.rcptt - ../../../tests/architecture_description/core/org.polarsys.kitalpha.ad.rcptt - ../../../common/tests/org.polarsys.kitalpha.common.rcptt - ../../../emde/tests/org.polarsys.kitalpha.emde.rcptt - ../../../transposer/tests/plugins/rcptt/org.polarsys.kitalpha.transposer.rcptt.tests - - + ../org.polarsys.kitalpha.releng.aggregator.tests.rcptt + + + + targetPlatform + + true + + + ../org.polarsys.kitalpha.releng.targets + @@ -404,19 +414,4 @@ - - - rcptt-releases - RCPTT Maven repository - https://repo.eclipse.org/content/repositories/rcptt-releases/ - - - rcptt-snapshots - RCPTT Maven Snapshots repository - - always - - https://repo.eclipse.org/content/repositories/rcptt-snapshots/ - - diff --git a/releng/plugins/org.polarsys.kitalpha.releng.sdk.product/kitalpha.product b/releng/plugins/org.polarsys.kitalpha.releng.sdk.product/kitalpha.product index 41321cbd5..358ec7f7c 100644 --- a/releng/plugins/org.polarsys.kitalpha.releng.sdk.product/kitalpha.product +++ b/releng/plugins/org.polarsys.kitalpha.releng.sdk.product/kitalpha.product @@ -21,11 +21,10 @@ openFile --launcher.GTK_version 2 - -Dosgi.requiredJavaVersion=11 + -Dosgi.requiredJavaVersion=17 -Dosgi.dataAreaRequiresExplicitInit=true -Xms512m --Xmx2048m --XX:PermSize=256M +-Xmx2048m -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts diff --git a/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform b/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform index 167e9d2cb..2218a9cab 100644 --- a/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform +++ b/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform @@ -11,7 +11,7 @@ *******************************************************************************/ target "kitalpha" with source, requirements -include "https://download.eclipse.org/sirius/updates/stable/7.3.0-S20230929-065140/2023-03/targets/modules/gmf-runtime-1.16.tpd" +include "https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240319-042018/2023-03/targets/modules/gmf-runtime-1.16.tpd" location Eclipse-2021-12 "https://download.eclipse.org/releases/2021-12/" { org.eclipse.cvs.feature.group lazy @@ -96,7 +96,7 @@ location acceleo "https://download.eclipse.org/acceleo/updates/releases/3.7/" { org.eclipse.acceleo.doc [3.7.11,3.7.12) } -location sirius "https://download.eclipse.org/sirius/updates/stable/7.3.0-S20230929-065140/2023-03" { +location sirius "https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240319-042018/2023-03" { org.eclipse.sirius.doc.feature.feature.group lazy org.eclipse.sirius.runtime.source.feature.group lazy org.eclipse.sirius.runtime.acceleo.feature.group lazy diff --git a/releng/plugins/org.polarsys.kitalpha.releng.targets/pom.xml b/releng/plugins/org.polarsys.kitalpha.releng.targets/pom.xml index d5e6182b8..0447f21cd 100644 --- a/releng/plugins/org.polarsys.kitalpha.releng.targets/pom.xml +++ b/releng/plugins/org.polarsys.kitalpha.releng.targets/pom.xml @@ -15,10 +15,11 @@ 4.0.0 org.polarsys - kitalpha + org.polarsys.kitalpha.releng.targets 7.0.0-SNAPSHOT pom + Eclipse Public License 2.0 @@ -36,10 +37,16 @@ true 2.7.5 2.7.5 - kitalpha.targetplatform org.eclipse.cbi.targetplatform.tpd.converter + kitalpha + + org.polarsys + org.polarsys.kitalpha + 7.0.0-SNAPSHOT + ../org.polarsys.kitalpha.releng.parent + @@ -78,7 +85,7 @@ validate - -application ${converterApplication.name} ${targetPlatform.name} + -application ${converterApplication.name} ${target-platform-name}.targetplatform JavaSE-17 diff --git a/tests/architecture_description/dsl/org.polarsys.kitalpha.ad.viewpoint.test.rcptt/test_cases/ImportMappingWithSynchronizationMode.test b/tests/architecture_description/dsl/org.polarsys.kitalpha.ad.viewpoint.test.rcptt/test_cases/ImportMappingWithSynchronizationMode.test index 8b7db959a..69bd5b356 100644 --- a/tests/architecture_description/dsl/org.polarsys.kitalpha.ad.viewpoint.test.rcptt/test_cases/ImportMappingWithSynchronizationMode.test +++ b/tests/architecture_description/dsl/org.polarsys.kitalpha.ad.viewpoint.test.rcptt/test_cases/ImportMappingWithSynchronizationMode.test @@ -6,8 +6,8 @@ Element-Type: testcase Element-Version: 3.0 External-Reference: Id: _GHzeAHqOEeadK6jIYFHAOw -Runtime-Version: 2.4.3.201909171500 -Save-Time: 3/18/20 8:59 AM +Runtime-Version: 2.5.5.202312181455 +Save-Time: 4/4/24, 11:41 AM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -35,60 +35,62 @@ with [get-editor "test.spec.vptext" | get-text-viewer] { key-type Up key-type Enter type-text use - key-type "M1+SPACE" + show-content-assist key-type Down -times 2 key-type Enter type-text " " - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist | get-window | get-table | select "platform:\\/plugin\\/org.polarsys.kitalpha.vp.componentsample.design\\/description\\/ComponentSample.odesign" | click -default -with [get-editor "test.spec.vptext" | get-text-viewer] { - key-type "M1+s" + + key-type "M1+s" set-caret-pos 12 19 key-type Enter - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table | select "Diagrams - New Diagrams" + + show-content-assist | get-window | get-table | select "Diagrams - New Diagrams" | click -default + + +} + + get-window "Viewpoint Diagram File Creation Wizard" | get-button Finish | click with [get-editor "test.diagram.vptext" | get-text-viewer] { set-caret-pos 9 24 key-type Enter - key-type "M1+SPACE" + show-content-assist key-type Down -times 3 key-type Enter - key-type "M1+SPACE" + show-content-assist type-text " " - key-type "M1+SPACE" + show-content-assist key-type Enter set-caret-pos 8 4 key-type Enter -times 2 - key-type "M1+SPACE" + show-content-assist key-type Down -times 2 key-type Enter type-text " " - key-type "M1+SPACE" + show-content-assist key-type Enter key-type Down -times 6 key-type Enter - key-type "M1+SPACE" + show-content-assist key-type Down -times 5 key-type Enter - key-type "M1+SPACE" + show-content-assist key-type Enter key-type Tab - key-type "M1+SPACE" + show-content-assist key-type Enter key-type "M1+s" key-type Up key-type Enter - key-type "M1+SPACE" + show-content-assist key-type Down -times 6 key-type Enter type-text " " - key-type "M1+SPACE" + show-content-assist key-type Enter key-type "M1+s" } @@ -113,7 +115,7 @@ get-tab-folder -index 2 | get-tab-item "test.diagram.vptext" | click with [get-editor "test.diagram.vptext" | get-text-viewer] { set-caret-pos 20 125 key-type Enter - key-type "M1+SPACE" + show-content-assist key-type Down -times 2 key-type Up -times 2 key-type Enter @@ -131,12 +133,13 @@ get-editor "test.diagram.vptext" | get-text-viewer | get-property "markers['18'] with [get-editor "test.diagram.vptext" | get-text-viewer] { set-caret-pos 21 31 select-range 21 17 21 33 - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist | get-window | get-table | select "unsynchronizable - The Synchronization Of The Mapping Depends On the Synchronization Defined By The User" | click -default -get-editor "test.diagram.vptext" | get-text-viewer | key-type "M1+s" + + key-type "M1+s" +} + get-view "Project Explorer" | get-tree | get-item "org.polarsys.kitalpha.vp.test.vpdsl/model/test.diagram.vptext" | get-property caption | equals "test.diagram.vptext" | verify-true with [get-editor "test.diagram.vptext" | get-text-viewer] { @@ -146,57 +149,57 @@ with [get-editor "test.diagram.vptext" | get-text-viewer] { with [get-editor "test.diagram.vptext" | get-text-viewer] { set-caret-pos 31 14 key-type Enter -times 2 - key-type "M1+SPACE" + show-content-assist key-type Down -times 8 key-type Enter - key-type "M1+SPACE" + show-content-assist type-text " " - key-type "M1+SPACE" + show-content-assist key-type Enter key-type Tab - key-type "M1+SPACE" + show-content-assist key-type Enter key-type Up key-type Enter - key-type "M1+SPACE" + show-content-assist key-type Down -times 5 key-type Enter type-text " " - key-type "M1+SPACE" + show-content-assist key-type Enter key-type Down -times 3 key-type Up -times 2 key-type "M1+s" set-caret-pos 36 125 key-type Enter - key-type "M1+SPACE" + show-content-assist key-type Down -times 3 key-type Up -times 2 key-type Enter key-type "M1+s" set-caret-pos 37 27 select-range 37 17 37 29 - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist |get-window | get-table | select "synchronized - The Mapping Will Be always Synchronized" | click -default +} + with [get-editor "test.diagram.vptext" | get-text-viewer] { key-type "M1+s" set-caret-pos 37 26 select-range 37 17 37 29 - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist |get-window | get-table | select "unsynchronizable - The Synchronization Of The Mapping Depends On the Synchronization Defined By The User" | click -default +} + with [get-editor "test.diagram.vptext" | get-text-viewer] { key-type "M1+s" set-caret-pos 37 27 select-range 37 17 37 33 - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist | get-window | get-table | select "not-synchronized - The Mapping Will Be Always Not synchronized" | click -default +} + get-editor "test.diagram.vptext" | get-text-viewer | key-type "M1+s" get-view "Project Explorer" | get-tree | get-item "org.polarsys.kitalpha.vp.test.vpdsl/model/\\[ Unsynchronized \\] test.diagram.vptext" @@ -207,56 +210,56 @@ get-editor "test.diagram.vptext" | get-text-viewer | get-property "markers['34'] with [get-editor "test.diagram.vptext" | get-text-viewer] { set-caret-pos 37 25 select-range 37 17 37 33 - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist |get-window | get-table | select "synchronized - The Mapping Will Be always Synchronized" | click -default +} + with [get-editor "test.diagram.vptext" | get-text-viewer] { key-type "M1+s" set-caret-pos 47 14 key-type Enter -times 2 - key-type "M1+SPACE" + show-content-assist key-type Down -times 8 key-type Up set-caret-pos 54 14 select-range 54 13 54 24 key-type BackSpace - key-type "M1+SPACE" + show-content-assist key-type Down -times 6 key-type Enter key-type Tab set-caret-pos 55 97 type-text " " - key-type "M1+SPACE" + show-content-assist | get-window | get-table | select "only-view" | click -default } -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table | select "only-view" | click -default + with [get-editor "test.diagram.vptext" | get-text-viewer] { key-type "M1+s" set-caret-pos 37 27 select-range 37 17 37 29 - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist | get-window | get-table | select "not-synchronized - The Mapping Will Be Always Not synchronized" | click -default +} + with [get-editor "test.diagram.vptext" | get-text-viewer] { key-type "M1+s" hover-text 55 89 set-caret-pos 37 29 select-range 37 17 37 33 - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist | get-window | get-table | select "synchronized - The Mapping Will Be always Synchronized" | click -default +} + get-eclipse-window | key-type "" "\\u0000" with [get-editor "test.diagram.vptext" | get-text-viewer] { set-caret-pos 21 29 select-range 21 17 21 33 - key-type "M1+SPACE" -} -get-window -from "CompletionProposalPopup.createProposalSelector()" | get-table + show-content-assist | get-window | get-table | select "synchronized - The Mapping Will Be always Synchronized" | click -default +} + get-editor "test.diagram.vptext" | get-text-viewer | key-type "M1+s" with [get-view "Project Explorer" | get-tree] { get-item "org.polarsys.kitalpha.vp.test.vpdsl/model/\\[ Unsynchronized \\] test.diagram.vptext" diff --git a/tests/architecture_description/dsl/pom.xml b/tests/architecture_description/dsl/pom.xml deleted file mode 100644 index e760a9155..000000000 --- a/tests/architecture_description/dsl/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - 4.0.0 - - org.polarsys.kitalpha.ad.dsl2.tests - - pom - - - org.polarsys - org.polarsys.kitalpha - 7.0.0-SNAPSHOT - ../../releng/plugins/org.polarsys.kitalpha.releng.parent - - diff --git a/tests/resource_reuse/pom.xml b/tests/resource_reuse/pom.xml deleted file mode 100644 index ec604f234..000000000 --- a/tests/resource_reuse/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - 4.0.0 - - org.polarsys.kitalpha.r_r.tests.plugins - - pom - - - org.polarsys - org.polarsys.kitalpha - 7.0.0-SNAPSHOT - ../releng/plugins/org.polarsys.kitalpha.releng.parent - -