Migrate server tests to JUnit5 #593
Conversation
ekharkunov
force-pushed
the
server-junit5
branch
from
55fcbf1 to
f750944
Compare
| @@ -471,13 +453,13 @@ static void writeYaml(File file, Map<String, Object> map) throws IOException | |||
| { | |||
| Yaml yaml = new Yaml(); | |||
| String text = yaml.dump(map); | |||
| FileUtils.writeStringToFile(file, text); | |||
| FileUtils.writeStringToFile(file, text, Charset.defaultCharset(), false); | |||
There was a problem hiding this comment.
Fix deprecation warning.
| ports: | ||
| - "9000:9000" | ||
| - "9001:9001" |
There was a problem hiding this comment.
Use 9001 port for authentication testing to avoid port collision during parallel test run.
| # redefine helathcheck because of another port | ||
| # see the same configuration in common-services.yml | ||
| healthcheck: | ||
| test: wget --no-verbose --tries=1 --spider http://localhost:9001/actuator/health |
There was a problem hiding this comment.
Redefine healthcheck because port was changed.
| @@ -15,6 +14,9 @@ if [ "$APPLICATION" == "" ]; then | |||
| APPLICATION="extender-test" | |||
| fi | |||
|
|
|||
| if [ "$PORT" == "" ]; then | |||
There was a problem hiding this comment.
Read port from external variable
| @@ -48,12 +50,23 @@ check_containers_health() { | |||
| all_healthy=true | |||
|
|
|||
| for container in $(docker ps -q); do | |||
| health_field=$(docker inspect --format='{{.State.Health}}' "$container") | |||
There was a problem hiding this comment.
If during test some other containers are running - check if health status is not defined - skip container information.
| name=$(docker inspect --format='{{.Name}}' "$container" | sed 's/\///') | ||
| app_name=$(docker inspect "$container" | jq -r '.[0].Config.Labels["com.docker.compose.project"]') |
There was a problem hiding this comment.
Extract application name from Labels for further container filtering.
| health_status=$(docker inspect --format='{{.State.Health.Status}}' "$container") | ||
|
|
||
| if [ "$app_name" != "$APPLICATION" ]; then |
There was a problem hiding this comment.
When two tests suites run simultaneously (auth and integration tests) - filter containers by application name to avoid check of unrelated containers.
| @@ -0,0 +1,2 @@ | |||
| junit.jupiter.execution.parallel.enabled = true | |||
There was a problem hiding this comment.
Configuration to enable parallel test execution.
| private static final int EXTENDER_PORT = 9000; | ||
|
|
||
| private TestConfiguration configuration; | ||
| private long startTime; |
There was a problem hiding this comment.
No need calculate execution time because JUnit measures time itself.
| public static void afterClass() throws IOException, InterruptedException { | ||
| ProcessExecutor processExecutor = new ProcessExecutor(); | ||
| processExecutor.putEnv("APPLICATION", "extender-test"); | ||
| processExecutor.execute("scripts/stop-test-server.sh"); | ||
| System.out.println(processExecutor.getOutput()); | ||
| } | ||
|
|
||
| @Before | ||
| public void beforeTest() throws IOException { | ||
| File cachedBuild = new File(String.format("build/%s/build.zip", configuration.platform)); |
There was a problem hiding this comment.
Create temporary directory for extender's cache when doBuild is called.
…ve stuff to fix concurrent tests execution.
ekharkunov
force-pushed
the
server-junit5
branch
from
f750944 to
216baa6
Compare
AuthentificationTestandIntegrationTest. Now two sets of docker containers can be run in parallel.For local execution
on my Mac (Apple M3 Pro, 36 GB)
took
Fixes #565