Skip to content
Snippets Groups Projects
Commit fa4ff753 authored by Chris Lemaire's avatar Chris Lemaire
Browse files

Merge branch 'fix-postgresql-tests' into 'development'

Add database-platform setting to PostgreSQL test setup

See merge request !449
parents 7b745010 ccef569f
No related branches found
No related tags found
No related merge requests found
......@@ -26,7 +26,7 @@ stale_outputs_checked
src/main/resources/application.yml
src/main/resources/application.yaml
src/test/resources/application-test.properties
src/test/resources/application-test*
application.properties
log4j.properties
......
......@@ -210,6 +210,11 @@ tasks.withType<Test>().configureEach {
useJUnitPlatform()
minHeapSize = "256m"
maxHeapSize = "1024m"
testLogging {
// Turn this on when needing to debug gradle test runs
showStandardStreams = false
}
}
dependencies {
......
......@@ -50,9 +50,8 @@ public class EditionStatusServiceTest {
private Request r2;
private Request r3;
private
@BeforeEach void setUp() {
@BeforeEach
void setUp() {
PersonSummaryDTO ta1 = new PersonSummaryDTO().id(0L).username("user1").displayName("User 1");
PersonSummaryDTO ta2 = new PersonSummaryDTO().id(1L).username("user2").displayName("User 2");
......
......@@ -20,8 +20,6 @@ package nl.tudelft.queue.service;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.verify;
import javax.transaction.Transactional;
import nl.tudelft.labracore.lib.security.user.DefaultRole;
import nl.tudelft.labracore.lib.security.user.Person;
import nl.tudelft.queue.dto.create.CourseRequestCreateDTO;
......@@ -38,7 +36,6 @@ import org.springframework.mail.SimpleMailMessage;
import test.test.TestQueueApplication;
@Transactional
@SpringBootTest(classes = TestQueueApplication.class)
public class MailServiceTest {
@Autowired
......
......@@ -16,6 +16,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL10Dialect
spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.properties.hibernate.globally_quoted_identifiers=true
......
......@@ -33,6 +33,10 @@ spring:
host: localhost
port: 25
test-connection: false
datasource:
hikari:
# Set the maximum pool size low to force closing of old connections
maximum-pool-size: 2
opentracing:
jaeger:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment