Skip to content

Commit

Permalink
Revert back to QuarkusTestResource
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesnetherton committed Sep 2, 2024
1 parent 1c19e80 commit 9b3a5c5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.io.IOException;
import java.time.Duration;

import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import org.acme.resource.CustomPahoTestResource;
import org.acme.resource.ElasticSearchTestResource;
Expand All @@ -31,8 +31,8 @@
import static org.hamcrest.Matchers.is;

@QuarkusTest
@WithTestResource(CustomPahoTestResource.class)
@WithTestResource(ElasticSearchTestResource.class)
@QuarkusTestResource(CustomPahoTestResource.class)
@QuarkusTestResource(ElasticSearchTestResource.class)
class ElasticSearchTest {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
Expand All @@ -32,7 +32,7 @@
import static org.awaitility.Awaitility.await;

@QuarkusTest
@WithTestResource(FtpTestResource.class)
@QuarkusTestResource(FtpTestResource.class)
public class FileToFtpTest {

@Test
Expand Down
6 changes: 3 additions & 3 deletions jdbc-datasource/src/test/java/org/acme/jdbc/JdbcTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@

import java.util.concurrent.TimeUnit;

import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.junit.jupiter.api.Test;

import static org.awaitility.Awaitility.await;

@QuarkusTest
@WithTestResource(PostgresSourceDatabaseTestResource.class)
@WithTestResource(PostgresTargetDatabaseTestResource.class)
@QuarkusTestResource(PostgresSourceDatabaseTestResource.class)
@QuarkusTestResource(PostgresTargetDatabaseTestResource.class)
public class JdbcTest {

@Test
Expand Down
4 changes: 2 additions & 2 deletions jms-jpa/src/test/java/org/acme/JtaTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.UUID;
import java.util.concurrent.TimeUnit;

import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.h2.H2DatabaseTestResource;
import io.quarkus.test.junit.QuarkusTest;
import org.awaitility.Awaitility;
Expand All @@ -29,7 +29,7 @@
import static org.hamcrest.Matchers.is;

@QuarkusTest
@WithTestResource(H2DatabaseTestResource.class)
@QuarkusTestResource(H2DatabaseTestResource.class)
public class JtaTest {
@Test
public void testXA() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

import java.util.concurrent.TimeUnit;

import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.junit.jupiter.api.Test;

import static org.awaitility.Awaitility.await;

@QuarkusTest
@WithTestResource(JpaIdempotentRepositoryTestResource.class)
@QuarkusTestResource(JpaIdempotentRepositoryTestResource.class)
public class JpaIdempotentRepositoryTest {
@Test
public void contentSetShouldStartWithOneThreeFive() {
Expand Down
4 changes: 2 additions & 2 deletions jta-jpa/src/test/java/org/acme/JtaTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.util.UUID;

import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.h2.H2DatabaseTestResource;
import io.quarkus.test.junit.QuarkusTest;
import org.junit.jupiter.api.Test;
Expand All @@ -27,7 +27,7 @@
import static org.hamcrest.Matchers.is;

@QuarkusTest
@WithTestResource(H2DatabaseTestResource.class)
@QuarkusTestResource(H2DatabaseTestResource.class)
public class JtaTest {
@Test
public void testXA() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.nio.file.Paths;
import java.util.concurrent.TimeUnit;

import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusIntegrationTest;
import io.restassured.RestAssured;
import org.acme.message.bridge.resource.IBMMQTestResource;
Expand All @@ -36,7 +36,7 @@
import static org.assertj.core.api.Assertions.assertThat;

@QuarkusIntegrationTest
@WithTestResource(IBMMQTestResource.class)
@QuarkusTestResource(IBMMQTestResource.class)
// The crash test will kill the app, so it must be executed last as there is no way to restart the application
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class MessageBridgeITCase {
Expand Down

0 comments on commit 9b3a5c5

Please sign in to comment.