Skip to content

Commit

Permalink
TS Clean-up - Move Sql & Websockets packages and rename tests
Browse files Browse the repository at this point in the history
  • Loading branch information
michalvavrik committed May 26, 2022
1 parent d1d6998 commit d560fc7
Show file tree
Hide file tree
Showing 105 changed files with 223 additions and 227 deletions.
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import javax.enterprise.context.Dependent;
import javax.inject.Named;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import javax.persistence.Column;
import javax.persistence.Entity;
Expand All @@ -24,7 +24,7 @@ public class Fruit {

@Id
@GeneratedValue(generator = "fruitsSequence")
@GenericGenerator(name = "fruitsSequence", strategy = "io.quarkus.qe.hibernate.search.MyCustomIdGenerator")
@GenericGenerator(name = "fruitsSequence", strategy = "io.quarkus.ts.hibernate.search.MyCustomIdGenerator")
private Integer id;

@FullTextField(analyzer = "name")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import java.io.Serializable;
import java.util.HashSet;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import static io.restassured.RestAssured.given;
import static org.hamcrest.MatcherAssert.assertThat;
Expand All @@ -17,7 +17,7 @@
import io.restassured.common.mapper.TypeRef;
import io.restassured.http.ContentType;

public abstract class AbstractMultitenantIT {
public abstract class AbstractMultitenantHibernateSearchIT {
public static final TypeRef<List<Fruit>> FRUIT_LIST_TYPE_REF = new TypeRef<>() {
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import io.quarkus.test.bootstrap.DefaultService;
import io.quarkus.test.bootstrap.MySqlService;
Expand All @@ -8,7 +8,7 @@
import io.quarkus.test.services.QuarkusApplication;

@QuarkusScenario
public class MysqlMultitenantHibernateIT extends AbstractMultitenantIT {
public class MysqlMultitenantHibernateSearchIT extends AbstractMultitenantHibernateSearchIT {
static final int ELASTIC_PORT = 9200;
static final int MYSQL_PORT = 3306;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
Expand All @@ -14,7 +14,7 @@
@EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
@Disabled
//TODO https://github.com/quarkus-qe/quarkus-test-framework/issues/427
public class OpenShiftMysqlMultitenantIT extends AbstractMultitenantIT {
public class OpenShiftMysqlMultitenantHibernateSearchIT extends AbstractMultitenantHibernateSearchIT {
static final int ELASTIC_PORT = 9200;
static final int MYSQL_PORT = 3306;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import org.junit.jupiter.api.condition.EnabledIfSystemProperty;

Expand All @@ -11,7 +11,7 @@

@OpenShiftScenario
@EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
public class OpenShiftPostgresqlMultitenantIT extends AbstractMultitenantIT {
public class OpenShiftPostgresqlMultitenantHibernateSearchIT extends AbstractMultitenantHibernateSearchIT {
static final int ELASTIC_PORT = 9200;
static final int POSTGRESQL_PORT = 5432;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.hibernate.search;
package io.quarkus.ts.hibernate.search;

import io.quarkus.test.bootstrap.DefaultService;
import io.quarkus.test.bootstrap.PostgresqlService;
Expand All @@ -8,7 +8,7 @@
import io.quarkus.test.services.QuarkusApplication;

@QuarkusScenario
public class PostgresqlMultitenantHibernateIT extends AbstractMultitenantIT {
public class PostgresqlMultitenantHibernateSearchIT extends AbstractMultitenantHibernateSearchIT {

static final int ELASTIC_PORT = 9200;
static final int POSTGRESQL_PORT = 5432;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.database;
package io.quarkus.ts.hibernate.reactive.database;

import static javax.persistence.CascadeType.PERSIST;

Expand Down Expand Up @@ -27,7 +27,7 @@ public class Author {
@Id
@Column(name = "id")
@GeneratedValue(generator = "authorIds")
@GenericGenerator(name = "authorIds", strategy = "io.quarkus.ts.reactive.database.AuthorIdGenerator")
@GenericGenerator(name = "authorIds", strategy = "io.quarkus.ts.hibernate.reactive.database.AuthorIdGenerator")
private Integer id;

@NotNull
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.database;
package io.quarkus.ts.hibernate.reactive.database;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.database;
package io.quarkus.ts.hibernate.reactive.database;

import javax.enterprise.context.ApplicationScoped;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.database;
package io.quarkus.ts.hibernate.reactive.database;

import javax.persistence.Column;
import javax.persistence.Convert;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.database;
package io.quarkus.ts.hibernate.reactive.database;

import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.http;
package io.quarkus.ts.hibernate.reactive.http;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.http;
package io.quarkus.ts.hibernate.reactive.http;

import io.quarkus.hibernate.orm.panache.common.ProjectedFieldName;
import io.quarkus.runtime.annotations.RegisterForReflection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.http;
package io.quarkus.ts.hibernate.reactive.http;

import javax.inject.Inject;
import javax.ws.rs.Consumes;
Expand All @@ -14,8 +14,8 @@
import org.hibernate.reactive.mutiny.Mutiny;

import io.quarkus.arc.Arc;
import io.quarkus.ts.reactive.database.Author;
import io.quarkus.ts.reactive.database.Book;
import io.quarkus.ts.hibernate.reactive.database.Author;
import io.quarkus.ts.hibernate.reactive.database.Book;
import io.smallrye.mutiny.Uni;

@Path("/hibernate")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.http;
package io.quarkus.ts.hibernate.reactive.http;

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.http;
package io.quarkus.ts.hibernate.reactive.http;

import javax.inject.Inject;
import javax.ws.rs.Consumes;
Expand All @@ -12,9 +12,9 @@
import javax.ws.rs.core.Response;

import io.quarkus.hibernate.reactive.panache.Panache;
import io.quarkus.ts.reactive.database.Author;
import io.quarkus.ts.reactive.database.AuthorRepository;
import io.quarkus.ts.reactive.database.Book;
import io.quarkus.ts.hibernate.reactive.database.Author;
import io.quarkus.ts.hibernate.reactive.database.AuthorRepository;
import io.quarkus.ts.hibernate.reactive.database.Book;
import io.smallrye.mutiny.Multi;
import io.smallrye.mutiny.Uni;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.http;
package io.quarkus.ts.hibernate.reactive.http;

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.quarkus.ts.reactive;
package io.quarkus.ts.hibernate.reactive;

import static io.restassured.RestAssured.given;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand All @@ -18,7 +17,7 @@
import io.restassured.response.Response;

@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public abstract class AbstractReactiveDatabaseIT {
public abstract class AbstractDatabaseHibernateReactiveIT {

@Test
@Order(1)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive;
package io.quarkus.ts.hibernate.reactive;

import org.junit.jupiter.api.Tag;

Expand All @@ -10,7 +10,7 @@

@QuarkusScenario
@Tag("fips-incompatible") // Reported in https://github.com/IBM/Db2/issues/43
public class DB2DatabaseIT extends AbstractReactiveDatabaseIT {
public class DB2DatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT {

private static final String DB2_USER = "test";
private static final String DB2_PASSWORD = "test";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive;
package io.quarkus.ts.hibernate.reactive;

import org.junit.jupiter.api.Disabled;

Expand All @@ -9,7 +9,7 @@
import io.quarkus.test.services.QuarkusApplication;

@QuarkusScenario
public class MariaDbDatabaseIT extends AbstractReactiveDatabaseIT {
public class MariaDbDatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT {

private static final String MYSQL_USER = "quarkus_test";
private static final String MYSQL_PASSWORD = "quarkus_test";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive;
package io.quarkus.ts.hibernate.reactive;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
Expand All @@ -11,7 +11,7 @@

@QuarkusScenario
//TODO: enable disabled methods then the issue will be fixed
public class MsSQLDatabaseIT extends AbstractReactiveDatabaseIT {
public class MsSQLDatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT {

private static final int MSSQL_PORT = 1433;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive;
package io.quarkus.ts.hibernate.reactive;

import org.junit.jupiter.api.Disabled;

Expand All @@ -9,7 +9,7 @@
import io.quarkus.test.services.QuarkusApplication;

@QuarkusScenario
public class MySQLDatabaseIT extends AbstractReactiveDatabaseIT {
public class MySQLDatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT {

private static final String MYSQL_USER = "quarkus_test";
private static final String MYSQL_PASSWORD = "quarkus_test";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive;
package io.quarkus.ts.hibernate.reactive;

import io.quarkus.test.bootstrap.PostgresqlService;
import io.quarkus.test.bootstrap.RestService;
Expand All @@ -7,7 +7,7 @@
import io.quarkus.test.services.QuarkusApplication;

@QuarkusScenario
public class PostgresqlDatabaseIT extends AbstractReactiveDatabaseIT {
public class PostgresqlDatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT {

private static final String POSTGRES_USER = "quarkus_test";
private static final String POSTGRES_PASSWORD = "quarkus_test";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.quarkus.ts.hibernate.reactive.openshift;

import io.quarkus.test.scenarios.OpenShiftScenario;
import io.quarkus.ts.hibernate.reactive.MsSQLDatabaseHibernateReactiveIT;

@OpenShiftScenario
public class OpenHibernateReactiveShiftMsSQLIT extends MsSQLDatabaseHibernateReactiveIT {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.quarkus.ts.hibernate.reactive.openshift;

import io.quarkus.test.scenarios.OpenShiftScenario;
import io.quarkus.ts.hibernate.reactive.MySQLDatabaseHibernateReactiveIT;

@OpenShiftScenario
public class OpenShiftMySqlHibernateReactiveIT extends MySQLDatabaseHibernateReactiveIT {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.reactive.openshift;
package io.quarkus.ts.hibernate.reactive.openshift;

import org.junit.jupiter.api.condition.EnabledIfSystemProperty;

Expand All @@ -7,11 +7,11 @@
import io.quarkus.test.scenarios.OpenShiftScenario;
import io.quarkus.test.services.Container;
import io.quarkus.test.services.QuarkusApplication;
import io.quarkus.ts.reactive.AbstractReactiveDatabaseIT;
import io.quarkus.ts.hibernate.reactive.AbstractDatabaseHibernateReactiveIT;

@OpenShiftScenario
@EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
public class OpenShiftPostgresql10IT extends AbstractReactiveDatabaseIT {
public class OpenShiftPostgresql10HibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT {

private static final String POSTGRES_USER = "quarkus_test";
private static final String POSTGRES_PASSWORD = "quarkus_test";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.quarkus.ts.hibernate.reactive.openshift;

import io.quarkus.test.scenarios.OpenShiftScenario;
import io.quarkus.ts.hibernate.reactive.PostgresqlDatabaseHibernateReactiveIT;

@OpenShiftScenario
public class OpenShiftPostgresqlHibernateReactiveIT extends PostgresqlDatabaseHibernateReactiveIT {
}

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.sqldb.panacheflyway;
package io.quarkus.ts.sqldb.panacheflyway;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.qe.sqldb.panacheflyway;
package io.quarkus.ts.sqldb.panacheflyway;

import java.util.Collections;
import java.util.List;
Expand Down
Loading

0 comments on commit d560fc7

Please sign in to comment.