#36: fix tests

src/test/java/ru/saneci/booklibrary/BaseControllerTest.java

@@ -38,7 +38,10 @@ public abstract class BaseControllerTest {
                         getContainerInitDatabasePath("deploy-23-2.sql"))
                 .withCopyFileToContainer(
                         getDatabaseMigrationFile("r-2024-1/deploy-24-1.sql"),
-                        getContainerInitDatabasePath("deploy-24-1.sql"));
+                        getContainerInitDatabasePath("deploy-24-1.sql"))
+                .withCopyFileToContainer(
+                        getDatabaseMigrationFile("r-2024-2/deploy-24-2.sql"),
+                        getContainerInitDatabasePath("deploy-24-2.sql"));
     }
 
     private static MountableFile getDatabaseMigrationFile(String fileName) {

src/test/java/ru/saneci/booklibrary/controller/HomeControllerTest.java

@@ -37,8 +37,8 @@ void whenGetIndex_thenIndexViewShouldContainMainMenu() throws Exception {
         mockMvc.perform(get("/"))
                 .andExpect(xpath("//*[@id='mainMenu']/nav/div[1]/h4").string("Основные разделы приложения"))
                 .andExpect(xpath("//*[@id='mainMenu']/nav/div[2]/a/strong").string("Книги"))
-                .andExpect(xpath("//*[@id='mainMenu']/nav/div[3]/a/strong").string("Новая книга"))
-                .andExpect(xpath("//*[@id='mainMenu']/nav/div[4]/a/strong").string("Читатели"))
+                .andExpect(xpath("//*[@id='mainMenu']/nav/div[3]/a/strong").string("Читатели"))
+                .andExpect(xpath("//*[@id='mainMenu']/nav/div[4]/a/strong").string("Новая книга"))
                 .andExpect(xpath("//*[@id='mainMenu']/nav/div[5]/a/strong").string("Новый читатель"));
     }
 

src/test/resources/sql/book_controller/create-book-with-linked-person.sql

@@ -1,4 +1,7 @@
 truncate book, person;
 
-insert into person (id, name, birthday_year) values (1, 'Test User Name', 2020);
-insert into book (id, person_id, title, author, publish_year) values (1, 1, 'Test Book', 'Test Author', 1234);
+insert into person (id, name, birthday_year, username, password, role)
+values (1, 'Test User Name', 2020, 'username', 'password', 'ROLE_READER');
+
+insert into book (id, person_id, title, author, publish_year)
+values (1, 1, 'Test Book', 'Test Author', 1234);

src/test/resources/sql/people_controller/create-not-overdue-book.sql

@@ -1,6 +1,7 @@
 truncate book, person;
 
-insert into person (id, name, birthday_year) values (1, 'Test User Name', 2020);
+insert into person (id, name, birthday_year, username, password, role)
+values (1, 'Test User Name', 2020, 'username', 'password', 'ROLE_READER');
 
 insert into book (id, person_id, title, author, publish_year, given_at)
 values (1, 1, 'Test Book', 'Test Author', 1234, now() - interval '9 days');

src/test/resources/sql/people_controller/create-overdue-book.sql

@@ -1,6 +1,7 @@
 truncate book, person;
 
-insert into person (id, name, birthday_year) values (1, 'Test User Name', 2020);
+insert into person (id, name, birthday_year, username, password, role)
+values (1, 'Test User Name', 2020, 'username', 'password', 'ROLE_READER');
 
 insert into book (id, person_id, title, author, publish_year, given_at)
 values (1, 1, 'Test Book', 'Test Author', 1234, now() - interval '10 days');

src/test/resources/sql/people_controller/create-person.sql

@@ -1,3 +1,4 @@
 truncate person cascade;
 
-insert into person (id, name, birthday_year) values (1, 'Test User', 1990);
+insert into person (id, name, birthday_year, username, password, role)
+values (1, 'Test User', 1990, 'username', 'password', 'ROLE_READER');