From ccf9f135f289c8d1cf18a1830efa87925c8c25a2 Mon Sep 17 00:00:00 2001 From: Nadezhda Kotegova Date: Fri, 16 May 2025 07:46:32 +0300 Subject: [PATCH 1/7] fix tests --- src/test/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index c0bd8e3..d002829 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1,6 +1,6 @@ logging.level.org.zalando.logbook=TRACE spring.sql.init.mode=always -spring.datasource.url=jdbc:h2:file:./db/filmorate +spring.datasource.url=jdbc:h2:file:./db/filmorate-test spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa spring.datasource.password=password From ffe59ba320b67090217e5e4202ddd22cbfa8a7d6 Mon Sep 17 00:00:00 2001 From: Nadezhda Kotegova Date: Fri, 16 May 2025 07:51:41 +0300 Subject: [PATCH 2/7] fix tests --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d365592..c6b25f4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ logging.level.org.zalando.logbook=TRACE spring.sql.init.mode=always -spring.datasource.url=jdbc:h2:file:./db/filmorate +spring.datasource.url=jdbc:h2:mem:./db/filmorate spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa spring.datasource.password=password \ No newline at end of file From 1278e7998095f5e4743c7194595e376afe186297 Mon Sep 17 00:00:00 2001 From: Nadezhda Kotegova Date: Fri, 16 May 2025 07:52:42 +0300 Subject: [PATCH 3/7] fix tests --- src/test/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index d002829..c0bd8e3 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1,6 +1,6 @@ logging.level.org.zalando.logbook=TRACE spring.sql.init.mode=always -spring.datasource.url=jdbc:h2:file:./db/filmorate-test +spring.datasource.url=jdbc:h2:file:./db/filmorate spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa spring.datasource.password=password From 0c1ace6fc8afe437afaafa5bc7b15427379a4040 Mon Sep 17 00:00:00 2001 From: Nadezhda Kotegova Date: Fri, 16 May 2025 08:09:43 +0300 Subject: [PATCH 4/7] fix tests --- src/main/resources/application.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c6b25f4..a71f7b3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,4 +3,6 @@ spring.sql.init.mode=always spring.datasource.url=jdbc:h2:mem:./db/filmorate spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa -spring.datasource.password=password \ No newline at end of file +spring.datasource.password=password +spring.datasource.schema=classpath:schema.sql +spring.datasource.data=classpath:data.sql \ No newline at end of file From 6afc5b7083acd58553a881f4a26ebcc93fd39289 Mon Sep 17 00:00:00 2001 From: Nadezhda Kotegova Date: Fri, 16 May 2025 08:11:12 +0300 Subject: [PATCH 5/7] fix tests --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a71f7b3..9e4d113 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ logging.level.org.zalando.logbook=TRACE spring.sql.init.mode=always -spring.datasource.url=jdbc:h2:mem:./db/filmorate +spring.datasource.url=jdbc:h2:file:./db/filmorate spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa spring.datasource.password=password From 39294f706581b0e838942fd0eb2d7c9a9811ab14 Mon Sep 17 00:00:00 2001 From: Nadezhda Kotegova Date: Fri, 16 May 2025 08:16:11 +0300 Subject: [PATCH 6/7] fix tests --- src/main/resources/application.properties | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9e4d113..d365592 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,6 +3,4 @@ spring.sql.init.mode=always spring.datasource.url=jdbc:h2:file:./db/filmorate spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa -spring.datasource.password=password -spring.datasource.schema=classpath:schema.sql -spring.datasource.data=classpath:data.sql \ No newline at end of file +spring.datasource.password=password \ No newline at end of file From 1fd36b2876d6e8fadad5bfa52c78160fced428c4 Mon Sep 17 00:00:00 2001 From: Nadezhda Kotegova Date: Fri, 16 May 2025 11:33:11 +0300 Subject: [PATCH 7/7] fix tests --- src/main/resources/application.properties | 4 +++- src/test/resources/application.properties | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d365592..9e4d113 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,4 +3,6 @@ spring.sql.init.mode=always spring.datasource.url=jdbc:h2:file:./db/filmorate spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa -spring.datasource.password=password \ No newline at end of file +spring.datasource.password=password +spring.datasource.schema=classpath:schema.sql +spring.datasource.data=classpath:data.sql \ No newline at end of file diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index c0bd8e3..d002829 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1,6 +1,6 @@ logging.level.org.zalando.logbook=TRACE spring.sql.init.mode=always -spring.datasource.url=jdbc:h2:file:./db/filmorate +spring.datasource.url=jdbc:h2:file:./db/filmorate-test spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa spring.datasource.password=password