diff options
author | Francois Le Fevre - CEA | 2016-03-24 15:11:32 +0000 |
---|---|---|
committer | Céline Janssens | 2016-03-31 12:41:14 +0000 |
commit | c58e88b0bb9cce2b16c8a8feb52cdaff4720a70c (patch) | |
tree | 6725c6da41fac40ef609cb235ce7f3a237e5d539 | |
parent | 7219e236de73b68c982dcfb37cf651c68369b3e1 (diff) | |
download | org.eclipse.papyrus-rt-c58e88b0bb9cce2b16c8a8feb52cdaff4720a70c.tar.gz org.eclipse.papyrus-rt-c58e88b0bb9cce2b16c8a8feb52cdaff4720a70c.tar.xz org.eclipse.papyrus-rt-c58e88b0bb9cce2b16c8a8feb52cdaff4720a70c.zip |
Bug 490375 - [cleaning]: delete unneeded file
- Restore RCPTT failing tests
Change-Id: Ie7bc8709579122b575b681ad0620ef1dcb012887
Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>
10 files changed, 4 insertions, 374 deletions
diff --git a/releng/org.eclipse.papyrusrt.rcptt/initialisation.tests/PapyrusRTTests/CallEventTests/CallEvent_10_CallEventCreationTest.test b/releng/org.eclipse.papyrusrt.rcptt/initialisation.tests/PapyrusRTTests/CallEventTests/CallEvent_10_CallEventCreationTest.test index 87671fe20..e1baabd59 100755 --- a/releng/org.eclipse.papyrusrt.rcptt/initialisation.tests/PapyrusRTTests/CallEventTests/CallEvent_10_CallEventCreationTest.test +++ b/releng/org.eclipse.papyrusrt.rcptt/initialisation.tests/PapyrusRTTests/CallEventTests/CallEvent_10_CallEventCreationTest.test @@ -20,7 +20,7 @@ with [get-view "Project Explorer" | get-tree] { get-view "Model Explorer" | get-tree | get-item "RootElement/«Protocol» Protocol1" | click get-view Properties | get-button "Add elements" | click -with [get-window "Create a new Protocol Message"] { +with [get-window "Create a new Out Protocol Message"] { get-editbox -after [get-label "Name"] | set-text MessageTestOUT get-button OK | click } diff --git a/releng/org.eclipse.papyrusrt.rcptt/pom.xml b/releng/org.eclipse.papyrusrt.rcptt/pom.xml index d16b9aa18..bd4a4c2b9 100644 --- a/releng/org.eclipse.papyrusrt.rcptt/pom.xml +++ b/releng/org.eclipse.papyrusrt.rcptt/pom.xml @@ -43,7 +43,7 @@ </runner> <aut> - <explicit>../papyrusrt.product/target/products/org.eclipse.papyrusrt.product-[platform].zip</explicit> + <explicit>../org.eclipse.papyrusrt.product/target/products/org.eclipse.papyrusrt.product-[platform].zip</explicit> <!-- reuseExistingWorkspace>false</reuseExistingWorkspace --> </aut> diff --git a/releng/org.eclipse.papyrusrt.rcptt/synchronisation.tests/Synchro_31_SynchronizationOfPort.test b/releng/org.eclipse.papyrusrt.rcptt/synchronisation.tests/Synchro_31_SynchronizationOfPort.test index 9bb20f7da..182d67f4b 100644 --- a/releng/org.eclipse.papyrusrt.rcptt/synchronisation.tests/Synchro_31_SynchronizationOfPort.test +++ b/releng/org.eclipse.papyrusrt.rcptt/synchronisation.tests/Synchro_31_SynchronizationOfPort.test @@ -50,7 +50,7 @@ with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Capsule get-property "children.Shape[7].type" | equals 3069 | verify-true // The class name of the port is RTPortEditPart get-property "getChildren().CustomPortEditPart[3].getClassName()" - | equals "org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.CustomPortEditPart" | verify-true + | equals "org.eclipse.papyrusrt.umlrt.tooling.diagram.common.editparts.RTPortEditPart" | verify-true } ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac-- diff --git a/releng/org.eclipse.papyrusrt.rcptt/synchronisation.tests/Synchro_32_SynchronizationOfCapsulePart.test b/releng/org.eclipse.papyrusrt.rcptt/synchronisation.tests/Synchro_32_SynchronizationOfCapsulePart.test index 87cf19f07..9c8382154 100644 --- a/releng/org.eclipse.papyrusrt.rcptt/synchronisation.tests/Synchro_32_SynchronizationOfCapsulePart.test +++ b/releng/org.eclipse.papyrusrt.rcptt/synchronisation.tests/Synchro_32_SynchronizationOfCapsulePart.test @@ -54,7 +54,7 @@ with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Capsule get-property "getChildren().ClassCompositeCompartmentEditPart[2].getChildren().RTPropertyPartEditPart[0].getClassName()" | equals "org.eclipse.papyrusrt.umlrt.tooling.diagram.common.editparts.RTPropertyPartEditPart" | verify-true get-property "getChildren().ClassCompositeCompartmentEditPart[2].getChildren().RTPropertyPartEditPart[0].getPrimaryShape().getClassName()" - | equals "org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure" | verify-true + | equals "org.eclipse.papyrusrt.umlrt.tooling.diagram.common.figures.RTPropertyPartFigure" | verify-true get-property "getChildren().ClassCompositeCompartmentEditPart[2].getChildren().RTPropertyPartEditPart[0].getPrimaryShape().getNameLabel().getText()" | equals "# capsule2: Capsule2 [1]" | verify-true } diff --git a/releng/papyrusrt.product/pom.xml b/releng/papyrusrt.product/pom.xml deleted file mode 100644 index 261234371..000000000 --- a/releng/papyrusrt.product/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrusrt</groupId> - <artifactId>org.eclipse.papyrusrt.releng</artifactId> - <version>0.7.2-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrusrt.product</artifactId> - <packaging>eclipse-repository</packaging> - <properties> - <product-id>org.eclipse.papyrusrt.product</product-id> - </properties> - <repositories> - - <!-- Repository create from tp --> - <repository> - <id>repo-papyrus-mars</id> - <layout>p2</layout> - <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/main/</url> - </repository> - - </repositories> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-repository-plugin</artifactId> - <configuration> - <includeAllDependencies>true</includeAllDependencies> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-director-plugin</artifactId> - <configuration> - <profile>org.eclipse.papyrusrt</profile> - <formats> - <linux>zip</linux> - <macosx>tar.gz</macosx> - </formats> - <products> - <product> - <id>${product-id}</id> - <rootFolder>papyrusRT</rootFolder> - </product> - </products> - </configuration> - <executions> - <execution> - <id>materialize-products</id> - <goals> - <goal>materialize-products</goal> - </goals> - </execution> - <execution> - <id>archive-products</id> - <goals> - <goal>archive-products</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> -</project>
\ No newline at end of file diff --git a/releng/rcptt/.project b/releng/rcptt/.project deleted file mode 100755 index ae6f7ced3..000000000 --- a/releng/rcptt/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>Papyrus Real Time</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.rcptt.core.builder.q7Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.rcptt.core.rcpttnature</nature> - </natures> - <filteredResources> - <filter> - <id>1453908214091</id> - <name></name> - <type>10</type> - <matcher> - <id>org.eclipse.ui.ide.multiFilter</id> - <arguments>1.0-name-matches-false-false-target</arguments> - </matcher> - </filter> - </filteredResources> -</projectDescription> diff --git a/releng/rcptt/papyrusrt.rcptt.synchronisation.tests/Synchro_31_SynchronizationOfPort.test b/releng/rcptt/papyrusrt.rcptt.synchronisation.tests/Synchro_31_SynchronizationOfPort.test deleted file mode 100644 index 29ca03cb2..000000000 --- a/releng/rcptt/papyrusrt.rcptt.synchronisation.tests/Synchro_31_SynchronizationOfPort.test +++ /dev/null @@ -1,56 +0,0 @@ ---- RCPTT testcase --- -Format-Version: 1.0 -Contexts: _fWASMHyuEeWDurBKKa1KKg -Element-Name: Synchro_31_SynchronizationOfPort -Element-Type: testcase -Element-Version: 3.0 -External-Reference: -Id: _iM6q8JpoEeWSHptStDmSKg -Runtime-Version: 2.0.1.201508250612 -Save-Time: 12/4/15 10:36 AM -Testcase-Type: ecl - -------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa -Content-Type: text/plain -Entry-Name: .description - -When creat a port into the Model Explorer, the Port should be added into the diagram as well . -------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa-- -------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac -Content-Type: text/ecl -Entry-Name: .content - -// Open the Model and the Diagram -get-view "Project Explorer" | get-tree | select "InitialDiagram/model" | double-click -with [get-view "Model Explorer" | get-tree] { - get-item "RootElement/«Capsule» Capsule1/Capsule1" | click - select "RootElement/«Capsule» Capsule1/Capsule1" | double-click - get-item "RootElement/«Capsule» Capsule1/Capsule1" | click - get-item "RootElement/«Capsule» Capsule1" | click - get-item "RootElement/«Capsule» Capsule1" | click - // select the menu to create a Port in the ModelExplorer - select "RootElement/«Capsule» Capsule1" | get-menu "UMLRealTime/Port" | click -} - -// Select the referenced Protocol of the port -with [get-window "Edit port1"] { - get-button "Edit the reference value" | click - with [get-window Protocol] { - get-editbox -after [get-label "Filter:"] | set-focus - get-tree | select "RootElement/«Protocol» Protocol1" - get-button OK | click - } - get-button OK | click -} - -// Test the presence of the Port into the Diagram -get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Capsule1 | mouse-move 2 60 -height 429 -width 834 -with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Capsule1 | get-edit-part -name Capsule1] { -// Children type should be 3069 - get-property "children.Shape[7].type" | equals 3069 | verify-true - // The class name of the port is CustomPortEditPort - get-property "getChildren().CustomPortEditPart[3].getClassName()" - | equals "org.eclipse.papyrusrt.umlrt.tooling.diagram.common.editparts.RTPortEditPart" | verify-true - -} -------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
\ No newline at end of file diff --git a/releng/rcptt/papyrusrt.rcptt.synchronisation.tests/Synchro_32_SynchronizationOfCapsulePart.test b/releng/rcptt/papyrusrt.rcptt.synchronisation.tests/Synchro_32_SynchronizationOfCapsulePart.test deleted file mode 100644 index 9c8382154..000000000 --- a/releng/rcptt/papyrusrt.rcptt.synchronisation.tests/Synchro_32_SynchronizationOfCapsulePart.test +++ /dev/null @@ -1,61 +0,0 @@ ---- RCPTT testcase --- -Format-Version: 1.0 -Contexts: _fWASMHyuEeWDurBKKa1KKg -Element-Name: Synchro_32_SynchronizationOfCapsulePart -Element-Type: testcase -Element-Version: 3.0 -External-Reference: -Id: _jAkb0JpwEeWSHptStDmSKg -Runtime-Version: 2.0.1.201508250612 -Save-Time: 12/4/15 11:30 AM -Testcase-Type: ecl - -------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac -Content-Type: text/ecl -Entry-Name: .content - -// Open Model -with [get-view "Project Explorer" | get-tree] { - select InitialDiagram | double-click - select "InitialDiagram/model" | double-click -} - -// Open Diagram and create a New Capsule -with [get-view "Model Explorer" | get-tree] { - get-item "RootElement/«Capsule» Capsule1/Capsule1" | click - select "RootElement/«Capsule» Capsule1/Capsule1" | double-click - get-item "RootElement/«Capsule» Capsule1/Capsule1" | click - get-item RootElement | click - select RootElement | get-menu "UMLRealTime/Capsule" | click -} - -// Create A New Capsule Pasrt -get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Capsule1 | get-edit-part -name Capsule1 - | mouse-move 53 241 -height 250 -width 500 -with [get-view "Model Explorer" | get-tree] { - get-item "RootElement/«Capsule» Capsule1" | click - select "RootElement/«Capsule» Capsule1" | get-menu "UMLRealTime/CapsulePart" | click -} - -// Select the Capsule for the new Capsule Part -with [get-window Edit] { - get-button "Edit the reference value" | click - with [get-window Capsule] { - get-editbox -after [get-label "Filter:"] | set-focus - get-tree | select "RootElement/«Capsule» Capsule2" - get-button OK | click - } - get-button OK | click -} - -// test that the CapsulePart is present into the Diagram as a RTPropertyEditPart and Named as "# capsule2: Capsule2 [1]" -get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Capsule1 | mouse-move 633 204 -height 365 -width 647 -with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Capsule1 | get-edit-part -name Capsule1] { - get-property "getChildren().ClassCompositeCompartmentEditPart[2].getChildren().RTPropertyPartEditPart[0].getClassName()" - | equals "org.eclipse.papyrusrt.umlrt.tooling.diagram.common.editparts.RTPropertyPartEditPart" | verify-true - get-property "getChildren().ClassCompositeCompartmentEditPart[2].getChildren().RTPropertyPartEditPart[0].getPrimaryShape().getClassName()" - | equals "org.eclipse.papyrusrt.umlrt.tooling.diagram.common.figures.RTPropertyPartFigure" | verify-true - get-property "getChildren().ClassCompositeCompartmentEditPart[2].getChildren().RTPropertyPartEditPart[0].getPrimaryShape().getNameLabel().getText()" - | equals "# capsule2: Capsule2 [1]" | verify-true -} -------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac-- diff --git a/releng/rcptt/pom.xml b/releng/rcptt/pom.xml deleted file mode 100644 index c70baa943..000000000 --- a/releng/rcptt/pom.xml +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrusrt</groupId> - <artifactId>org.eclipse.papyrusrt.releng</artifactId> - <version>0.7.2-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrusrt.rcptt.tests</artifactId> - <packaging>rcpttTest</packaging> - - <name>org.eclipse.papyrusrt.rcptt.tests</name> - <description>the platform to enable test with Eclipse RCPTT</description> - - <pluginRepositories> - <pluginRepository> - <id>rcptt-releases</id> - <name>RCPTT Maven repository</name> - <url>https://repo.eclipse.org/content/repositories/rcptt-releases/</url> - </pluginRepository> - <pluginRepository> - <id>rcptt-snapshots</id> - <name>RCPTT Maven Snapshots repository</name> - <snapshots> - <updatePolicy>daily</updatePolicy> - </snapshots> - <url>https://repo.eclipse.org/content/repositories/rcptt-snapshots/</url> - </pluginRepository> - </pluginRepositories> - - - <properties> - <rcptt-runner-version>2.0.0</rcptt-runner-version> - </properties> - - <build> - <plugins> - <!-- to ensure the plugin is downloaded locally --> - <!-- <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <executions> - <execution> - <phase>initialize</phase> - <goals> - <goal>help</goal> - </goals> - </execution> - </executions> - </plugin> --> - <plugin> - <groupId>org.eclipse.rcptt</groupId> - <artifactId>rcptt-maven-plugin</artifactId> - <version>2.0.1</version> - <extensions>true</extensions> - <configuration> - <runner> - <version>${rcptt-runner-version}</version> - <!-- Manage the memory used by Runner --> - <vmArgs> - <vmArg>-Xmx1024m</vmArg> - <vmArg>-XX:MaxPermSize=256m</vmArg> - <!-- <vmArg>-javaagent:${user.home}/.m2/repository/org/jacoco/org.jacoco.agent/${jacoco-version}/org.jacoco.agent-${jacoco-version}-runtime.jar=destfile=${project.basedir}/target/jacoco2.exec</vmArg> --> - </vmArgs> - </runner> - - <aut> - <explicit>../papyrusrt.product/target/products/org.eclipse.papyrusrt.product-[platform].zip</explicit> - <!-- reuseExistingWorkspace>false</reuseExistingWorkspace --> - </aut> - - <!-- Configure the timeout information --> - <testOptions> - <execTimeout>900</execTimeout> - <testExecTimeout>1800</testExecTimeout> - </testOptions> - - <skipTags> - <skipTag>ignore</skipTag> - </skipTags> - - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <!-- <pluginExecution> - <pluginExecutionFilter> - <groupId>org.jacoco</groupId> - <artifactId> - jacoco-maven-plugin - </artifactId> - <versionRange> - [0.7.4.201502262128,) - </versionRange> - <goals> - <goal>help</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> --> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.eclipse.rcptt - </groupId> - <artifactId> - rcptt-maven-plugin - </artifactId> - <versionRange> - [2.0.1,) - </versionRange> - <goals> - <goal>resources</goal> - <goal>execute</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - -</project> diff --git a/releng/rcptt/rcptt.properties b/releng/rcptt/rcptt.properties deleted file mode 100755 index d20458188..000000000 --- a/releng/rcptt/rcptt.properties +++ /dev/null @@ -1,9 +0,0 @@ ---- RCPTT testcase --- -Format-Version: 1.0 -Element-Name: Project Settings -Element-Type: projectMetadata -Element-Version: 2.0 -Id: _8fiXUMWjEeWSh9d9X-ueGw -Runtime-Version: 2.0.0.201506120617 -Save-Time: 1/28/16 10:46 AM - |