Skip to content

Commit f233185

Browse files
committed
add test feature
1 parent e6bc3c5 commit f233185

File tree

16 files changed

+975
-126
lines changed

16 files changed

+975
-126
lines changed

Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pipeline {
1212
BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '')
1313
CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/capella"
1414
CAPELLA_CONFIGURATION_PATH = "${WORKSPACE}/capella/configuration"
15-
CAPELLA_BRANCH = 'master'
15+
CAPELLA_BRANCH = '7.0.0'
1616
}
1717
stages {
1818
stage('Generate TP') {
@@ -75,16 +75,16 @@ pipeline {
7575
}
7676
}
7777

78-
stage('Install test features') {
78+
stage('Prepare for tests & Install test features') {
7979
steps {
8080
script {
8181
sh "chmod 755 ${CAPELLA_PRODUCT_PATH}"
8282
sh "chmod 755 ${WORKSPACE}/capella/jre/bin/java"
83-
83+
sh "mvn verify -P tests -e -f pom.xml"
8484
eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", capella.getTestUpdateSiteURL("${CAPELLA_BRANCH}"), 'org.polarsys.capella.test.feature.feature.group', "-Dlogback.configurationFile=${CAPELLA_CONFIGURATION_PATH}/logback.xml")
8585

8686
eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.docgen.feature.feature.group', "-Dlogback.configurationFile=${CAPELLA_CONFIGURATION_PATH}/logback.xml")
87-
eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.docgen.test.ju', "-Dlogback.configurationFile=${CAPELLA_CONFIGURATION_PATH}/logback.xml")
87+
eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/tests/plugins/org.polarsys.capella.docgen.test.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.docgen.test.feature.feature.group', "-Dlogback.configurationFile=${CAPELLA_CONFIGURATION_PATH}/logback.xml")
8888

8989
}
9090
}
@@ -95,9 +95,9 @@ pipeline {
9595
script {
9696
wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
9797

98-
tester.runUITests("${CAPELLA_PRODUCT_PATH}", 'CommandLineTestSuite', 'org.polarsys.capella.docgen.test.ju',
98+
tester.runNONUITests("${CAPELLA_PRODUCT_PATH}", 'CommandLineTestSuite', 'org.polarsys.capella.docgen.test.ju',
9999
['org.polarsys.capella.docgen.test.ju.suites.CommandLineTestSuite'])
100-
tester.runUITests("${CAPELLA_PRODUCT_PATH}", 'IFESampleTestSuite', 'org.polarsys.capella.docgen.test.ju',
100+
tester.runNONUITests("${CAPELLA_PRODUCT_PATH}", 'IFESampleTestSuite', 'org.polarsys.capella.docgen.test.ju',
101101
['org.polarsys.capella.docgen.test.ju.suites.IFESampleTestSuite'])
102102
}
103103

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
<module>docgenhtml/plugins</module>
124124
<module>releng/org.polarsys.capella.docgen.site</module>
125125
<module>tests/plugins</module>
126+
<module>tests/features</module>
126127
</modules>
127128
</profile>
128129
</profiles>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.polarsys.capella.docgen.test.feature</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.pde.FeatureNature</nature>
16+
</natures>
17+
</projectDescription>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
##########################################################################
2+
# Copyright (c) 2017, 2020 Obeo.
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0
7+
#
8+
# SPDX-License-Identifier: EPL-2.0
9+
#
10+
# Contributors:
11+
# Obeo - initial API and implementation
12+
##########################################################################
13+
#Properties file for org.polarsys.capella.docgen.configuration.feature
14+
15+
bin.includes = feature.xml,\
16+
epl-2.0.html,\
17+
feature.properties,\
18+
license.html

tests/features/org.polarsys.capella.docgen.test.feature/epl-2.0.html

Lines changed: 300 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
##########################################################################
2+
# Copyright (c) 2017, 2021 Obeo.
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0
7+
#
8+
# SPDX-License-Identifier: EPL-2.0
9+
#
10+
# Contributors:
11+
# Obeo - initial API and implementation
12+
##########################################################################
13+
#Properties file for org.polarsys.capella.docgen.configuration.feature
14+
15+
featureName=Capella HTML Documentation Generation - Test feature
16+
17+
# "providerName" property - name of the company that provides the feature
18+
providerName=Obeo
19+
20+
# "description" property - description of the feature
21+
description=Capella HTML Documentation Generation - Test feature
22+
23+
# "copyright" property - text of the "Feature Update Copyright"
24+
copyright=\ Copyright (c) 2017, 2021 Obeo.\n\
25+
\n\
26+
This program and the accompanying materials are made available under the\n\
27+
terms of the Eclipse Public License 2.0 which is available at\n\
28+
http://www.eclipse.org/legal/epl-2.0\n\
29+
\n\
30+
SPDX-License-Identifier: EPL-2.0\n\
31+
\n\
32+
Contributors:\n\
33+
Obeo - initial API and implementation\n
34+
################ end of copyright property ####################################
35+
36+
# "licenseURL" property - URL of the "Feature License"
37+
# do not translate value - just change to point to a locale-specific HTML page
38+
licenseURL=license.html
39+
40+
# "license" property - text of the "Feature Update License"
41+
# should be plain text version of license agreement pointed to be "licenseURL"
42+
license=\
43+
Eclipse Foundation Software User Agreement\n\
44+
\n\
45+
November 22, 2017\n\
46+
\n\
47+
Usage Of Content\n\
48+
\n\
49+
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
50+
AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
51+
THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
52+
TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
53+
BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
54+
BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
55+
AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
56+
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
57+
APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
58+
MAY NOT USE THE CONTENT.\n\
59+
\n\
60+
Applicable Licenses\n\
61+
\n\
62+
Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
63+
is provided to you under the terms and conditions of the Eclipse Public License\n\
64+
Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
65+
available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
66+
"Program" will mean the Content.\n\
67+
\n\
68+
Content includes, but is not limited to, source code, object code, documentation\n\
69+
and other files maintained in the Eclipse Foundation source code repository\n\
70+
("Repository") in software modules ("Modules") and made available as\n\
71+
downloadable archives ("Downloads").\n\
72+
\n\
73+
- Content may be structured and packaged into modules to facilitate\n\
74+
delivering, extending, and upgrading the Content. Typical modules may\n\
75+
include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
76+
features ("Features").\n\
77+
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
78+
(Java\u2122 ARchive) in a directory named "plugins".\n\
79+
- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
80+
associated material. Each Feature may be packaged as a sub-directory in a\n\
81+
directory named "features". Within a Feature, files named "feature.xml" may\n\
82+
contain a list of the names and version numbers of the Plug-ins and/or\n\
83+
Fragments associated with that Feature.\n\
84+
- Features may also include other Features ("Included Features"). Within a\n\
85+
Feature, files named "feature.xml" may contain a list of the names and\n\
86+
version numbers of Included Features.\n\
87+
\n\
88+
The terms and conditions governing Plug-ins and Fragments should be contained in\n\
89+
files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
90+
and Included Features should be contained in files named "license.html"\n\
91+
("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
92+
directory of a Download or Module including, but not limited to the following\n\
93+
locations:\n\
94+
\n\
95+
- The top-level (root) directory\n\
96+
- Plug-in and Fragment directories\n\
97+
- Inside Plug-ins and Fragments packaged as JARs\n\
98+
- Sub-directories of the directory named "src" of certain Plug-ins\n\
99+
- Feature directories\n\
100+
\n\
101+
Note: if a Feature made available by the Eclipse Foundation is installed using\n\
102+
the Provisioning Technology (as defined below), you must agree to a license\n\
103+
("Feature Update License") during the installation process. If the Feature\n\
104+
contains Included Features, the Feature Update License should either provide you\n\
105+
with the terms and conditions governing the Included Features or inform you\n\
106+
where you can locate them. Feature Update Licenses may be found in the "license"\n\
107+
property of files named "feature.properties" found within a Feature. Such\n\
108+
Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
109+
conditions (or references to such terms and conditions) that govern your use of\n\
110+
the associated Content in that directory.\n\
111+
\n\
112+
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
113+
OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
114+
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
115+
\n\
116+
- Eclipse Public License Version 1.0 (available at\n\
117+
http://www.eclipse.org/legal/epl-v10.html)\n\
118+
- Eclipse Distribution License Version 1.0 (available at\n\
119+
http://www.eclipse.org/licenses/edl-v1.0.html)\n\
120+
- Common Public License Version 1.0 (available at\n\
121+
http://www.eclipse.org/legal/cpl-v10.html)\n\
122+
- Apache Software License 1.1 (available at\n\
123+
http://www.apache.org/licenses/LICENSE)\n\
124+
- Apache Software License 2.0 (available at\n\
125+
http://www.apache.org/licenses/LICENSE-2.0)\n\
126+
- Mozilla Public License Version 1.1 (available at\n\
127+
http://www.mozilla.org/MPL/MPL-1.1.html)\n\
128+
\n\
129+
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
130+
USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
131+
provided, please contact the Eclipse Foundation to determine what terms and\n\
132+
conditions govern that particular Content.\n\
133+
\n\
134+
Use of Provisioning Technology\n\
135+
\n\
136+
The Eclipse Foundation makes available provisioning software, examples of which\n\
137+
include, but are not limited to, p2 and the Eclipse Update Manager\n\
138+
("Provisioning Technology") for the purpose of allowing users to install\n\
139+
software, documentation, information and/or other materials (collectively\n\
140+
"Installable Software"). This capability is provided with the intent of allowing\n\
141+
such users to install, extend and update Eclipse-based products. Information\n\
142+
about packaging Installable Software is available at\n\
143+
http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
144+
\n\
145+
You may use Provisioning Technology to allow other parties to install\n\
146+
Installable Software. You shall be responsible for enabling the applicable\n\
147+
license agreements relating to the Installable Software to be presented to, and\n\
148+
accepted by, the users of the Provisioning Technology in accordance with the\n\
149+
Specification. By using Provisioning Technology in such a manner and making it\n\
150+
available in accordance with the Specification, you further acknowledge your\n\
151+
agreement to, and the acquisition of all necessary rights to permit the\n\
152+
following:\n\
153+
\n\
154+
1. A series of actions may occur ("Provisioning Process") in which a user may\n\
155+
execute the Provisioning Technology on a machine ("Target Machine") with the\n\
156+
intent of installing, extending or updating the functionality of an\n\
157+
Eclipse-based product.\n\
158+
2. During the Provisioning Process, the Provisioning Technology may cause third\n\
159+
party Installable Software or a portion thereof to be accessed and copied to\n\
160+
the Target Machine.\n\
161+
3. Pursuant to the Specification, you will provide to the user the terms and\n\
162+
conditions that govern the use of the Installable Software ("Installable\n\
163+
Software Agreement") and such Installable Software Agreement shall be\n\
164+
accessed from the Target Machine in accordance with the Specification. Such\n\
165+
Installable Software Agreement must inform the user of the terms and\n\
166+
conditions that govern the Installable Software and must solicit acceptance\n\
167+
by the end user in the manner prescribed in such Installable\n\
168+
Software Agreement. Upon such indication of agreement by the user, the\n\
169+
provisioning Technology will complete installation of the\n\
170+
Installable Software.\n\
171+
\n\
172+
Cryptography\n\
173+
\n\
174+
Content may contain encryption software. The country in which you are currently\n\
175+
may have restrictions on the import, possession, and use, and/or re-export to\n\
176+
another country, of encryption software. BEFORE using any encryption software,\n\
177+
please check the country's laws, regulations and policies concerning the import,\n\
178+
possession, or use, and re-export of encryption software, to see if this is\n\
179+
permitted.\n\
180+
\n\
181+
Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
182+
United States, other countries, or both.\n
183+
########### end of license property ##########################################
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2017, 2021 Obeo.
4+
This program and the accompanying materials are made available under the
5+
terms of the Eclipse Public License 2.0 which is available at
6+
http://www.eclipse.org/legal/epl-2.0
7+
8+
SPDX-License-Identifier: EPL-2.0
9+
10+
Contributors:
11+
Thales - initial API and implementation
12+
-->
13+
<feature
14+
id="org.polarsys.capella.docgen.test.feature"
15+
label="%featureName"
16+
version="7.0.1.qualifier"
17+
provider-name="%providerName">
18+
19+
<description>
20+
%description
21+
</description>
22+
23+
<copyright>
24+
%copyright
25+
</copyright>
26+
27+
<license url="%licenseURL">
28+
%license
29+
</license>
30+
31+
32+
<plugin
33+
id="org.polarsys.capella.docgen.test.ju"
34+
download-size="0"
35+
install-size="0"
36+
version="0.0.0"
37+
unpack="false"/>
38+
39+
</feature>

0 commit comments

Comments
 (0)