Skip to content

Commit f98cd6c

Browse files
IvanPuntevIvanPuntev
authored
Updating deprecated artifacts used in the tests. (#358)
1 parent 827c717 commit f98cd6c

File tree

8 files changed

+26
-29
lines changed

8 files changed

+26
-29
lines changed

‎deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterBaseTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
2828

2929
public abstract class JsonDefaultFormatterBaseTest {
30-
private static StringWriter writer = new StringWriter();
30+
private static final StringWriter writer = new StringWriter();
3131
private static WriterHandler handler;
3232

3333
static {
@@ -50,7 +50,7 @@ protected String[] logLines() {
5050

5151
public static JsonFormatter getJsonFormatter() {
5252
LogManager logManager = LogManager.getLogManager();
53-
Assertions.assertTrue(logManager instanceof org.jboss.logmanager.LogManager);
53+
Assertions.assertInstanceOf(org.jboss.logmanager.LogManager.class, logManager);
5454

5555
QuarkusDelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
5656
Assertions.assertTrue(Arrays.asList(Logger.getLogger("").getHandlers()).contains(delayedHandler));
@@ -63,7 +63,7 @@ public static JsonFormatter getJsonFormatter() {
6363
Assertions.assertEquals(Level.WARNING, handler.getLevel());
6464

6565
Formatter formatter = handler.getFormatter();
66-
Assertions.assertTrue(formatter instanceof JsonFormatter);
66+
Assertions.assertInstanceOf(JsonFormatter.class, formatter);
6767
return (JsonFormatter) formatter;
6868
}
6969

@@ -80,12 +80,10 @@ protected void testLogOutput() throws Exception {
8080
}
8181

8282
OffsetDateTime afterLastLog = OffsetDateTime.now();
83-
84-
ObjectMapper mapper = new ObjectMapper();
8583
String[] lines = logLines();
8684

8785
Assertions.assertEquals(1, lines.length);
88-
JsonNode jsonNode = mapper.readValue(lines[0], JsonNode.class);
86+
JsonNode jsonNode = new ObjectMapper().readValue(lines[0], JsonNode.class);
8987
Assertions.assertTrue(jsonNode.isObject());
9088

9189
List<String> expectedFields = Arrays.asList(

‎deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJacksonTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
import org.junit.jupiter.api.Test;
88
import org.junit.jupiter.api.extension.RegisterExtension;
99

10-
import io.quarkus.bootstrap.model.AppArtifact;
10+
import io.quarkus.maven.dependency.Dependency;
1111
import io.quarkus.test.QuarkusUnitTest;
1212

1313
class JsonDefaultFormatterJacksonTest extends JsonDefaultFormatterBaseTest {
1414

1515
@RegisterExtension
1616
static final QuarkusUnitTest config = new QuarkusUnitTest()
1717
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
18-
.setForcedDependencies(Collections.singletonList(
19-
new AppArtifact("io.quarkus", "quarkus-jackson", System.getProperty("test.quarkus.version"))))
18+
.setForcedDependencies(Collections
19+
.singletonList(Dependency.of("io.quarkus", "quarkus-jackson", System.getProperty("test.quarkus.version"))))
2020
.withConfigurationResource("application-json.properties");
2121

2222
@Test

‎deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJsonbTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
import org.junit.jupiter.api.Test;
88
import org.junit.jupiter.api.extension.RegisterExtension;
99

10-
import io.quarkus.bootstrap.model.AppArtifact;
10+
import io.quarkus.maven.dependency.Dependency;
1111
import io.quarkus.test.QuarkusUnitTest;
1212

1313
class JsonDefaultFormatterJsonbTest extends JsonDefaultFormatterBaseTest {
1414

1515
@RegisterExtension
1616
static final QuarkusUnitTest config = new QuarkusUnitTest()
1717
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
18-
.setForcedDependencies(Collections.singletonList(
19-
new AppArtifact("io.quarkus", "quarkus-jsonb", System.getProperty("test.quarkus.version"))))
18+
.setForcedDependencies(Collections
19+
.singletonList(Dependency.of("io.quarkus", "quarkus-jsonb", System.getProperty("test.quarkus.version"))))
2020
.withConfigurationResource("application-json.properties");
2121

2222
@Test

‎deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDeprecatedConfigTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.quarkiverse.loggingjson.JsonFormatter;
1919
import io.quarkus.bootstrap.logging.InitialConfigurator;
2020
import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
21-
import io.quarkus.bootstrap.model.AppArtifact;
21+
import io.quarkus.maven.dependency.Dependency;
2222
import io.quarkus.test.QuarkusUnitTest;
2323

2424
/**
@@ -29,18 +29,18 @@ class JsonDeprecatedConfigTest {
2929
@RegisterExtension
3030
static final QuarkusUnitTest config = new QuarkusUnitTest()
3131
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
32-
.setForcedDependencies(Collections.singletonList(
33-
new AppArtifact("io.quarkus", "quarkus-jackson", System.getProperty("test.quarkus.version"))))
32+
.setForcedDependencies(Collections
33+
.singletonList(Dependency.of("io.quarkus", "quarkus-jackson", System.getProperty("test.quarkus.version"))))
3434
.withConfigurationResource("application-json-deprecated-config.properties");
3535

3636
static {
3737
System.setProperty("java.util.logging.manager", org.jboss.logmanager.LogManager.class.getName());
3838
}
3939

4040
@Test
41-
void testJsonLoggingDisabled() throws Exception {
41+
void testJsonLoggingDisabled() {
4242
LogManager logManager = LogManager.getLogManager();
43-
Assertions.assertTrue(logManager instanceof org.jboss.logmanager.LogManager);
43+
Assertions.assertInstanceOf(org.jboss.logmanager.LogManager.class, logManager);
4444

4545
QuarkusDelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
4646
Assertions.assertTrue(Arrays.asList(Logger.getLogger("").getHandlers()).contains(delayedHandler));

‎deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonECSFormatterBaseTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
2424

2525
public abstract class JsonECSFormatterBaseTest {
26-
private static StringWriter writer = new StringWriter();
26+
private static final StringWriter writer = new StringWriter();
2727
private static WriterHandler handler;
2828

2929
static {
@@ -41,7 +41,7 @@ static void setUp() {
4141

4242
public static JsonFormatter getJsonFormatter() {
4343
LogManager logManager = LogManager.getLogManager();
44-
Assertions.assertTrue(logManager instanceof org.jboss.logmanager.LogManager);
44+
Assertions.assertInstanceOf(org.jboss.logmanager.LogManager.class, logManager);
4545

4646
QuarkusDelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
4747
Assertions.assertTrue(Arrays.asList(Logger.getLogger("").getHandlers()).contains(delayedHandler));
@@ -54,7 +54,7 @@ public static JsonFormatter getJsonFormatter() {
5454
Assertions.assertEquals(Level.WARNING, handler.getLevel());
5555

5656
Formatter formatter = handler.getFormatter();
57-
Assertions.assertTrue(formatter instanceof JsonFormatter);
57+
Assertions.assertInstanceOf(JsonFormatter.class, formatter);
5858
return (JsonFormatter) formatter;
5959
}
6060

@@ -76,12 +76,10 @@ protected void testLogOutput() throws Exception {
7676
}
7777

7878
OffsetDateTime afterLastLog = OffsetDateTime.now();
79-
80-
ObjectMapper mapper = new ObjectMapper();
8179
String[] lines = logLines();
8280

8381
Assertions.assertEquals(1, lines.length);
84-
JsonNode jsonNode = mapper.readValue(lines[0], JsonNode.class);
82+
JsonNode jsonNode = new ObjectMapper().readValue(lines[0], JsonNode.class);
8583
Assertions.assertTrue(jsonNode.isObject());
8684

8785
List<String> expectedFields = Arrays.asList(

‎deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonECSFormatterJacksonTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.junit.jupiter.api.Test;
88
import org.junit.jupiter.api.extension.RegisterExtension;
99

10-
import io.quarkus.bootstrap.model.AppArtifact;
10+
import io.quarkus.maven.dependency.Dependency;
1111
import io.quarkus.test.QuarkusUnitTest;
1212

1313
class JsonECSFormatterJacksonTest extends JsonECSFormatterBaseTest {
@@ -16,7 +16,7 @@ class JsonECSFormatterJacksonTest extends JsonECSFormatterBaseTest {
1616
static final QuarkusUnitTest config = new QuarkusUnitTest()
1717
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
1818
.setForcedDependencies(Collections.singletonList(
19-
new AppArtifact("io.quarkus", "quarkus-jackson-deployment", System.getProperty("test.quarkus.version"))))
19+
Dependency.of("io.quarkus", "quarkus-jackson-deployment", System.getProperty("test.quarkus.version"))))
2020
.withConfigurationResource("application-json-ecs.properties");
2121

2222
@Test

‎deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonECSFormatterJsonbTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.junit.jupiter.api.Test;
88
import org.junit.jupiter.api.extension.RegisterExtension;
99

10-
import io.quarkus.bootstrap.model.AppArtifact;
10+
import io.quarkus.maven.dependency.Dependency;
1111
import io.quarkus.test.QuarkusUnitTest;
1212

1313
class JsonECSFormatterJsonbTest extends JsonECSFormatterBaseTest {
@@ -16,7 +16,7 @@ class JsonECSFormatterJsonbTest extends JsonECSFormatterBaseTest {
1616
static final QuarkusUnitTest config = new QuarkusUnitTest()
1717
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
1818
.setForcedDependencies(Collections.singletonList(
19-
new AppArtifact("io.quarkus", "quarkus-jsonb-deployment", System.getProperty("test.quarkus.version"))))
19+
Dependency.of("io.quarkus", "quarkus-jsonb-deployment", System.getProperty("test.quarkus.version"))))
2020
.withConfigurationResource("application-json-ecs.properties");
2121

2222
@Test

‎deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
import com.google.common.collect.ImmutableList;
1717

1818
import io.quarkiverse.loggingjson.deployment.JsonDefaultFormatterBaseTest;
19-
import io.quarkus.bootstrap.model.AppArtifact;
19+
import io.quarkus.maven.dependency.Dependency;
2020
import io.quarkus.test.QuarkusUnitTest;
2121

2222
class CustomJsonProviderJsonbTest extends JsonDefaultFormatterBaseTest {
23+
2324
@RegisterExtension
2425
static final QuarkusUnitTest config = new QuarkusUnitTest()
2526
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
2627
.addClasses(FirstCustomJsonProvider.class, SecondCustomJsonProvider.class, ThirdCustomJsonProvider.class))
2728
.setForcedDependencies(Collections.singletonList(
28-
new AppArtifact("io.quarkus", "quarkus-jsonb-deployment", System.getProperty("test.quarkus.version"))))
29+
Dependency.of("io.quarkus", "quarkus-jsonb-deployment", System.getProperty("test.quarkus.version"))))
2930
.withConfigurationResource("application-json.properties");
3031

3132
@Inject

0 commit comments

Comments
 (0)