This repository was archived by the owner on Oct 18, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 26
Tests with SQL #92
Open
bahek091
wants to merge
2
commits into
autoschool:master
Choose a base branch
from
bahek091:DBTests
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Tests with SQL #92
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| .idea | ||
| target | ||
| *.iml | ||
| .DS_Store | ||
| .DS_Store | ||
| *jcore*.txt |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. И тут с названием метода не сложилось |
||
| 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); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,11 @@ public void shouldSee(WebElement element) { | |
| assertThat("Должны видеть элемент", element, isDisplayed()); | ||
| } | ||
|
|
||
| @Step("Выводим что-тоиз базы") | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. В консоль все-таки не выводим, наверное |
||
| public void dbString(String str){ | ||
| System.out.println("Printed str = " + str); | ||
| } | ||
|
|
||
| private MainPage onMainPage() { | ||
| return new MainPage(driver); | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Наверное, мы не должны были это увидеть