Skip to content

Improve internal component testing helpers #4609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 18, 2019
Merged

Improve internal component testing helpers #4609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7671833
Testing convenience: DSL method to pick a custom application.properti…
Sanne Oct 16, 2019
7eefc19
Testing convenience: allow internal QuarkusUnitTest to override some …
Sanne Oct 16, 2019
bb68c2c
Have the test-extension benefit from the new syntax
Sanne Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,17 @@
import org.jboss.logmanager.handlers.AsyncHandler;
import org.jboss.logmanager.handlers.ConsoleHandler;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class AsyncConsoleHandlerTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-async-console-log.properties", "application.properties"))
.withConfigurationResource("application-async-console-log.properties")
.setLogFileName("AsyncConsoleHandlerTest.log");

@Test
Expand Down
6 changes: 2 additions & 4 deletions core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,17 @@
import org.jboss.logmanager.handlers.AsyncHandler;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.logmanager.handlers.FileHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class AsyncFileHandlerTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-async-file-log.properties", "application.properties"))
.withConfigurationResource("application-async-file-log.properties")
.setLogFileName("AsyncFileHandlerTest.log");

@Test
Expand Down
6 changes: 2 additions & 4 deletions core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,17 @@
import org.jboss.logmanager.handlers.AsyncHandler;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.logmanager.handlers.SyslogHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class AsyncSyslogHandlerTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-async-syslog.properties", "application.properties"))
.withConfigurationResource("application-async-syslog.properties")
.setLogFileName("AsyncSyslogHandlerTest.log");

@Test
Expand Down
6 changes: 2 additions & 4 deletions core/test-extension/deployment/src/test/java/io/quarkus/logging/ConsoleHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@
import org.jboss.logmanager.formatters.PatternFormatter;
import org.jboss.logmanager.handlers.ConsoleHandler;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class ConsoleHandlerTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-console-output.properties", "application.properties"));
.withConfigurationResource("application-console-output.properties");

@Test
public void consoleOutputTest() {
Expand Down
6 changes: 2 additions & 4 deletions core/test-extension/deployment/src/test/java/io/quarkus/logging/FileHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@
import org.jboss.logmanager.formatters.PatternFormatter;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.logmanager.handlers.FileHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class FileHandlerTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-file-output-log.properties", "application.properties"));
.withConfigurationResource("application-file-output-log.properties");

@Test
public void fileOutputTest() {
Expand Down
6 changes: 2 additions & 4 deletions ...st-extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@
import org.jboss.logmanager.formatters.PatternFormatter;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.logmanager.handlers.PeriodicRotatingFileHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class PeriodicRotatingLoggingTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-periodic-file-log-rotating.properties", "application.properties"))
.withConfigurationResource("application-periodic-file-log-rotating.properties")
.setLogFileName("PeriodicRotatingLoggingTest.log");

@Test
Expand Down
6 changes: 2 additions & 4 deletions ...xtension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@
import org.jboss.logmanager.formatters.PatternFormatter;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.logmanager.handlers.PeriodicSizeRotatingFileHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class PeriodicSizeRotatingLoggingTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-periodic-size-file-log-rotating.properties", "application.properties"))
.withConfigurationResource("application-periodic-size-file-log-rotating.properties")
.setLogFileName("PeriodicSizeRotatingLoggingTest.log");

@Test
Expand Down
6 changes: 2 additions & 4 deletions core/test-extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@
import org.jboss.logmanager.formatters.PatternFormatter;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.logmanager.handlers.SizeRotatingFileHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class SizeRotatingLoggingTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-size-file-log-rotating.properties", "application.properties"))
.withConfigurationResource("application-size-file-log-rotating.properties")
.setLogFileName("SizeRotatingLoggingTest.log");

@Test
Expand Down
6 changes: 2 additions & 4 deletions core/test-extension/deployment/src/test/java/io/quarkus/logging/SyslogHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,17 @@
import org.jboss.logmanager.formatters.PatternFormatter;
import org.jboss.logmanager.handlers.DelayedHandler;
import org.jboss.logmanager.handlers.SyslogHandler;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.runtime.logging.InitialConfigurator;
import io.quarkus.test.QuarkusUnitTest;

public class SyslogHandlerTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-syslog-output.properties", "application.properties"));
.withConfigurationResource("application-syslog-output.properties");

@Test
public void syslogOutputTest() {
Expand Down
8 changes: 2 additions & 6 deletions ...s/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

import javax.inject.Inject;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -28,10 +26,8 @@ public class DefaultDataSourceConfigTest {
//end::injection[]

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-default-datasource.properties",
"application.properties"));
static final QuarkusUnitTest config = new QuarkusUnitTest()
.withConfigurationResource("application-default-datasource.properties");

@Test
public void testDefaultDataSourceInjection() throws SQLException {
Expand Down
10 changes: 4 additions & 6 deletions ...loyment/src/test/java/io/quarkus/agroal/test/DisabledTransactionDataSourceConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import javax.inject.Inject;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -25,10 +23,10 @@ public class DisabledTransactionDataSourceConfigTest {
AgroalDataSource defaultDataSource;

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-disabledjta-datasource.properties",
"application.properties"));
static final QuarkusUnitTest config = new QuarkusUnitTest()
.withConfigurationResource("base.properties")
.overrideConfigKey("quarkus.datasource.transactions", "DISABLED")
.overrideConfigKey("quarkus.datasource.detect-statement-leaks", "false");

@Test
public void testNonTransactionalDataSourceInjection() throws SQLException {
Expand Down
8 changes: 2 additions & 6 deletions ...agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import javax.inject.Inject;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -34,10 +32,8 @@ public class MultipleDataSourcesConfigTest {
//end::injection[]

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-multiple-datasources.properties",
"application.properties"));
static final QuarkusUnitTest config = new QuarkusUnitTest()
.withConfigurationResource("application-multiple-datasources.properties");

@Test
public void testDataSourceInjection() throws SQLException {
Expand Down
8 changes: 2 additions & 6 deletions ...ons/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

import javax.inject.Inject;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -25,10 +23,8 @@ public class NamedDataSourceConfigTest {
AgroalDataSource ds;

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-named-datasource.properties",
"application.properties"));
static final QuarkusUnitTest config = new QuarkusUnitTest()
.withConfigurationResource("application-named-datasource.properties");

@Test
public void testNamedDataSourceInjection() throws SQLException {
Expand Down
5 changes: 1 addition & 4 deletions extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import java.sql.SQLException;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -12,8 +10,7 @@
public class NoConfigTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
() -> ShrinkWrap.create(JavaArchive.class));
static final QuarkusUnitTest config = new QuarkusUnitTest();

@Test
public void testNoConfig() throws SQLException {
Expand Down
6 changes: 2 additions & 4 deletions ...ns/agroal/deployment/src/test/java/io/quarkus/agroal/test/XaRequiresXaDatasourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

import javax.enterprise.inject.spi.DeploymentException;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -16,8 +14,8 @@ public class XaRequiresXaDatasourceTest {

@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addAsResource("application-wrongdriverkind-datasource.properties", "application.properties"))
.withConfigurationResource("base.properties")
.overrideConfigKey("quarkus.datasource.transactions", "XA")
.assertException(t -> {
assertEquals(DeploymentException.class, t.getClass());
});
Expand Down
5 changes: 0 additions & 5 deletions ...nsions/agroal/deployment/src/test/resources/application-disabledjta-datasource.properties
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ...ion-wrongdriverkind-datasource.properties → ...oyment/src/test/resources/base.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:testing
quarkus.datasource.driver=org.h2.Driver
quarkus.datasource.username=username-named
#Intentionally using the wrong driver for XA:
quarkus.datasource.transactions=XA
Loading