Skip to content

Commit 016c266

Browse files
author
Jérémy James Toussaint
committed
Updated unit tests for renamed methods in docker client service
1 parent b91ac25 commit 016c266

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/test/java/com/iexec/worker/docker/DockerClientServiceTests.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,11 @@ public void shouldNotCreateContainerSinceDockerCmdException() {
272272
}
273273

274274
@Test
275-
public void shouldBuildCreateContainerHostConfig() {
275+
public void shouldBuildHostConfigFromRunRequest() {
276276
DockerRunRequest request = getDefaultDockerRunRequest(false);
277277

278278
HostConfig hostConfig =
279-
dockerClientService.buildCreateContainerHostConfig(request);
279+
dockerClientService.buildHostConfigFromRunRequest(request);
280280
Assertions.assertThat(hostConfig.getNetworkMode())
281281
.isEqualTo(WORKER_DOCKER_NETWORK);
282282
Assertions.assertThat((hostConfig.getBinds()[0].getPath()))
@@ -287,17 +287,17 @@ public void shouldBuildCreateContainerHostConfig() {
287287
}
288288

289289
@Test
290-
public void shouldNotBuildCreateContainerHostConfigSinceNoRequest() {
290+
public void shouldNotbuildHostConfigFromRunRequestSinceNoRequest() {
291291
HostConfig hostConfig =
292-
dockerClientService.buildCreateContainerHostConfig(null);
292+
dockerClientService.buildHostConfigFromRunRequest(null);
293293
Assertions.assertThat(hostConfig).isNull();
294294
}
295295

296296
@Test
297-
public void shouldBuildCreateContainerHostConfigWithSgx() {
297+
public void shouldbuildHostConfigFromRunRequestWithSgx() {
298298
DockerRunRequest request = getDefaultDockerRunRequest(true);
299299

300-
HostConfig hostConfig = dockerClientService.buildCreateContainerHostConfig(request);
300+
HostConfig hostConfig = dockerClientService.buildHostConfigFromRunRequest(request);
301301
Assertions.assertThat(hostConfig.getNetworkMode()).isEqualTo(WORKER_DOCKER_NETWORK);
302302
Assertions.assertThat((hostConfig.getBinds()[0].getPath())).isEqualTo(FileHelper.SLASH_IEXEC_IN);
303303
Assertions.assertThat((hostConfig.getBinds()[0].getVolume().getPath())).isEqualTo(FileHelper.SLASH_IEXEC_OUT);
@@ -306,7 +306,7 @@ public void shouldBuildCreateContainerHostConfigWithSgx() {
306306
}
307307

308308
@Test
309-
public void shouldGetRequestedCreateContainerCmd() {
309+
public void shouldbuildCreateContainerCmdFromRunRequest() {
310310
CreateContainerCmd createContainerCmd = getRealDockerClient()
311311
.createContainerCmd("repo/image:tag");
312312
DockerRunRequest request = getDefaultDockerRunRequest(false);
@@ -315,34 +315,34 @@ public void shouldGetRequestedCreateContainerCmd() {
315315
request.setContainerPort(0);
316316

317317
Optional<CreateContainerCmd> oActualCreateContainerCmd =
318-
dockerClientService.getRequestedCreateContainerCmd(request,
318+
dockerClientService.buildCreateContainerCmdFromRunRequest(request,
319319
createContainerCmd);
320320
Assertions.assertThat(oActualCreateContainerCmd).isPresent();
321321
CreateContainerCmd actualCreateContainerCmd = oActualCreateContainerCmd.get();
322322
Assertions.assertThat(actualCreateContainerCmd.getName())
323323
.isEqualTo(request.getContainerName());
324324
Assertions.assertThat(actualCreateContainerCmd.getHostConfig())
325-
.isEqualTo(dockerClientService.buildCreateContainerHostConfig(request));
325+
.isEqualTo(dockerClientService.buildHostConfigFromRunRequest(request));
326326
Assertions.assertThat(actualCreateContainerCmd.getCmd()).isNull();
327327
Assertions.assertThat(actualCreateContainerCmd.getEnv()).isNull();
328328
Assertions.assertThat(actualCreateContainerCmd.getExposedPorts()).isEmpty();
329329
}
330330

331331
@Test
332-
public void shouldGetRequestedCreateContainerCmdWithFullParams() {
332+
public void shouldbuildCreateContainerCmdFromRunRequestWithFullParams() {
333333
CreateContainerCmd createContainerCmd = getRealDockerClient()
334334
.createContainerCmd("repo/image:tag");
335335
DockerRunRequest request = getDefaultDockerRunRequest(false);
336336

337337
Optional<CreateContainerCmd> oActualCreateContainerCmd =
338-
dockerClientService.getRequestedCreateContainerCmd(request,
338+
dockerClientService.buildCreateContainerCmdFromRunRequest(request,
339339
createContainerCmd);
340340
Assertions.assertThat(oActualCreateContainerCmd).isPresent();
341341
CreateContainerCmd actualCreateContainerCmd = oActualCreateContainerCmd.get();
342342
Assertions.assertThat(actualCreateContainerCmd.getName())
343343
.isEqualTo(request.getContainerName());
344344
Assertions.assertThat(actualCreateContainerCmd.getHostConfig())
345-
.isEqualTo(dockerClientService.buildCreateContainerHostConfig(request));
345+
.isEqualTo(dockerClientService.buildHostConfigFromRunRequest(request));
346346
Assertions.assertThat(actualCreateContainerCmd.getCmd())
347347
.isEqualTo(ArgsUtils.stringArgsToArrayArgs(request.getCmd()));
348348
Assertions.assertThat(actualCreateContainerCmd.getEnv()).isNotNull();
@@ -354,18 +354,18 @@ public void shouldGetRequestedCreateContainerCmdWithFullParams() {
354354
}
355355

356356
@Test
357-
public void shouldNotGetRequestedCreateContainerCmdSinceNoRequest() {
357+
public void shouldNotbuildCreateContainerCmdFromRunRequestSinceNoRequest() {
358358
Optional<CreateContainerCmd> actualCreateContainerCmd =
359-
dockerClientService.getRequestedCreateContainerCmd(
359+
dockerClientService.buildCreateContainerCmdFromRunRequest(
360360
getDefaultDockerRunRequest(false),
361361
null);
362362
Assertions.assertThat(actualCreateContainerCmd).isEmpty();
363363
}
364364

365365
@Test
366-
public void shouldNotGetRequestedCreateContainerCmdSinceNoCreateContainerCmd() {
366+
public void shouldNotbuildCreateContainerCmdFromRunRequestSinceNoCreateContainerCmd() {
367367
Optional<CreateContainerCmd> actualCreateContainerCmd =
368-
dockerClientService.getRequestedCreateContainerCmd(null,
368+
dockerClientService.buildCreateContainerCmdFromRunRequest(null,
369369
getRealDockerClient().createContainerCmd("repo/image:tag"));
370370
Assertions.assertThat(actualCreateContainerCmd).isEmpty();
371371
}

0 commit comments

Comments
 (0)