Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(CustomCrudDaoTest, PageTest): move method #69

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor(CustomCrudDaoTest, PageTest): move method #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions src/test/java/org/jfaster/mango/crud/CustomCrudDaoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
public class CustomCrudDaoTest {

private final static DataSource ds = DataSourceConfig.getDataSource();
private final static Mango mango = Mango.newInstance(ds);
public final static Mango mango = Mango.newInstance(ds);

@Before
public void before() throws Exception {
Expand Down Expand Up @@ -74,25 +74,6 @@ public void test() throws Exception {
assertThat(dao.countByUserId(userId), equalTo(0));
}

@Test
public void testPage() throws Exception {
CrudOrderDao dao = mango.create(CrudOrderDao.class);
int userId = 2;
for (int i = 0; i < 10; i++) {
CrudOrder order = CrudOrder.createRandomCrudOrder(userId);
dao.add(order);
}
assertThat(dao.getByUserId(userId, Page.of(0, 3)).size(), equalTo(3));

assertThat(dao.getByUserId(userId, Page.of(1, 3)).size(), equalTo(3));

assertThat(dao.getByUserId(userId, Page.of(2, 3)).size(), equalTo(3));

PageResult<CrudOrder> pr = dao.findByUserId(userId, Page.of(3, 3));
assertThat(pr.getData().size(), equalTo(1));
assertThat(pr.getTotal(), equalTo(10L));
}

@Rule
public ExpectedException thrown = ExpectedException.none();

Expand Down Expand Up @@ -133,7 +114,7 @@ public void test6() throws Throwable {
}

@DB(table = "t_order")
interface CrudOrderDao extends CrudDao<CrudOrder, String> {
public interface CrudOrderDao extends CrudDao<CrudOrder, String> {

CrudOrder getById(String id);

Expand Down
23 changes: 23 additions & 0 deletions src/test/java/org/jfaster/mango/page/PageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@

package org.jfaster.mango.page;

import org.jfaster.mango.crud.CrudOrder;
import org.jfaster.mango.crud.CustomCrudDaoTest;
import org.junit.Test;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.jfaster.mango.crud.CustomCrudDaoTest.mango;

/**
* @author ash
Expand All @@ -39,4 +43,23 @@ public void create() throws Exception {

}

@Test
public void testPage() throws Exception {
CustomCrudDaoTest.CrudOrderDao dao = mango.create(CustomCrudDaoTest.CrudOrderDao.class);
int userId = 2;
for (int i = 0; i < 10; i++) {
CrudOrder order = CrudOrder.createRandomCrudOrder(userId);
dao.add(order);
}
assertThat(dao.getByUserId(userId, Page.of(0, 3)).size(), equalTo(3));

assertThat(dao.getByUserId(userId, Page.of(1, 3)).size(), equalTo(3));

assertThat(dao.getByUserId(userId, Page.of(2, 3)).size(), equalTo(3));

PageResult<CrudOrder> pr = dao.findByUserId(userId, Page.of(3, 3));
assertThat(pr.getData().size(), equalTo(1));
assertThat(pr.getTotal(), equalTo(10L));
}

}