Skip to content

Commit 373cccc

Browse files
astromatthiasastromatthias
committed
enabled the framework to handle different escidoc versions
1 parent 2d0e9fb commit 373cccc

File tree

57 files changed

+1483
-864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1483
-864
lines changed

‎measurement/Create_ContentModel/pom.xml

+6-48
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<groupId>org.escidoc.core</groupId>
7979
<artifactId>installer</artifactId>
8080
<version>${escidoc.core.version}</version>
81-
<!-- classifier>standard</classifier -->
81+
<classifier>${artifact.classifier}</classifier>
8282
<overWrite>false</overWrite>
8383
<outputDirectory>${target.home}</outputDirectory>
8484
<destFileName>escidoc-installer.jar</destFileName>
@@ -134,56 +134,12 @@
134134
</executions>
135135
</plugin>
136136

137-
<!-- starten und stoppen von JBOSS -->
137+
<!-- starten und stoppen von JBOSS (escidoc version <= 1.4) oder Tomcat-->
138+
<!-- über PluginManagement des profiles im parent pom wird die configuration vererbt -->
138139
<plugin>
139140
<groupId>org.codehaus.cargo</groupId>
140141
<artifactId>cargo-maven2-plugin</artifactId>
141-
<executions>
142-
<execution>
143-
<id>start-container</id>
144-
<phase>pre-integration-test</phase>
145-
<goals>
146-
<goal>start</goal>
147-
</goals>
148-
<configuration>
149-
<wait>false</wait>
150-
</configuration>
151-
</execution>
152-
<execution>
153-
<id>stop-container</id>
154-
<phase>post-integration-test</phase>
155-
<goals>
156-
<goal>stop</goal>
157-
</goals>
158-
</execution>
159-
</executions>
160-
<configuration>
161-
<skip>${skipServer}</skip>
162-
<wait>${cargo.wait}</wait>
163-
<container>
164-
<containerId>jboss42x</containerId>
165-
<home>${target.home}/jboss</home>
166-
<timeout>600000</timeout>
167-
<systemProperties>
168-
<ESCIDOC_HOME>${target.home}/core</ESCIDOC_HOME>
169-
</systemProperties>
170-
</container>
171-
<configuration>
172-
<type>standalone</type>
173-
<properties>
174-
<cargo.hostname>localhost</cargo.hostname>
175-
<cargo.protocol>http</cargo.protocol>
176-
<cargo.servlet.port>${escidoc.server.port}</cargo.servlet.port>
177-
<cargo.rmi.port>1099</cargo.rmi.port>
178-
<cargo.logging>medium</cargo.logging>
179-
<cargo.jvmargs>-XX:PermSize=512m -XX:MaxPermSize=1024</cargo.jvmargs>
180-
</properties>
181-
</configuration>
182-
</configuration>
183142
</plugin>
184-
185-
186-
187143

188144

189145
<!-- ausführen der JMETER Tests -->
@@ -198,7 +154,7 @@
198154
<goal>jmeter</goal>
199155
</goals>
200156
<configuration>
201-
<reportDir>${project.build.directory}/jmeter-reports</reportDir>
157+
<reportDir>${project.build.directory}/jmeter-reports-maven</reportDir>
202158
<workDir>${project.build.directory}/jmeter</workDir>
203159
<userDir>${basedir}</userDir>
204160
<jmeterLogLevel>DEBUG</jmeterLogLevel>
@@ -208,6 +164,8 @@
208164
<jmeterCustomPropertiesFile>
209165
${project.build.directory}/testplan.properties
210166
</jmeterCustomPropertiesFile>
167+
<jmeterIgnoreError>true</jmeterIgnoreError>
168+
<jmeterIgnoreFailure>true</jmeterIgnoreFailure>
211169
</configuration>
212170
</execution>
213171
</executions>

‎measurement/Create_ContentModel/src/test/jmeter-filtered-resources/testplan.properties

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
host=${escidoc.server.host}
22
port=${escidoc.server.port}
3-
threads=5
3+
threads=${jmeter.threads}
44
repeat=1
5-
rampup=20
5+
rampup=${jmeter.rampup}
66
threadpause=300
77
basedir=${project.parent.basedir}
88
resultdir=${project.build.directory}/jmeter-reports
99
reportdir=${project.build.directory}/jmeter-reports/CreateContentModel.xml
1010
examplesreportdir=${project.build.directory}/jmeter-reports/LoadExamples.xml
1111
loginreportdir=${project.build.directory}/jmeter-reports/LoginReport.xml
1212
scriptdir=${project.build.directory}/xpath.bsh
13-
path=/cmm/content-model
14-
loginpath=/aa/login
15-
loginaction=/aa/j_spring_security_check
16-
logintarget=/AdminTool
13+
path=${api_cmpath}
14+
loginpath=${api_loginpath}
15+
loginaction=${api_loginaction}
16+
logintarget=${api_logintarget}
17+
loadexamples=${api_loadexamples}
1718
authpass=${escidoc.admin.password}
1819
authuser=${escidoc.admin.user}
1920
testdaten=${project.parent.basedir}/testdaten/daten/testdaten-cm.csv

‎measurement/Create_ContentModel/src/test/jmeter/escidocCreateContentModel.jmx

+6-1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@
103103
<stringProp name="Argument.value">${__property(loginreportdir,report.jtl)}</stringProp>
104104
<stringProp name="Argument.metadata">=</stringProp>
105105
</elementProp>
106+
<elementProp name="LOADEXAMPLES" elementType="Argument">
107+
<stringProp name="Argument.name">LOADEXAMPLES</stringProp>
108+
<stringProp name="Argument.value">${__property(loadexamples,report.jtl)}</stringProp>
109+
<stringProp name="Argument.metadata">=</stringProp>
110+
</elementProp>
106111
</collectionProp>
107112
</Arguments>
108113
<hashTree/>
@@ -342,7 +347,7 @@ props.put(&quot;cookiedata2&quot;,vars.get(&quot;COOKIE_JSESSIONID&quot;));
342347
<stringProp name="HTTPSampler.response_timeout"></stringProp>
343348
<stringProp name="HTTPSampler.protocol">http</stringProp>
344349
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
345-
<stringProp name="HTTPSampler.path">/adm/admin/load-examples/common</stringProp>
350+
<stringProp name="HTTPSampler.path">${LOADEXAMPLES}</stringProp>
346351
<stringProp name="HTTPSampler.method">GET</stringProp>
347352
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
348353
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>

‎measurement/Create_ContentRelation/pom.xml

+6-47
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<groupId>org.escidoc.core</groupId>
8080
<artifactId>installer</artifactId>
8181
<version>${escidoc.core.version}</version>
82-
<!-- classifier>standard</classifier -->
82+
<classifier>${artifact.classifier}</classifier>
8383
<overWrite>false</overWrite>
8484
<outputDirectory>${target.home}</outputDirectory>
8585
<destFileName>escidoc-installer.jar</destFileName>
@@ -135,55 +135,12 @@
135135
</executions>
136136
</plugin>
137137

138-
<!-- starten und stoppen von JBOSS -->
138+
<!-- starten und stoppen von JBOSS (escidoc version <= 1.4) oder Tomcat-->
139+
<!-- über PluginManagement des profiles im parent pom wird die configuration vererbt -->
139140
<plugin>
140141
<groupId>org.codehaus.cargo</groupId>
141142
<artifactId>cargo-maven2-plugin</artifactId>
142-
<executions>
143-
<execution>
144-
<id>start-container</id>
145-
<phase>pre-integration-test</phase>
146-
<goals>
147-
<goal>start</goal>
148-
</goals>
149-
<configuration>
150-
<wait>false</wait>
151-
</configuration>
152-
</execution>
153-
<execution>
154-
<id>stop-container</id>
155-
<phase>post-integration-test</phase>
156-
<goals>
157-
<goal>stop</goal>
158-
</goals>
159-
</execution>
160-
</executions>
161-
<configuration>
162-
<skip>${skipServer}</skip>
163-
<wait>${cargo.wait}</wait>
164-
<container>
165-
<containerId>jboss42x</containerId>
166-
<home>${target.home}/jboss</home>
167-
<timeout>600000</timeout>
168-
<systemProperties>
169-
<ESCIDOC_HOME>${target.home}/core</ESCIDOC_HOME>
170-
</systemProperties>
171-
</container>
172-
<configuration>
173-
<type>standalone</type>
174-
<properties>
175-
<cargo.hostname>localhost</cargo.hostname>
176-
<cargo.protocol>http</cargo.protocol>
177-
<cargo.servlet.port>${escidoc.server.port}</cargo.servlet.port>
178-
<cargo.rmi.port>1099</cargo.rmi.port>
179-
<cargo.logging>medium</cargo.logging>
180-
<cargo.jvmargs>-XX:PermSize=512m -XX:MaxPermSize=1024</cargo.jvmargs>
181-
</properties>
182-
</configuration>
183-
</configuration>
184143
</plugin>
185-
186-
187144

188145

189146

@@ -199,7 +156,7 @@
199156
<goal>jmeter</goal>
200157
</goals>
201158
<configuration>
202-
<reportDir>${project.build.directory}/jmeter-reports</reportDir>
159+
<reportDir>${project.build.directory}/jmeter-reports-maven</reportDir>
203160
<workDir>${project.build.directory}/jmeter</workDir>
204161
<userDir>${basedir}</userDir>
205162
<jmeterLogLevel>DEBUG</jmeterLogLevel>
@@ -209,6 +166,8 @@
209166
<jmeterCustomPropertiesFile>
210167
${project.build.directory}/testplan.properties
211168
</jmeterCustomPropertiesFile>
169+
<jmeterIgnoreError>true</jmeterIgnoreError>
170+
<jmeterIgnoreFailure>true</jmeterIgnoreFailure>
212171
</configuration>
213172
</execution>
214173
</executions>

‎measurement/Create_ContentRelation/src/test/jmeter-filtered-resources/testplan.properties

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
host=${escidoc.server.host}
22
port=${escidoc.server.port}
3-
threads=5
3+
threads=${jmeter.threads}
44
repeat=1
5-
rampup=20
5+
rampup=${jmeter.rampup}
66
threadpause=300
77
basedir=${project.parent.basedir}
88
resultdir=${project.build.directory}/jmeter-reports
99
reportdir=${project.build.directory}/jmeter-reports/CreateContentRelation.xml
1010
examplesreportdir=${project.build.directory}/jmeter-reports/LoadExamples.xml
1111
loginreportdir=${project.build.directory}/jmeter-reports/LoginReport.xml
1212
scriptdir=${project.build.directory}/xpath.bsh
13-
path=/ir/content-relation
14-
loginpath=/aa/login
15-
loginaction=/aa/j_spring_security_check
16-
logintarget=/AdminTool
13+
path=${api_crpath}
14+
loginpath=${api_loginpath}
15+
loginaction=${api_loginaction}
16+
logintarget=${api_logintarget}
17+
loadexamples=${api_loadexamples}
1718
authpass=${escidoc.admin.password}
1819
authuser=${escidoc.admin.user}
1920
testdaten=${project.parent.basedir}/testdaten/daten/testdaten-cr.csv

‎measurement/Create_ContentRelation/src/test/jmeter/escidocCreateContentRelation.jmx

+6-1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@
103103
<stringProp name="Argument.value">${__property(loginreportdir,report.jtl)}</stringProp>
104104
<stringProp name="Argument.metadata">=</stringProp>
105105
</elementProp>
106+
<elementProp name="LOADEXAMPLES" elementType="Argument">
107+
<stringProp name="Argument.name">LOADEXAMPLES</stringProp>
108+
<stringProp name="Argument.value">${__property(loadexamples,report.jtl)}</stringProp>
109+
<stringProp name="Argument.metadata">=</stringProp>
110+
</elementProp>
106111
</collectionProp>
107112
</Arguments>
108113
<hashTree/>
@@ -341,7 +346,7 @@ props.put(&quot;cookiedata2&quot;,vars.get(&quot;COOKIE_JSESSIONID&quot;));
341346
<stringProp name="HTTPSampler.response_timeout"></stringProp>
342347
<stringProp name="HTTPSampler.protocol">http</stringProp>
343348
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
344-
<stringProp name="HTTPSampler.path">/adm/admin/load-examples/common</stringProp>
349+
<stringProp name="HTTPSampler.path">${LOADEXAMPLES}</stringProp>
345350
<stringProp name="HTTPSampler.method">GET</stringProp>
346351
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
347352
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>

‎measurement/Create_Context/pom.xml

+6-49
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<groupId>org.escidoc.core</groupId>
7979
<artifactId>installer</artifactId>
8080
<version>${escidoc.core.version}</version>
81-
<!-- classifier>standard</classifier -->
81+
<classifier>${artifact.classifier}</classifier>
8282
<overWrite>false</overWrite>
8383
<outputDirectory>${target.home}</outputDirectory>
8484
<destFileName>escidoc-installer.jar</destFileName>
@@ -134,57 +134,12 @@
134134
</executions>
135135
</plugin>
136136

137-
<!-- starten und stoppen von JBOSS -->
137+
<!-- starten und stoppen von JBOSS (escidoc version <= 1.4) oder Tomcat-->
138+
<!-- über PluginManagement des profiles im parent pom wird die configuration vererbt -->
138139
<plugin>
139140
<groupId>org.codehaus.cargo</groupId>
140141
<artifactId>cargo-maven2-plugin</artifactId>
141-
<executions>
142-
<execution>
143-
<id>start-container</id>
144-
<phase>pre-integration-test</phase>
145-
<goals>
146-
<goal>start</goal>
147-
</goals>
148-
<configuration>
149-
<wait>false</wait>
150-
</configuration>
151-
</execution>
152-
<execution>
153-
<id>stop-container</id>
154-
<phase>post-integration-test</phase>
155-
<goals>
156-
<goal>stop</goal>
157-
</goals>
158-
</execution>
159-
</executions>
160-
<configuration>
161-
<skip>${skipServer}</skip>
162-
<wait>${cargo.wait}</wait>
163-
<container>
164-
<containerId>jboss42x</containerId>
165-
<home>${target.home}/jboss</home>
166-
<timeout>600000</timeout>
167-
<systemProperties>
168-
<ESCIDOC_HOME>${target.home}/core</ESCIDOC_HOME>
169-
</systemProperties>
170-
</container>
171-
<configuration>
172-
<type>standalone</type>
173-
<properties>
174-
<cargo.hostname>localhost</cargo.hostname>
175-
<cargo.protocol>http</cargo.protocol>
176-
<cargo.servlet.port>${escidoc.server.port}</cargo.servlet.port>
177-
<cargo.rmi.port>1099</cargo.rmi.port>
178-
<cargo.logging>medium</cargo.logging>
179-
<cargo.jvmargs>-XX:PermSize=512m -XX:MaxPermSize=1024</cargo.jvmargs>
180-
</properties>
181-
</configuration>
182-
</configuration>
183142
</plugin>
184-
185-
186-
187-
188143

189144
<!-- ausführen der JMETER Tests -->
190145
<plugin>
@@ -198,7 +153,7 @@
198153
<goal>jmeter</goal>
199154
</goals>
200155
<configuration>
201-
<reportDir>${project.build.directory}/jmeter-reports</reportDir>
156+
<reportDir>${project.build.directory}/jmeter-reports-maven</reportDir>
202157
<workDir>${project.build.directory}/jmeter</workDir>
203158
<userDir>${basedir}</userDir>
204159
<jmeterLogLevel>DEBUG</jmeterLogLevel>
@@ -208,6 +163,8 @@
208163
<jmeterCustomPropertiesFile>
209164
${project.build.directory}/testplan.properties
210165
</jmeterCustomPropertiesFile>
166+
<jmeterIgnoreError>true</jmeterIgnoreError>
167+
<jmeterIgnoreFailure>true</jmeterIgnoreFailure>
211168
</configuration>
212169
</execution>
213170
</executions>

‎measurement/Create_Context/src/test/jmeter-filtered-resources/testplan.properties

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
host=${escidoc.server.host}
22
port=${escidoc.server.port}
3-
threads=2
3+
threads=${jmeter.threads}
44
repeat=1
5-
rampup=20
5+
rampup=${jmeter.rampup}
66
threadpause=300
77
basedir=${project.parent.basedir}
88
resultdir=${project.build.directory}/jmeter-reports
99
reportdir=${project.build.directory}/jmeter-reports/CreateContext.xml
1010
examplesreportdir=${project.build.directory}/jmeter-reports/LoadExamples.xml
1111
loginreportdir=${project.build.directory}/jmeter-reports/LoginReport.xml
1212
scriptdir=${project.build.directory}/xpath.bsh
13-
path=/ir/context
14-
loginpath=/aa/login
15-
loginaction=/aa/j_spring_security_check
16-
logintarget=/AdminTool
13+
path=${api_contextpath}
14+
loginpath=${api_loginpath}
15+
loginaction=${api_loginaction}
16+
logintarget=${api_logintarget}
17+
loadexamples=${api_loadexamples}
1718
authpass=${escidoc.admin.password}
1819
authuser=${escidoc.admin.user}
1920
testdaten=${project.parent.basedir}/testdaten/daten/testdaten-ctx.csv

0 commit comments

Comments
 (0)