diff --git a/src/test/java/org/jfaster/mango/crud/CustomCrudDaoTest.java b/src/test/java/org/jfaster/mango/crud/CustomCrudDaoTest.java index 0a5b3ab0..d3a4e7e6 100644 --- a/src/test/java/org/jfaster/mango/crud/CustomCrudDaoTest.java +++ b/src/test/java/org/jfaster/mango/crud/CustomCrudDaoTest.java @@ -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 { @@ -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 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(); @@ -133,7 +114,7 @@ public void test6() throws Throwable { } @DB(table = "t_order") - interface CrudOrderDao extends CrudDao { + public interface CrudOrderDao extends CrudDao { CrudOrder getById(String id); diff --git a/src/test/java/org/jfaster/mango/page/PageTest.java b/src/test/java/org/jfaster/mango/page/PageTest.java index 201c46fc..59d4bc7d 100644 --- a/src/test/java/org/jfaster/mango/page/PageTest.java +++ b/src/test/java/org/jfaster/mango/page/PageTest.java @@ -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 @@ -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 pr = dao.findByUserId(userId, Page.of(3, 3)); + assertThat(pr.getData().size(), equalTo(1)); + assertThat(pr.getTotal(), equalTo(10L)); + } + } \ No newline at end of file