Skip to content

Commit 42c8349

Browse files
committed
#7 unify the usage of ArrayList
In some cases the use of `toArray` is forbidden.
1 parent 6913210 commit 42c8349

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

vars/withSelenium.groovy

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,7 @@ String generateJobName() {
140140
return "${JOB_BASE_NAME}-${BUILD_NUMBER}"
141141
}
142142

143-
private void stopSeleniumSession(ArrayList<String> firefoxIDs, Collection<String> chromeIDs) {
144-
String[] firefoxContainerIDs = firefoxIDs.toArray()
145-
String[] chromeContainerIDs = chromeIDs.toArray()
146-
143+
private void stopSeleniumSession(ArrayList<String> firefoxContainerIDs, ArrayList<String> chromeContainerIDs) {
147144
echo "Stopping Firefox containers..."
148145
stopAndLogContainers(firefoxContainerIDs)
149146

@@ -155,8 +152,8 @@ private void stopSeleniumSession(ArrayList<String> firefoxIDs, Collection<String
155152
removeContainers(chromeContainerIDs)
156153
}
157154

158-
void stopAndLogContainers(String... containerIDs) {
159-
for (String containerId : containerIDs) {
155+
void stopAndLogContainers(ArrayList<String> containerIDs) {
156+
for (containerId in containerIDs) {
160157
echo "Stopping container with ID ${containerId}"
161158
sh "docker stop ${containerId}"
162159

@@ -165,8 +162,8 @@ void stopAndLogContainers(String... containerIDs) {
165162
}
166163
}
167164

168-
void removeContainers(String... containerIDs) {
169-
for (String containerId : containerIDs) {
165+
void removeContainers(ArrayList<String> containerIDs) {
166+
for (containerId in containerIDs) {
170167
echo "Removing container with ID ${containerId}"
171168
sh "docker rm -f ${containerId}"
172169
}

0 commit comments

Comments
 (0)