@@ -4,7 +4,7 @@ import org.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateAction
44import groovy.transform.Field
55
66String launchUnitTests = " yes"
7- String launchIntegrationTests = " yes"
7+ String launchEndToEndTests = " yes"
88String [] pimVersions = [" 1.7" , " 2.0" ]
99String [] supportedPhpVersions = [" 5.6" , " 7.0" , " 7.1" ]
1010@Field def String verboseOutputs = " yes"
@@ -30,17 +30,17 @@ try {
3030 userInput = input(message : ' Launch tests?' , parameters : [
3131 string(defaultValue : pimVersions. join(' ,' ), description : ' PIM edition the tests should run on' , name : ' requiredPimVersions' ),
3232 choice(choices : ' yes\n no' , description : ' Run unit tests and code style checks' , name : ' launchUnitTests' ),
33- choice(choices : ' yes\n no' , description : ' Run integration tests' , name : ' launchIntegrationTests ' ),
33+ choice(choices : ' yes\n no' , description : ' Run end-to-end tests' , name : ' launchEndToEndTests ' ),
3434 choice(choices : ' no\n yes' , description : ' Enable Verbose mode' , name : ' verboseOutputs' ),
3535 string(defaultValue : ' 50' , description : ' Number of dots per line' , name : ' dotsperline' ),
36- string(defaultValue : clients. join(' ,' ), description : ' Clients used to run integration tests (comma separated values)' , name : ' clients' ),
36+ string(defaultValue : clients. join(' ,' ), description : ' Clients used to run end-to-end tests (comma separated values)' , name : ' clients' ),
3737 choice(choices : ' no\n yes' , description : ' Enable Verbose mode' , name : ' verboseOutputs' ),
3838 string(defaultValue : ' 50' , description : ' Number of dots per line' , name : ' dotsperline' ),
3939 ])
4040
4141 pimVersions = userInput[' requiredPimVersions' ]. tokenize(' ,' )
4242 launchUnitTests = userInput[' launchUnitTests' ]
43- launchIntegrationTests = userInput[' launchIntegrationTests ' ]
43+ launchEndToEndTests = userInput[' launchEndToEndTests ' ]
4444 clients = userInput[' clients' ]. tokenize(' ,' )
4545 verboseOutputs = userInput[' verboseOutputs' ]
4646 dotsPerLine = userInput[' dotsperline' ]
6060 }
6161 }
6262
63- if (launchIntegrationTests . equals(" yes" )) {
63+ if (launchEndToEndTests . equals(" yes" )) {
6464 for (pimVersion in pimVersions) {
6565 String currentPimVersion = pimVersion
6666
@@ -117,7 +117,7 @@ try {
117117 }
118118 }
119119
120- if (launchIntegrationTests . equals(" yes" )) {
120+ if (launchEndToEndTests . equals(" yes" )) {
121121 for (pimVersion in pimVersions) {
122122 String currentPimVersion = pimVersion
123123 stage(" Integration tests ${ currentPimVersion} " ) {
@@ -270,7 +270,7 @@ void runPhpSpecTest(String phpVersion, String client, String psrImplem) {
270270}
271271
272272/**
273- * Run integration tests of the PHP client, for a given PHP version, HTTP client, PSR7 implementation and a PIM version.
273+ * Run end-to-end tests of the PHP client, for a given PHP version, HTTP client, PSR7 implementation and a PIM version.
274274 * First, it starts the PIM. The configuration of the PIM (composer, parameters) is already done in the checkout step.
275275 * Then, it launches the PHPUnit tests.
276276 *
@@ -298,7 +298,7 @@ void runIntegrationTest(String phpVersion, String client, String psrImplem, Stri
298298}
299299
300300/**
301- * Run integration tests of the PHP client, for a given PHP version, HTTP client and PSR7 implementation on PIM version 1.7.
301+ * Run end-to-end tests of the PHP client, for a given PHP version, HTTP client and PSR7 implementation on PIM version 1.7.
302302 *
303303 * 1) Ask to use Kubernetes PIM 1.7 pod template with specific data images (Depending on phpVersion, client, psrImplem)
304304 * 2) Scan all PHP test files in folder "tests/v1_7/Api" and "tests/Common/Api"
@@ -323,7 +323,7 @@ def runPim17IntegrationTest(String phpVersion, String client, String psrImplem)
323323 def messages = new net.sf.json.JSONArray ()
324324 def files = []
325325
326- // Find and store PHP test integration files to launch them in parallels
326+ // Find and store PHP test end-to-end files to launch them in parallels
327327 files + = sh (returnStdout : true , script : ' find /home/jenkins/php-api-client/tests/v1_7/Api -name "*Integration.php"' ). tokenize(' \n ' )
328328 files + = sh (returnStdout : true , script : ' find /home/jenkins/php-api-client/tests/Common/Api -name "*Integration.php"' ). tokenize(' \n ' )
329329
@@ -358,7 +358,7 @@ def runPim17IntegrationTest(String phpVersion, String client, String psrImplem)
358358}
359359
360360/**
361- * Run integration tests of the PHP client, for a given PHP version, HTTP client and PSR7 implementation on PIM version 2.0.
361+ * Run end-to-end tests of the PHP client, for a given PHP version, HTTP client and PSR7 implementation on PIM version 2.0.
362362 *
363363 * 1) Ask to use Kubernetes PIM 2.0 pod template with specific data images (Depending on phpVersion, client, psrImplem)
364364 * 2) Scan all PHP test files in folder "tests/v2_0/Api" and "tests/Common/Api"
@@ -382,7 +382,7 @@ def runPim2IntegrationTest(String phpVersion, String client, String psrImplem, S
382382 def messages = new net.sf.json.JSONArray ()
383383 def files = []
384384
385- // Find and store PHP test integration files to launch them in parallels
385+ // Find and store PHP test end-to-end files to launch them in parallels
386386 files + = sh (returnStdout : true , script : ' find /home/jenkins/php-api-client/tests/v2_0/Api -name "*Integration.php"' ). tokenize(' \n ' )
387387 files + = sh (returnStdout : true , script : ' find /home/jenkins/php-api-client/tests/Common/Api -name "*Integration.php"' ). tokenize(' \n ' )
388388 for (file in files) {
0 commit comments