Skip to content
This repository was archived by the owner on Oct 25, 2023. It is now read-only.

Commit c382660

Browse files
SgtSilvioSgtSilvio
committed
Improved reading of files in tests
1 parent d102467 commit c382660

29 files changed

+54
-44
lines changed

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithControlCenterIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void test() throws Exception {
3434
rule.start();
3535

3636
final CloseableHttpClient httpClient = HttpClientBuilder.create().build();
37-
final HttpUriRequest request = new HttpGet( "http://localhost:" + CONTROL_CENTER_PORT);
37+
final HttpUriRequest request = new HttpGet("http://localhost:" + CONTROL_CENTER_PORT);
3838
httpClient.execute(request);
3939

4040
rule.stop();

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithCustomConfigIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
public class ContainerWithCustomConfigIT {
3232

3333
@Test(timeout = 200_000)
34-
public void test() {
34+
public void test() throws Exception {
3535
final HiveMQTestContainerRule rule = new HiveMQTestContainerRule("hivemq/hivemq4", "latest")
36-
.withHiveMQConfig(new File("src/test/resources/config.xml"));
36+
.withHiveMQConfig(new File(getClass().getResource("/config.xml").toURI()));
3737

3838
rule.start();
3939

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithExtensionFromDirectoryIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public class ContainerWithExtensionFromDirectoryIT {
3030
public void test() throws Exception {
3131
final HiveMQTestContainerRule rule =
3232
new HiveMQTestContainerRule()
33+
.withExtension(new File(getClass().getResource("/modifier-extension").toURI()))
3334
.waitForExtension("Modifier Extension")
34-
.withExtension(new File("src/test/resources/modifier-extension"))
3535
.withLogLevel(Level.DEBUG);
3636

3737
rule.start();

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithExtensionIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.hivemq.testcontainer.core.HiveMQExtension;
1919
import com.hivemq.testcontainer.util.MyExtension;
2020
import com.hivemq.testcontainer.util.TestPublishModifiedUtil;
21-
import org.jetbrains.annotations.NotNull;
2221
import org.junit.Test;
2322

2423
/**
@@ -34,7 +33,7 @@ public void test() throws Exception {
3433
.version("1.0")
3534
.mainClass(MyExtension.class).build();
3635

37-
final @NotNull HiveMQTestContainerRule rule =
36+
final HiveMQTestContainerRule rule =
3837
new HiveMQTestContainerRule()
3938
.waitForExtension(hiveMQExtension)
4039
.withExtension(hiveMQExtension);

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithFileInExtensionHomeIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.hivemq.testcontainer.junit4;
1717

1818
import com.hivemq.extension.sdk.api.ExtensionMain;
19-
import org.jetbrains.annotations.NotNull;
2019
import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
2120
import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
2221
import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
@@ -26,6 +25,7 @@
2625
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
2726
import com.hivemq.testcontainer.core.HiveMQExtension;
2827
import com.hivemq.testcontainer.util.TestPublishModifiedUtil;
28+
import org.jetbrains.annotations.NotNull;
2929
import org.junit.Test;
3030

3131
import java.io.File;
@@ -47,10 +47,10 @@ public void test() throws Exception {
4747

4848
final HiveMQTestContainerRule rule =
4949
new HiveMQTestContainerRule()
50-
.waitForExtension(hiveMQExtension)
5150
.withExtension(hiveMQExtension)
51+
.waitForExtension(hiveMQExtension)
5252
.withFileInExtensionHomeFolder(
53-
new File("src/test/resources/additionalFile.txt"),
53+
new File(getClass().getResource("/additionalFile.txt").toURI()),
5454
"extension-1",
5555
"/additionalFiles/")
5656
.withDebugging();

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithFileInHomeIT.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.hivemq.testcontainer.junit4;
1717

1818
import com.hivemq.extension.sdk.api.ExtensionMain;
19-
import org.jetbrains.annotations.NotNull;
2019
import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
2120
import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
2221
import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
@@ -26,6 +25,7 @@
2625
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
2726
import com.hivemq.testcontainer.core.HiveMQExtension;
2827
import com.hivemq.testcontainer.util.TestPublishModifiedUtil;
28+
import org.jetbrains.annotations.NotNull;
2929
import org.junit.Test;
3030

3131
import java.io.File;
@@ -47,12 +47,13 @@ public void test() throws Exception {
4747

4848
final HiveMQTestContainerRule rule =
4949
new HiveMQTestContainerRule()
50-
.waitForExtension(hiveMQExtension)
5150
.withExtension(hiveMQExtension)
51+
.waitForExtension(hiveMQExtension)
5252
.withFileInHomeFolder(
53-
new File("src/test/resources/additionalFile.txt"),
53+
new File(getClass().getResource("/additionalFile.txt").toURI()),
5454
"/additionalFiles/")
5555
.withDebugging();
56+
5657
rule.start();
5758
TestPublishModifiedUtil.testPublishModified(rule.getMqttPort());
5859
rule.stop();

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithGradleExtensionIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class ContainerWithGradleExtensionIT {
3030
@Test(timeout = 200_000)
3131
public void test() throws Exception {
3232
final File gradleExtension = new GradleHiveMQExtensionSupplier(
33-
new File("src/test/resources/gradle-extension/"))
33+
new File(getClass().getResource("/gradle-extension").toURI()))
3434
.get();
3535

3636
final HiveMQTestContainerRule container = new HiveMQTestContainerRule()

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithLicenseIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.hivemq.testcontainer.junit4;
1717

1818
import com.hivemq.extension.sdk.api.ExtensionMain;
19-
import org.jetbrains.annotations.NotNull;
2019
import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
2120
import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
2221
import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
@@ -26,6 +25,7 @@
2625
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
2726
import com.hivemq.testcontainer.core.HiveMQExtension;
2827
import com.hivemq.testcontainer.util.TestPublishModifiedUtil;
28+
import org.jetbrains.annotations.NotNull;
2929
import org.junit.Test;
3030

3131
import java.io.File;
@@ -47,10 +47,10 @@ public void test() throws Exception {
4747

4848
final HiveMQTestContainerRule rule =
4949
new HiveMQTestContainerRule()
50-
.waitForExtension(hiveMQExtension)
5150
.withExtension(hiveMQExtension)
52-
.withLicense(new File("src/test/resources/myLicense.lic"))
53-
.withLicense(new File("src/test/resources/myExtensionLicense.elic"))
51+
.waitForExtension(hiveMQExtension)
52+
.withLicense(new File(getClass().getResource("/myLicense.lic").toURI()))
53+
.withLicense(new File(getClass().getResource("/myExtensionLicense.elic").toURI()))
5454
.withDebugging();
5555

5656
rule.start();

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithMavenExtensionIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public class ContainerWithMavenExtensionIT {
2828

2929
@Test(timeout = 200_000)
3030
public void test() throws Exception {
31-
final File mavenExtension = new MavenHiveMQExtensionSupplier("src/test/resources/maven-extension/pom.xml")
31+
final File mavenExtension = new MavenHiveMQExtensionSupplier(
32+
getClass().getResource("/maven-extension/pom.xml").getPath())
3233
.addProperty("HIVEMQ_GROUP_ID", "com.hivemq")
3334
.addProperty("HIVEMQ_EXTENSION_SDK", "hivemq-extension-sdk")
3435
.addProperty("HIVEMQ_EXTENSION_SDK_VERSION", "4.3.0")

‎junit4/src/test/java/com/hivemq/testcontainer/junit4/CreateFileInCopiedDirectoryIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public void test() throws Exception {
5757
.version("1.0")
5858
.mainClass(FileCreatorExtension.class).build();
5959

60-
final @NotNull HiveMQTestContainerRule rule =
60+
final HiveMQTestContainerRule rule =
6161
new HiveMQTestContainerRule()
62-
.waitForExtension(hiveMQExtension)
6362
.withExtension(hiveMQExtension)
63+
.waitForExtension(hiveMQExtension)
6464
.withFileInHomeFolder(createDirectory());
6565

6666
rule.start();

0 commit comments

Comments
 (0)