Skip to content

Commit 96a5d70

Browse files
authored
Prevented tests of feign-form from writing logs (#2633)
Test were creating logs files on the root of project, making all subsequent builds fail.
1 parent e9f01cd commit 96a5d70

File tree

5 files changed

+50
-13
lines changed

5 files changed

+50
-13
lines changed

form/src/test/java/feign/form/BasicClientTest.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,26 @@
3131
import java.util.Arrays;
3232
import java.util.Map;
3333
import lombok.val;
34+
import org.junit.jupiter.api.BeforeAll;
3435
import org.junit.jupiter.api.Test;
36+
import org.junit.jupiter.api.io.TempDir;
3537
import org.springframework.boot.test.context.SpringBootTest;
3638

3739
@SpringBootTest(webEnvironment = DEFINED_PORT, classes = Server.class)
3840
class BasicClientTest {
3941

40-
private static final TestClient API;
42+
private static TestClient API;
43+
44+
@TempDir static Path logDir;
45+
46+
@BeforeAll
47+
static void configureClient() {
48+
val logFile = logDir.resolve("log.txt").toString();
4149

42-
static {
4350
API =
4451
Feign.builder()
4552
.encoder(new FormEncoder(new JacksonEncoder()))
46-
.logger(new JavaLogger(BasicClientTest.class).appendToFile("log.txt"))
53+
.logger(new JavaLogger(BasicClientTest.class).appendToFile(logFile))
4754
.logLevel(FULL)
4855
.target(TestClient.class, "http://localhost:8080");
4956
}

form/src/test/java/feign/form/ByteArrayClientTest.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,29 @@
2626
import feign.RequestLine;
2727
import feign.Response;
2828
import feign.jackson.JacksonEncoder;
29+
import java.nio.file.Path;
2930
import lombok.val;
31+
import org.junit.jupiter.api.BeforeAll;
3032
import org.junit.jupiter.api.Test;
33+
import org.junit.jupiter.api.io.TempDir;
3134
import org.springframework.boot.test.context.SpringBootTest;
3235

3336
@SpringBootTest(webEnvironment = DEFINED_PORT, classes = Server.class)
3437
class ByteArrayClientTest {
3538

36-
private static final CustomClient API;
39+
private static CustomClient API;
3740

38-
static {
41+
@TempDir static Path logDir;
42+
43+
@BeforeAll
44+
static void configureClient() {
3945
val encoder = new FormEncoder(new JacksonEncoder());
46+
val logFile = logDir.resolve("log-byte.txt").toString();
4047

4148
API =
4249
Feign.builder()
4350
.encoder(encoder)
44-
.logger(new JavaLogger(ByteArrayClientTest.class).appendToFile("log-byte.txt"))
51+
.logger(new JavaLogger(ByteArrayClientTest.class).appendToFile(logFile))
4552
.logLevel(FULL)
4653
.target(CustomClient.class, "http://localhost:8080");
4754
}

form/src/test/java/feign/form/CustomClientTest.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,32 @@
2929
import feign.form.multipart.ByteArrayWriter;
3030
import feign.form.multipart.Output;
3131
import feign.jackson.JacksonEncoder;
32+
import java.nio.file.Path;
3233
import lombok.val;
34+
import org.junit.jupiter.api.BeforeAll;
3335
import org.junit.jupiter.api.Test;
36+
import org.junit.jupiter.api.io.TempDir;
3437
import org.springframework.boot.test.context.SpringBootTest;
3538

3639
@SpringBootTest(webEnvironment = DEFINED_PORT, classes = Server.class)
3740
class CustomClientTest {
3841

39-
private static final CustomClient API;
42+
private static CustomClient API;
4043

41-
static {
44+
@TempDir static Path logDir;
45+
46+
@BeforeAll
47+
static void configureClient() {
4248
val encoder = new FormEncoder(new JacksonEncoder());
4349
val processor = (MultipartFormContentProcessor) encoder.getContentProcessor(MULTIPART);
4450
processor.addFirstWriter(new CustomByteArrayWriter());
4551

52+
val logFile = logDir.resolve("log.txt").toString();
53+
4654
API =
4755
Feign.builder()
4856
.encoder(encoder)
49-
.logger(new JavaLogger(CustomClientTest.class).appendToFile("log.txt"))
57+
.logger(new JavaLogger(CustomClientTest.class).appendToFile(logFile))
5058
.logLevel(FULL)
5159
.target(CustomClient.class, "http://localhost:8080");
5260
}

form/src/test/java/feign/form/FormPropertyTest.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,28 @@
2424
import feign.Logger.JavaLogger;
2525
import feign.RequestLine;
2626
import feign.jackson.JacksonEncoder;
27+
import java.nio.file.Path;
2728
import lombok.val;
29+
import org.junit.jupiter.api.BeforeAll;
2830
import org.junit.jupiter.api.Test;
31+
import org.junit.jupiter.api.io.TempDir;
2932
import org.springframework.boot.test.context.SpringBootTest;
3033

3134
@SpringBootTest(webEnvironment = DEFINED_PORT, classes = Server.class)
3235
class FormPropertyTest {
3336

34-
private static final FormClient API;
37+
private static FormClient API;
38+
39+
@TempDir static Path logDir;
40+
41+
@BeforeAll
42+
static void configureClient() {
43+
val logFile = logDir.resolve("log.txt").toString();
3544

36-
static {
3745
API =
3846
Feign.builder()
3947
.encoder(new FormEncoder(new JacksonEncoder()))
40-
.logger(new JavaLogger(FormPropertyTest.class).appendToFile("log.txt"))
48+
.logger(new JavaLogger(FormPropertyTest.class).appendToFile(logFile))
4149
.logLevel(FULL)
4250
.target(FormClient.class, "http://localhost:8080");
4351
}

form/src/test/java/feign/form/WildCardMapTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,30 @@
2424
import feign.Logger.JavaLogger;
2525
import feign.RequestLine;
2626
import feign.Response;
27+
import java.nio.file.Path;
2728
import java.util.HashMap;
2829
import java.util.Map;
30+
import lombok.val;
2931
import org.junit.jupiter.api.BeforeAll;
3032
import org.junit.jupiter.api.Test;
33+
import org.junit.jupiter.api.io.TempDir;
3134
import org.springframework.boot.test.context.SpringBootTest;
3235

3336
@SpringBootTest(webEnvironment = DEFINED_PORT, classes = Server.class)
3437
class WildCardMapTest {
3538

3639
private static FormUrlEncodedApi api;
3740

41+
@TempDir static Path logDir;
42+
3843
@BeforeAll
3944
static void configureClient() {
45+
val logFile = logDir.resolve("log.txt").toString();
46+
4047
api =
4148
Feign.builder()
4249
.encoder(new FormEncoder())
43-
.logger(new JavaLogger(WildCardMapTest.class).appendToFile("log.txt"))
50+
.logger(new JavaLogger(WildCardMapTest.class).appendToFile(logFile))
4451
.logLevel(FULL)
4552
.target(FormUrlEncodedApi.class, "http://localhost:8080");
4653
}

0 commit comments

Comments
 (0)