diff --git a/.gitignore b/.gitignore index 8fae12a..b2b5f61 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea target *.iml -.DS_Store \ No newline at end of file +.DS_Store +*jcore*.txt \ No newline at end of file diff --git a/commons-module/src/test/java/ru/qatools/school/webtests/WeatherWebTest.java b/commons-module/src/test/java/ru/qatools/school/webtests/WeatherWebTest.java index a4c5a40..f34a1f4 100644 --- a/commons-module/src/test/java/ru/qatools/school/webtests/WeatherWebTest.java +++ b/commons-module/src/test/java/ru/qatools/school/webtests/WeatherWebTest.java @@ -3,6 +3,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import ru.qatools.school.DbClient; import ru.qatools.school.pages.MainPage; import ru.qatools.school.rules.WebDriverRule; import ru.qatools.school.steps.websteps.DefaultSteps; @@ -25,12 +26,12 @@ public void initSteps() { @Test @Title("Должны видеть виджет на главной странице") public void shouldSeeWidgetOnMainPage() { - defaultSteps.openMainPageWithCity(MOSCOW); - defaultSteps.shouldSee(onMainPage().getWeatherWidget().get(0)); + defaultSteps.dbString(dbClient.getCityById("Po")); } private MainPage onMainPage() { return new MainPage(webDriverRule.getDriver()); } + DbClient dbClient = new DbClient(); } diff --git a/dbclient-module/src/main/java/ru/qatools/school/DbClient.java b/dbclient-module/src/main/java/ru/qatools/school/DbClient.java index 12e1204..f0bad4d 100644 --- a/dbclient-module/src/main/java/ru/qatools/school/DbClient.java +++ b/dbclient-module/src/main/java/ru/qatools/school/DbClient.java @@ -15,9 +15,9 @@ */ public class DbClient { private static final String CONNECTION_STRING = - System.getProperty("db.url", "jdbc:mysql://db.host.ru:3310/db_name"); - private static final String USER = System.getProperty("db.user", "user"); - private static final String PASSWORD = System.getProperty("db.password", "password");; + System.getProperty("db.url", "jdbc:mysql://db.weather.lanwen.ru:3306/weather"); + private static final String USER = System.getProperty("db.user", "autoschool"); + private static final String PASSWORD = System.getProperty("db.password", U_PASSWORD); private Connection connection; private DSLContext create; @@ -31,10 +31,10 @@ public DbClient() { create = DSL.using(connection, SQLDialect.MYSQL); } - public String getCityById(Integer id) { + public String getCityById(String str) { Record1 result = create.select(field("name")) - .from(table("table_name")) - .where(field("id").equal(id)) + .from(table("City")) + .where(field("name").like(str)) .fetchOne(); return result.getValue(0, String.class); } diff --git a/steps-module/src/main/java/ru/qatools/school/steps/websteps/DefaultSteps.java b/steps-module/src/main/java/ru/qatools/school/steps/websteps/DefaultSteps.java index 1425a42..f616414 100644 --- a/steps-module/src/main/java/ru/qatools/school/steps/websteps/DefaultSteps.java +++ b/steps-module/src/main/java/ru/qatools/school/steps/websteps/DefaultSteps.java @@ -32,6 +32,11 @@ public void shouldSee(WebElement element) { assertThat("Должны видеть элемент", element, isDisplayed()); } + @Step("Выводим что-тоиз базы") + public void dbString(String str){ + System.out.println("Printed str = " + str); + } + private MainPage onMainPage() { return new MainPage(driver); }