Skip to content

Commit c4fc04d

Browse files
troosantroosan
authored
Cleanup test code reuse (#376)
Avoid code duplication and make methods reusable by new test classes.
1 parent c5564cf commit c4fc04d

18 files changed

+136
-593
lines changed

‎runtime/src/test/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProviderJsonbTest.java‎

Lines changed: 29 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,7 @@ protected Type type() {
2222

2323
@Test
2424
void testDefaultConfig() throws Exception {
25-
final Config.ArgumentsConfig config = new Config.ArgumentsConfig() {
26-
27-
@Override
28-
public Optional<String> fieldName() {
29-
return Optional.empty();
30-
}
31-
32-
@Override
33-
public boolean includeStructuredArguments() {
34-
return true;
35-
}
36-
37-
@Override
38-
public String nonStructuredArgumentsFieldPrefix() {
39-
return "arg";
40-
}
41-
42-
@Override
43-
public boolean includeNonStructuredArguments() {
44-
return false;
45-
}
46-
};
25+
final Config.ArgumentsConfig config = argumentsConfig(Optional.empty(), true, false, "arg");
4726
final ArgumentsJsonProvider provider = new ArgumentsJsonProvider(config);
4827

4928
final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", "");
@@ -67,28 +46,7 @@ public boolean includeNonStructuredArguments() {
6746

6847
@Test
6948
void testCustomConfigShortCircuit() throws Exception {
70-
final Config.ArgumentsConfig config = new Config.ArgumentsConfig() {
71-
72-
@Override
73-
public Optional<String> fieldName() {
74-
return Optional.empty();
75-
}
76-
77-
@Override
78-
public boolean includeStructuredArguments() {
79-
return false;
80-
}
81-
82-
@Override
83-
public String nonStructuredArgumentsFieldPrefix() {
84-
return "arg";
85-
}
86-
87-
@Override
88-
public boolean includeNonStructuredArguments() {
89-
return false;
90-
}
91-
};
49+
final Config.ArgumentsConfig config = argumentsConfig(Optional.empty(), false, false, "arg");
9250
final ArgumentsJsonProvider provider = new ArgumentsJsonProvider(config);
9351

9452
final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", "");
@@ -104,27 +62,7 @@ public boolean includeNonStructuredArguments() {
10462

10563
@Test
10664
void testCustomConfigWrapInObject() throws Exception {
107-
final Config.ArgumentsConfig config = new Config.ArgumentsConfig() {
108-
@Override
109-
public Optional<String> fieldName() {
110-
return Optional.of("arguments");
111-
}
112-
113-
@Override
114-
public boolean includeStructuredArguments() {
115-
return true;
116-
}
117-
118-
@Override
119-
public String nonStructuredArgumentsFieldPrefix() {
120-
return "arg";
121-
}
122-
123-
@Override
124-
public boolean includeNonStructuredArguments() {
125-
return true;
126-
}
127-
};
65+
final Config.ArgumentsConfig config = argumentsConfig(Optional.of("arguments"), true, true, "arg");
12866
final ArgumentsJsonProvider provider = new ArgumentsJsonProvider(config);
12967

13068
final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", "");
@@ -152,4 +90,30 @@ public boolean includeNonStructuredArguments() {
15290

15391
Assertions.assertTrue(provider.isEnabled());
15492
}
93+
94+
private Config.ArgumentsConfig argumentsConfig(Optional<String> fieldName, boolean includeStructuredArguments,
95+
boolean includeNonStructuredArguments, String nonStructuredArgumentsFieldPrefix) {
96+
return new Config.ArgumentsConfig() {
97+
98+
@Override
99+
public Optional<String> fieldName() {
100+
return fieldName;
101+
}
102+
103+
@Override
104+
public boolean includeStructuredArguments() {
105+
return includeStructuredArguments;
106+
}
107+
108+
@Override
109+
public boolean includeNonStructuredArguments() {
110+
return includeNonStructuredArguments;
111+
}
112+
113+
@Override
114+
public String nonStructuredArgumentsFieldPrefix() {
115+
return nonStructuredArgumentsFieldPrefix;
116+
}
117+
};
118+
}
155119
}

‎runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,7 @@ protected Type type() {
1919

2020
@Test
2121
void testDefaultConfig() throws Exception {
22-
final Config.FieldConfig config = new Config.FieldConfig() {
23-
@Override
24-
public Optional<String> fieldName() {
25-
return Optional.empty();
26-
}
27-
28-
@Override
29-
public Optional<Boolean> enabled() {
30-
return Optional.empty();
31-
}
32-
};
22+
final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty());
3323
final ErrorMessageJsonProvider provider = new ErrorMessageJsonProvider(config);
3424

3525
final RuntimeException t = new RuntimeException("Testing errorMessage");
@@ -47,19 +37,7 @@ public Optional<Boolean> enabled() {
4737

4838
@Test
4939
void testCustomConfig() throws Exception {
50-
final var config = new Config.FieldConfig() {
51-
private Optional<Boolean> enabled = Optional.of(false);
52-
53-
@Override
54-
public Optional<String> fieldName() {
55-
return Optional.of("em");
56-
}
57-
58-
@Override
59-
public Optional<Boolean> enabled() {
60-
return enabled;
61-
}
62-
};
40+
Config.FieldConfig config = fieldConfig(Optional.of("em"), Optional.of(false));
6341
final ErrorMessageJsonProvider provider = new ErrorMessageJsonProvider(config);
6442

6543
final RuntimeException t = new RuntimeException("Testing errorMessage");
@@ -74,7 +52,7 @@ public Optional<Boolean> enabled() {
7452
Assertions.assertEquals("Testing errorMessage", em);
7553
Assertions.assertFalse(provider.isEnabled());
7654

77-
config.enabled = Optional.of(true);
55+
config = fieldConfig(Optional.of("em"), Optional.of(true));
7856
Assertions.assertTrue(new ErrorMessageJsonProvider(config).isEnabled());
7957
}
8058
}

‎runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,7 @@ protected Type type() {
1919

2020
@Test
2121
void testDefaultConfig() throws Exception {
22-
final Config.FieldConfig config = new Config.FieldConfig() {
23-
@Override
24-
public Optional<String> fieldName() {
25-
return Optional.empty();
26-
}
27-
28-
@Override
29-
public Optional<Boolean> enabled() {
30-
return Optional.empty();
31-
}
32-
};
22+
final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty());
3323
final ErrorTypeJsonProvider provider = new ErrorTypeJsonProvider(config);
3424

3525
final RuntimeException t = new RuntimeException("Testing errorType");
@@ -47,19 +37,7 @@ public Optional<Boolean> enabled() {
4737

4838
@Test
4939
void testCustomConfig() throws Exception {
50-
final var config = new Config.FieldConfig() {
51-
private Optional<Boolean> enabled = Optional.of(false);
52-
53-
@Override
54-
public Optional<String> fieldName() {
55-
return Optional.of("et");
56-
}
57-
58-
@Override
59-
public Optional<Boolean> enabled() {
60-
return enabled;
61-
}
62-
};
40+
Config.FieldConfig config = fieldConfig(Optional.of("et"), Optional.of(false));
6341
final ErrorTypeJsonProvider provider = new ErrorTypeJsonProvider(config);
6442

6543
final RuntimeException t = new RuntimeException("Testing errorType");
@@ -74,7 +52,7 @@ public Optional<Boolean> enabled() {
7452
Assertions.assertEquals("java.lang.RuntimeException", et);
7553
Assertions.assertFalse(provider.isEnabled());
7654

77-
config.enabled = Optional.of(true);
55+
config = fieldConfig(Optional.of("et"), Optional.of(true));
7856
Assertions.assertTrue(new ErrorTypeJsonProvider(config).isEnabled());
7957
}
8058
}

‎runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,7 @@ protected Type type() {
1919

2020
@Test
2121
void testDefaultConfig() throws Exception {
22-
final Config.FieldConfig config = new Config.FieldConfig() {
23-
@Override
24-
public Optional<String> fieldName() {
25-
return Optional.empty();
26-
}
27-
28-
@Override
29-
public Optional<Boolean> enabled() {
30-
return Optional.empty();
31-
}
32-
};
22+
final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty());
3323
final HostNameJsonProvider provider = new HostNameJsonProvider(config);
3424

3525
final JsonNode result = getResultAsJsonNode(provider, new ExtLogRecord(Level.ALL, "", ""));
@@ -42,19 +32,7 @@ public Optional<Boolean> enabled() {
4232

4333
@Test
4434
void testCustomConfig() throws Exception {
45-
final var config = new Config.FieldConfig() {
46-
private Optional<Boolean> enabled = Optional.of(false);
47-
48-
@Override
49-
public Optional<String> fieldName() {
50-
return Optional.of("host");
51-
}
52-
53-
@Override
54-
public Optional<Boolean> enabled() {
55-
return enabled;
56-
}
57-
};
35+
Config.FieldConfig config = fieldConfig(Optional.of("host"), Optional.of(false));
5836
final HostNameJsonProvider provider = new HostNameJsonProvider(config);
5937

6038
final JsonNode result = getResultAsJsonNode(provider, new ExtLogRecord(Level.ALL, "", ""));
@@ -64,7 +42,7 @@ public Optional<Boolean> enabled() {
6442
Assertions.assertFalse(hostName.isEmpty());
6543
Assertions.assertFalse(provider.isEnabled());
6644

67-
config.enabled = Optional.of(true);
45+
config = fieldConfig(Optional.of("host"), Optional.of(true));
6846
Assertions.assertTrue(new HostNameJsonProvider(config).isEnabled());
6947
}
7048
}

‎runtime/src/test/java/io/quarkiverse/loggingjson/providers/JsonProviderBaseTest.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.quarkiverse.loggingjson.providers;
22

33
import java.io.IOException;
4+
import java.util.Optional;
45

56
import org.jboss.logmanager.ExtLogRecord;
67

@@ -11,6 +12,7 @@
1112
import io.quarkiverse.loggingjson.JsonGenerator;
1213
import io.quarkiverse.loggingjson.JsonProvider;
1314
import io.quarkiverse.loggingjson.StringBuilderWriter;
15+
import io.quarkiverse.loggingjson.config.Config;
1416
import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory;
1517
import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory;
1618

@@ -52,6 +54,21 @@ protected JsonNode getResultAsJsonNode(JsonProvider jsonProvider, ExtLogRecord e
5254
return mapper.readValue(getResult(jsonProvider, event), JsonNode.class);
5355
}
5456

57+
protected Config.FieldConfig fieldConfig(Optional<String> fieldName, Optional<Boolean> enabled) {
58+
return new Config.FieldConfig() {
59+
60+
@Override
61+
public Optional<String> fieldName() {
62+
return fieldName;
63+
}
64+
65+
@Override
66+
public Optional<Boolean> enabled() {
67+
return enabled;
68+
}
69+
};
70+
}
71+
5572
public enum Type {
5673
JSONB,
5774
JACKSON

‎runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,7 @@ protected Type type() {
1919

2020
@Test
2121
void testDefaultConfig() throws Exception {
22-
final Config.FieldConfig config = new Config.FieldConfig() {
23-
@Override
24-
public Optional<String> fieldName() {
25-
return Optional.empty();
26-
}
27-
28-
@Override
29-
public Optional<Boolean> enabled() {
30-
return Optional.empty();
31-
}
32-
};
22+
final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty());
3323
final LogLevelJsonProvider provider = new LogLevelJsonProvider(config);
3424

3525
final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", "");
@@ -44,19 +34,7 @@ public Optional<Boolean> enabled() {
4434

4535
@Test
4636
void testCustomConfig() throws Exception {
47-
final var config = new Config.FieldConfig() {
48-
private Optional<Boolean> enabled = Optional.of(false);
49-
50-
@Override
51-
public Optional<String> fieldName() {
52-
return Optional.of("logLevel");
53-
}
54-
55-
@Override
56-
public Optional<Boolean> enabled() {
57-
return enabled;
58-
}
59-
};
37+
Config.FieldConfig config = fieldConfig(Optional.of("logLevel"), Optional.of(false));
6038
final LogLevelJsonProvider provider = new LogLevelJsonProvider(config);
6139

6240
final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", "");
@@ -68,7 +46,7 @@ public Optional<Boolean> enabled() {
6846
Assertions.assertEquals("ALL", logger);
6947
Assertions.assertFalse(provider.isEnabled());
7048

71-
config.enabled = Optional.of(true);
49+
config = fieldConfig(Optional.of("logLevel"), Optional.of(true));
7250
Assertions.assertTrue(new LogLevelJsonProvider(config).isEnabled());
7351
}
7452
}

0 commit comments

Comments
 (0)