Skip to content
Snippets Groups Projects
Unverified Commit 959a9615 authored by Martin Weise's avatar Martin Weise
Browse files

Fixed the tests

parent db20fb19
No related branches found
No related tags found
3 merge requests!129New module for citation as they occur multiple,!121Modified logging, modified logging level, modified flasgger endpoint,!114Modified a bunch of services to accept the new access rights and push them...
package at.tuwien.hibernate;
import org.hibernate.boot.model.relational.Namespace;
import org.hibernate.boot.model.relational.Sequence;
import org.hibernate.mapping.Table;
import org.hibernate.tool.schema.spi.SchemaFilter;
/**
* Do not create table for class {@link at.tuwien.entities.database.table.columns.concepts.Concept} when using JUnit test
*/
public class DbrepoSchemaFilter implements SchemaFilter {
public static final DbrepoSchemaFilter INSTANCE = new DbrepoSchemaFilter();
@Override
public boolean includeNamespace(Namespace namespace) {
return true;
}
@Override
public boolean includeTable(Table table) {
return !table.getName().matches("mdb_concepts");
}
@Override
public boolean includeSequence(Sequence sequence) {
return true;
}
}
package at.tuwien.hibernate;
import org.hibernate.tool.schema.spi.SchemaFilter;
import org.hibernate.tool.schema.spi.SchemaFilterProvider;
/* keep */
public class DbrepoSchemaProvider implements SchemaFilterProvider {
@Override
public SchemaFilter getCreateFilter() {
return DbrepoSchemaFilter.INSTANCE;
}
@Override
public SchemaFilter getDropFilter() {
return DbrepoSchemaFilter.INSTANCE;
}
@Override
public SchemaFilter getMigrateFilter() {
return DbrepoSchemaFilter.INSTANCE;
}
@Override
public SchemaFilter getValidateFilter() {
return DbrepoSchemaFilter.INSTANCE;
}
}
...@@ -8,7 +8,7 @@ spring.cloud.discovery.enabled = false ...@@ -8,7 +8,7 @@ spring.cloud.discovery.enabled = false
spring.cloud.config.discovery.enabled = false spring.cloud.config.discovery.enabled = false
spring.cloud.config.enabled = false spring.cloud.config.enabled = false
# disable datasource # internal datasource
spring.datasource.url=jdbc:h2:mem:testdb;DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM './src/test/resources/init.sql' spring.datasource.url=jdbc:h2:mem:testdb;DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM './src/test/resources/init.sql'
spring.datasource.driverClassName=org.h2.Driver spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa spring.datasource.username=sa
...@@ -16,3 +16,8 @@ spring.datasource.password=password ...@@ -16,3 +16,8 @@ spring.datasource.password=password
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.show-sql=false spring.jpa.show-sql=false
spring.jpa.properties.hibernate.hbm2ddl.schema_filter_provider=at.tuwien.hibernate.DbrepoSchemaProvider
# additional logging
logging.level.org.hibernate.SQL=debug
logging.level.org.hibernate.type=trace
\ No newline at end of file
package at.tuwien.hibernate;
import org.hibernate.boot.model.relational.Namespace;
import org.hibernate.boot.model.relational.Sequence;
import org.hibernate.mapping.Table;
import org.hibernate.tool.schema.spi.SchemaFilter;
/**
* Do not create table for class {@link at.tuwien.entities.database.table.columns.concepts.Concept} when using JUnit test
*/
public class DbrepoSchemaFilter implements SchemaFilter {
public static final DbrepoSchemaFilter INSTANCE = new DbrepoSchemaFilter();
@Override
public boolean includeNamespace(Namespace namespace) {
return true;
}
@Override
public boolean includeTable(Table table) {
return !table.getName().matches("mdb_concepts");
}
@Override
public boolean includeSequence(Sequence sequence) {
return true;
}
}
package at.tuwien.hibernate;
import org.hibernate.tool.schema.spi.SchemaFilter;
import org.hibernate.tool.schema.spi.SchemaFilterProvider;
/* keep */
public class DbrepoSchemaProvider implements SchemaFilterProvider {
@Override
public SchemaFilter getCreateFilter() {
return DbrepoSchemaFilter.INSTANCE;
}
@Override
public SchemaFilter getDropFilter() {
return DbrepoSchemaFilter.INSTANCE;
}
@Override
public SchemaFilter getMigrateFilter() {
return DbrepoSchemaFilter.INSTANCE;
}
@Override
public SchemaFilter getValidateFilter() {
return DbrepoSchemaFilter.INSTANCE;
}
}
...@@ -8,14 +8,15 @@ spring.cloud.discovery.enabled = false ...@@ -8,14 +8,15 @@ spring.cloud.discovery.enabled = false
spring.cloud.config.discovery.enabled = false spring.cloud.config.discovery.enabled = false
spring.cloud.config.enabled = false spring.cloud.config.enabled = false
# disable datasource # internal datasource
spring.datasource.url=jdbc:h2:mem:testdb;DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM './src/test/resources/init.sql' spring.datasource.url=jdbc:h2:mem:testdb;DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM './src/test/resources/init.sql'
spring.datasource.driverClassName=org.h2.Driver spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa spring.datasource.username=sa
spring.datasource.password=password spring.datasource.password=password
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.show-sql=true spring.jpa.show-sql=false
spring.jpa.properties.hibernate.hbm2ddl.schema_filter_provider=at.tuwien.hibernate.DbrepoSchemaProvider
# additional logging # additional logging
logging.level.org.hibernate.SQL=debug logging.level.org.hibernate.SQL=debug
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment