From 9015f837df96d7237270a6269917cf48abd4a228 Mon Sep 17 00:00:00 2001
From: stvort <stvort@mail.ru>
Date: Fri, 10 Jan 2025 22:05:33 +0400
Subject: [PATCH] 2024-11 spring-09-jdbc updated

---
 .../otus/spring/dao/PersonDaoJdbc2Test.java   | 88 -------------------
 .../src/test/resources/application.yml        | 10 +--
 2 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100644 2024-11/spring-09-jdbc/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbc2Test.java

diff --git a/2024-11/spring-09-jdbc/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbc2Test.java b/2024-11/spring-09-jdbc/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbc2Test.java
deleted file mode 100644
index a80e9933..00000000
--- a/2024-11/spring-09-jdbc/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbc2Test.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package ru.otus.spring.dao;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.test.context.transaction.AfterTransaction;
-import org.springframework.test.context.transaction.BeforeTransaction;
-import ru.otus.spring.domain.Person;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-@DisplayName("Dao для работы с пёрсонами должно")
-@JdbcTest
-@Import(PersonDaoJdbc.class)
-//@Transactional(propagation = Propagation.NOT_SUPPORTED)
-class PersonDaoJdbc2Test {
-
-    private static final int EXPECTED_PERSONS_COUNT = 1;
-    private static final int EXISTING_PERSON_ID = 1;
-    private static final String EXISTING_PERSON_NAME = "Ivan";
-
-    @Autowired
-    private PersonDaoJdbc personDao;
-
-    @BeforeTransaction
-    void beforeTransaction() {
-        System.out.println("beforeTransaction");
-    }
-
-    @AfterTransaction
-    void afterTransaction() {
-        System.out.println("afterTransaction");
-    }
-
-    @DisplayName("возвращать ожидаемое количество пёрсонов в БД")
-    @Test
-    void shouldReturnExpectedPersonCount() {
-        int actualPersonsCount = personDao.count();
-        assertThat(actualPersonsCount).isEqualTo(EXPECTED_PERSONS_COUNT);
-    }
-
-    //@Rollback(value = false)
-    //@Commit
-    @DisplayName("добавлять пёрсона в БД")
-    @Test
-    void shouldInsertPerson() {
-        Person expectedPerson = new Person(2, "Igor");
-        personDao.insert(expectedPerson);
-        Person actualPerson = personDao.getById(expectedPerson.getId());
-        assertThat(actualPerson).usingRecursiveComparison().isEqualTo(expectedPerson);
-    }
-
-    @DisplayName("возвращать ожидаемого пёрсона по его id")
-    @Test
-    void shouldReturnExpectedPersonById() {
-        Person expectedPerson = new Person(EXISTING_PERSON_ID, EXISTING_PERSON_NAME);
-        Person actualPerson = personDao.getById(expectedPerson.getId());
-        assertThat(actualPerson).usingRecursiveComparison().isEqualTo(expectedPerson);
-    }
-
-    @DisplayName("удалять заданного пёрсона по его id")
-    @Test
-    void shouldCorrectDeletePersonById() {
-        assertThatCode(() -> personDao.getById(EXISTING_PERSON_ID))
-                .doesNotThrowAnyException();
-
-        personDao.deleteById(EXISTING_PERSON_ID);
-
-        assertThatThrownBy(() -> personDao.getById(EXISTING_PERSON_ID))
-                .isInstanceOf(EmptyResultDataAccessException.class);
-    }
-
-    @DisplayName("возвращать ожидаемый список пёрсонов")
-    @Test
-    void shouldReturnExpectedPersonsList() {
-        Person expectedPerson = new Person(EXISTING_PERSON_ID, EXISTING_PERSON_NAME);
-        List<Person> actualPersonList = personDao.getAll();
-        assertThat(actualPersonList)
-                .containsExactlyInAnyOrder(expectedPerson);
-    }
-}
\ No newline at end of file
diff --git a/2024-11/spring-09-jdbc/jdbc-demo-solution-final/src/test/resources/application.yml b/2024-11/spring-09-jdbc/jdbc-demo-solution-final/src/test/resources/application.yml
index bbbefa76..2694a3e5 100644
--- a/2024-11/spring-09-jdbc/jdbc-demo-solution-final/src/test/resources/application.yml
+++ b/2024-11/spring-09-jdbc/jdbc-demo-solution-final/src/test/resources/application.yml
@@ -1,10 +1,10 @@
 spring:
   datasource:
     url: jdbc:h2:mem:testdb
-    initialization-mode: always
-    data: data.sql
+    #initialization-mode: always
+    #data: data.sql
   sql:
     init:
-      #mode: always
-      #data-locations: data.sql
-      #schema-locations: schema.sql
+      mode: always
+      data-locations: data.sql
+      schema-locations: schema.sql