diff --git a/app/src/main/java/hexlet/code/App.java b/app/src/main/java/hexlet/code/App.java index 54e2046..99c5482 100644 --- a/app/src/main/java/hexlet/code/App.java +++ b/app/src/main/java/hexlet/code/App.java @@ -35,17 +35,7 @@ private static TemplateEngine createTemplateEngine() { } private static String getDatabaseUrl() { - // Получаю url базы данных из переменной окружения DATABASE_URL - // Если она не установлена, используем базу в памяти - // • Use the JDBC URL: jdbc:pgsql://[:]/ String jdbcUrl = System.getenv().getOrDefault("JDBC_DATABASE_URL", "jdbc:h2:mem:project;DB_CLOSE_DELAY=-1;"); -// String jdbcUrl = System.getenv().getOrDefault("JDBC_DATABASE_URL", "jdbc:h2:mem:project"); - -// Формат записи URL у базы данных должен быть таким: -// jdbc:postgresql://:/?password=&user= -// String jdbcUrl = System.getenv().getOrDefault("JDBC_DATABASE_URL", -// "jdbc:postgresql://localhost:5432/project72?password=123z&user=prjct72_user"); - log.info(jdbcUrl); return jdbcUrl; } diff --git a/app/src/main/java/hexlet/code/repository/UrlRepository.java b/app/src/main/java/hexlet/code/repository/UrlRepository.java index ba92674..51255f2 100644 --- a/app/src/main/java/hexlet/code/repository/UrlRepository.java +++ b/app/src/main/java/hexlet/code/repository/UrlRepository.java @@ -95,7 +95,8 @@ public static void clear() { PreparedStatement preparedStatement = conn.prepareStatement(sql)) { preparedStatement.executeUpdate(); } catch (SQLException e) { - throw new RuntimeException("Failed to clear the Url database", e); +// throw new RuntimeException("Failed to clear the Url database", e); + System.out.println("Failed to clear the Url database" + e); } } } diff --git a/app/src/test/java/hexlet/code/AppTest.java b/app/src/test/java/hexlet/code/AppTest.java index 7b915e5..e7852b5 100644 --- a/app/src/test/java/hexlet/code/AppTest.java +++ b/app/src/test/java/hexlet/code/AppTest.java @@ -18,14 +18,14 @@ class AppTest { Javalin app; @BeforeEach - public final void setUp() throws SQLException, IOException { + final void setUp() throws SQLException, IOException { app = App.getApp(); // Очистка базы данных перед каждым тестом UrlRepository.clear(); } @Test - public void testMainPage() { + void testMainPage() { JavalinTest.test(app, (server, client) -> { var response = client.get("/"); assertThat(response.code()).isEqualTo(200); @@ -35,7 +35,7 @@ public void testMainPage() { //save URL in BD @Test - public void testUrlSave() throws SQLException { + void testUrlSave() throws SQLException { var url = new Url("https://mail.ru/", LocalDateTime.now()); UrlRepository.save(url); JavalinTest.test(app, (server, client) -> { @@ -45,11 +45,10 @@ public void testUrlSave() throws SQLException { } @Test - public void testCreateUrl() { + void testCreateUrl() { JavalinTest.test(app, (server, client) -> { String requestedBody = "url=https://ya.ru/"; var response = client.post("/urls", requestedBody); -// var response = client.post(NamedRoutes.urlsPath(), requestBody); var url = UrlRepository.findByName("https://ya.ru"); assertThat(url.get().getName()).isEqualTo("https://ya.ru"); assertThat(response.code()).isEqualTo(200); @@ -58,7 +57,7 @@ public void testCreateUrl() { } @Test - public void testAllUrls() { + void testAllUrls() { JavalinTest.test(app, (server, client) -> { var response = client.get("/urls"); assertThat(response.code()).isEqualTo(200);