-
Notifications
You must be signed in to change notification settings - Fork 351
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrated Docker based integration tests to TestContainers
- Loading branch information
Showing
17 changed files
with
746 additions
and
658 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
...ore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/ContainerImages.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * ==================================================================== | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| * ==================================================================== | ||
| * | ||
| * This software consists of voluntary contributions made by many | ||
| * individuals on behalf of the Apache Software Foundation. For more | ||
| * information on the Apache Software Foundation, please see | ||
| * <http://www.apache.org/>. | ||
| * | ||
| */ | ||
| package org.apache.hc.core5.testing.compatibility; | ||
|
|
||
| import org.testcontainers.containers.GenericContainer; | ||
| import org.testcontainers.images.builder.ImageFromDockerfile; | ||
| import org.testcontainers.utility.DockerImageName; | ||
|
|
||
| public final class ContainerImages { | ||
|
|
||
| public static final String AAA = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; | ||
| public static final String BBB = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; | ||
| public static final String CCC = "ccccccccccccccccccccccccccccccccccccccccccccccccc"; | ||
| public static final String PUSHY = "I am being very pushy"; | ||
|
|
||
| public static int HTTP_PORT = 80; | ||
|
|
||
| public static GenericContainer<?> httpBin() { | ||
| return new GenericContainer<>(DockerImageName.parse("kennethreitz/httpbin:latest")) | ||
| .withExposedPorts(HTTP_PORT); | ||
| } | ||
|
|
||
| public static GenericContainer<?> apacheHttpD() { | ||
| return new GenericContainer<>(new ImageFromDockerfile() | ||
| .withFileFromClasspath("httpd-vhosts.conf", "docker/httpd/httpd-vhosts.conf") | ||
| .withFileFromString("pushy", PUSHY) | ||
| .withFileFromString("aaa", AAA) | ||
| .withFileFromString("bbb", BBB) | ||
| .withFileFromString("ccc", CCC) | ||
| .withDockerfileFromBuilder(builder -> | ||
| builder | ||
| .from("httpd:2.4") | ||
| .env("var_dir", "/var/httpd") | ||
| .env("www_dir", "${var_dir}/www") | ||
| .run("mkdir -p ${var_dir}") | ||
| .run("sed -i -E 's/^\\s*#\\s*(LoadModule\\s+http2_module\\s+modules\\/mod_http2.so)/\\1/' conf/httpd.conf") | ||
| .run("sed -i -E 's/^\\s*ServerAdmin.*$/ServerAdmin [email protected]/' conf/httpd.conf") | ||
| .run("sed -i -E 's/^\\s*#\\s*(Include\\s+conf\\/extra\\/httpd-vhosts.conf)/\\1/' conf/httpd.conf") | ||
| .copy("httpd-vhosts.conf", "/usr/local/apache2/conf/extra/httpd-vhosts.conf") | ||
| .copy("pushy", "${www_dir}/") | ||
| .copy("aaa", "${www_dir}/") | ||
| .copy("bbb", "${www_dir}/") | ||
| .copy("ccc", "${www_dir}/") | ||
| .build())) | ||
| .withExposedPorts(HTTP_PORT); | ||
| } | ||
|
|
||
| public static GenericContainer<?> ngnix() { | ||
| return new GenericContainer<>(new ImageFromDockerfile() | ||
| .withFileFromClasspath("default.conf", "docker/ngnix/default.conf") | ||
| .withFileFromString("pushy", PUSHY) | ||
| .withFileFromString("aaa", AAA) | ||
| .withFileFromString("bbb", BBB) | ||
| .withFileFromString("ccc", CCC) | ||
| .withDockerfileFromBuilder(builder -> | ||
| builder | ||
| .from("nginx:1.22") | ||
| .env("var_dir", "/var/nginx") | ||
| .env("www_dir", "${var_dir}/www") | ||
| .run("mkdir -p ${var_dir}") | ||
| .copy("default.conf", "/etc/nginx/conf.d/default.conf") | ||
| .copy("pushy", "${www_dir}/") | ||
| .copy("aaa", "${www_dir}/") | ||
| .copy("bbb", "${www_dir}/") | ||
| .copy("ccc", "${www_dir}/") | ||
| .build())) | ||
| .withExposedPorts(HTTP_PORT); | ||
| } | ||
|
|
||
| } |
80 changes: 80 additions & 0 deletions
80
httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/Result.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * ==================================================================== | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| * ==================================================================== | ||
| * | ||
| * This software consists of voluntary contributions made by many | ||
| * individuals on behalf of the Apache Software Foundation. For more | ||
| * information on the Apache Software Foundation, please see | ||
| * <http://www.apache.org/>. | ||
| * | ||
| */ | ||
| package org.apache.hc.core5.testing.compatibility; | ||
|
|
||
| import org.apache.hc.core5.http.HttpRequest; | ||
| import org.apache.hc.core5.http.HttpResponse; | ||
| import org.apache.hc.core5.http.message.RequestLine; | ||
| import org.apache.hc.core5.http.message.StatusLine; | ||
|
|
||
| public final class Result<T> { | ||
|
|
||
| public final HttpRequest request; | ||
| public final HttpResponse response; | ||
| public final T content; | ||
| public final Exception exception; | ||
|
|
||
| public enum Status { OK, NOK } | ||
|
|
||
| public Result(final HttpRequest request, final Exception exception) { | ||
| this.request = request; | ||
| this.response = null; | ||
| this.content = null; | ||
| this.exception = exception; | ||
| } | ||
|
|
||
| public Result(final HttpRequest request, final HttpResponse response, final T content) { | ||
| this.request = request; | ||
| this.response = response; | ||
| this.content = content; | ||
| this.exception = null; | ||
| } | ||
|
|
||
| public Status getStatus() { | ||
| return exception != null ? Status.NOK : Status.OK; | ||
| } | ||
|
|
||
| public boolean isOK() { | ||
| return exception == null; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| final StringBuilder buf = new StringBuilder(); | ||
| buf.append(new RequestLine(request)); | ||
| buf.append(" -> "); | ||
| if (exception != null) { | ||
| buf.append("NOK: ").append(exception); | ||
| } else { | ||
| if (response != null) { | ||
| buf.append("OK: ").append(new StatusLine(response)); | ||
| } | ||
| } | ||
| return buf.toString(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.