Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 45fa69f

Browse filesBrowse files
committed
11_9_fix
1 parent 3c103ae commit 45fa69f
Copy full SHA for 45fa69f

File tree

Expand file treeCollapse file tree

3 files changed

+8
-8
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+8
-8
lines changed
Open diff view settings
Collapse file

‎persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java‎

Copy file name to clipboardExpand all lines: persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public User insert(User user) {
1818
int id = insertGeneratedId(user);
1919
user.setId(id);
2020
} else {
21-
insertWitId(user);
21+
insertWithId(user);
2222
}
2323
return user;
2424
}
@@ -38,7 +38,7 @@ public int getSeqAndSkip(int step) {
3838
abstract int insertGeneratedId(@BindBean User user);
3939

4040
@SqlUpdate("INSERT INTO users (id, full_name, email, flag, city_ref) VALUES (:id, :fullName, :email, CAST(:flag AS USER_FLAG), :cityRef) ")
41-
abstract void insertWitId(@BindBean User user);
41+
abstract void insertWithId(@BindBean User user);
4242

4343
@SqlQuery("SELECT * FROM users ORDER BY full_name, email LIMIT :it")
4444
public abstract List<User> getWithLimit(@Bind int limit);
Collapse file

‎persist/src/test/java/ru/javaops/masterjava/persist/UserTestData.java‎

Copy file name to clipboardExpand all lines: persist/src/test/java/ru/javaops/masterjava/persist/UserTestData.java
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class UserTestData {
1616
public static User USER1;
1717
public static User USER2;
1818
public static User USER3;
19-
public static List<User> FIST5_USERS;
19+
public static List<User> FIRST5_USERS;
2020

2121
public static void init() {
2222
CityTestData.init();
@@ -28,14 +28,14 @@ public static void init() {
2828
USER1 = new User("User1", "user1@gmail.com", UserFlag.active, MOSCOW.getRef());
2929
USER2 = new User("User2", "user2@yandex.ru", UserFlag.active, KIEV.getRef());
3030
USER3 = new User("User3", "user3@yandex.ru", UserFlag.active, MINSK.getRef());
31-
FIST5_USERS = ImmutableList.of(ADMIN, DELETED, FULL_NAME, USER1, USER2);
31+
FIRST5_USERS = ImmutableList.of(ADMIN, DELETED, FULL_NAME, USER1, USER2);
3232
}
3333

3434
public static void setUp() {
3535
UserDao dao = DBIProvider.getDao(UserDao.class);
3636
dao.clean();
3737
DBIProvider.getDBI().useTransaction((conn, status) -> {
38-
FIST5_USERS.forEach(dao::insert);
38+
FIRST5_USERS.forEach(dao::insert);
3939
dao.insert(USER3);
4040
});
4141
}
Collapse file

‎persist/src/test/java/ru/javaops/masterjava/persist/dao/UserDaoTest.java‎

Copy file name to clipboardExpand all lines: persist/src/test/java/ru/javaops/masterjava/persist/dao/UserDaoTest.java
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import java.util.List;
1111

12-
import static ru.javaops.masterjava.persist.UserTestData.FIST5_USERS;
12+
import static ru.javaops.masterjava.persist.UserTestData.FIRST5_USERS;
1313

1414
public class UserDaoTest extends AbstractDaoTest<UserDao> {
1515

@@ -30,13 +30,13 @@ public void setUp() throws Exception {
3030
@Test
3131
public void getWithLimit() {
3232
List<User> users = dao.getWithLimit(5);
33-
Assert.assertEquals(FIST5_USERS, users);
33+
Assert.assertEquals(FIRST5_USERS, users);
3434
}
3535

3636
@Test
3737
public void insertBatch() throws Exception {
3838
dao.clean();
39-
dao.insertBatch(FIST5_USERS, 3);
39+
dao.insertBatch(FIRST5_USERS, 3);
4040
Assert.assertEquals(5, dao.getWithLimit(100).size());
4141
}
4242

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.