diff --git a/integration-test/script/java_pid.sh b/integration-test/script/java_pid.sh new file mode 100755 index 00000000..172514da --- /dev/null +++ b/integration-test/script/java_pid.sh @@ -0,0 +1,2 @@ +#!/bin/bash +pgrep -a java | awk '{print $1}' | tr -d '\n' \ No newline at end of file diff --git a/integration-test/script/springboot_pid.sh b/integration-test/script/springboot_pid.sh index 172514da..87b182d2 100755 --- a/integration-test/script/springboot_pid.sh +++ b/integration-test/script/springboot_pid.sh @@ -1,2 +1,2 @@ #!/bin/bash -pgrep -a java | awk '{print $1}' | tr -d '\n' \ No newline at end of file +jps | grep -E "jar" | awk '{print $1}' | tr -d '\n' \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java index 33aa5c37..85fd441c 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java @@ -38,6 +38,7 @@ public class ContainerTool { public static final MountableFile webspherePid = MountableFile.forHostPath(Path.of("script", "websphere_pid.sh")); public static final MountableFile weblogicPid = MountableFile.forHostPath(Path.of("script", "weblogic_pid.sh")); public static final MountableFile springbootPid = MountableFile.forHostPath(Path.of("script", "springboot_pid.sh")); + public static final MountableFile javaPid = MountableFile.forHostPath(Path.of("script", "java_pid.sh")); public static String getUrl(GenericContainer container) { int port = container.getMappedPort(8080); diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2ContainerTest.java index 6dc03593..615b122f 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2ContainerTest.java @@ -45,7 +45,7 @@ public class SpringBoot2ContainerTest { public final static GenericContainer container = new GenericContainer<>(new ImageFromDockerfile() .withDockerfile(springBoot2Dockerfile)) .withCopyToContainer(jattachFile, "/jattach") - .withCopyToContainer(springbootPid, "/fetch_pid.sh") + .withCopyToContainer(javaPid, "/fetch_pid.sh") .withNetwork(network) .withNetworkAliases("app") .waitingFor(Wait.forHttp("/test"))