This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit d991a2beae7345b7013c44e0cdd084aa41f3fafe Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Thu Aug 25 09:15:59 2022 +0200 (chores) camel-test-infra-chatscript: initialize/shutdown in all steps --- .../services/ChatScriptLocalContainerService.java | 3 ++- .../test/infra/chatscript/services/ChatScriptService.java | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerService.java b/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerService.java index bded97d0911..41809614c90 100644 --- a/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerService.java +++ b/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerService.java @@ -45,6 +45,7 @@ public class ChatScriptLocalContainerService implements ChatScriptService, Conta public void initialize() { LOG.info("Trying to start the ChatScript container"); container.start(); + registerProperties(); LOG.info("ChatScript instance running at {}", serviceAddress()); } @@ -62,6 +63,6 @@ public class ChatScriptLocalContainerService implements ChatScriptService, Conta @Override public String serviceAddress() { - return container.getTestHostIpAddress() + ":" + container.getMappedPort(SERVICE_PORT); + return container.getHost() + ":" + container.getMappedPort(SERVICE_PORT); } } diff --git a/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptService.java b/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptService.java index ede9d434aa3..dab5c98dbf7 100644 --- a/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptService.java +++ b/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptService.java @@ -18,13 +18,16 @@ package org.apache.camel.test.infra.chatscript.services; import org.apache.camel.test.infra.common.services.TestService; import org.junit.jupiter.api.extension.AfterAllCallback; +import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; /** * Test infra service for ChatScript */ -public interface ChatScriptService extends BeforeAllCallback, AfterAllCallback, TestService { +public interface ChatScriptService + extends BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, TestService { String serviceAddress(); @@ -37,4 +40,14 @@ public interface ChatScriptService extends BeforeAllCallback, AfterAllCallback, default void afterAll(ExtensionContext extensionContext) throws Exception { shutdown(); } + + @Override + default void afterEach(ExtensionContext extensionContext) throws Exception { + shutdown(); + } + + @Override + default void beforeEach(ExtensionContext extensionContext) throws Exception { + initialize(); + } }
