fix for LazyList.sublist (fixes greenrobot#146)

curiosities · Jun 30, 2015 · b3858b8 · b3858b8
1 parent 17f3880
commit b3858b8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/DaoCore/src/de/greenrobot/dao/query/LazyList.java b/DaoCore/src/de/greenrobot/dao/query/LazyList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Markus Junginger, greenrobot (http://greenrobot.de)
+ * Copyright (C) 2011-2015 Markus Junginger, greenrobot (http://greenrobot.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -343,7 +343,7 @@ public int size() {
     public List<E> subList(int start, int end) {
         checkCached();
         for (int i = start; i < end; i++) {
-            entities.get(i);
+            get(i);
         }
         return entities.subList(start, end);
     }

diff --git a/DaoTest/src/de/greenrobot/daotest/entity/TestEntityTestBase.java b/DaoTest/src/de/greenrobot/daotest/entity/TestEntityTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Markus Junginger, greenrobot (http://greenrobot.de)
+ * Copyright (C) 2011-2015 Markus Junginger, greenrobot (http://greenrobot.de)
  *
  * This file is part of greenDAO Generator.
  * 
@@ -18,8 +18,8 @@
 package de.greenrobot.daotest.entity;
 
 import java.util.ArrayList;
+import java.util.List;
 
-import de.greenrobot.dao.query.LazyList;
 import de.greenrobot.dao.test.AbstractDaoTest;
 import de.greenrobot.daotest.TestEntity;
 import de.greenrobot.daotest.TestEntityDao;
@@ -57,7 +57,7 @@ protected int getSimpleInteger(int i) {
         return 100 + i;
     }
 
-    protected void assertIds(ArrayList<TestEntity> list, LazyList<TestEntity> list2) {
+    protected void assertIds(List<TestEntity> list, List<TestEntity> list2) {
         for (int i = 0; i < list.size(); i++) {
             TestEntity entity = list.get(i);
             TestEntity lazyEntity = list2.get(i);

diff --git a/DaoTest/src/de/greenrobot/daotest/query/LazyListTest.java b/DaoTest/src/de/greenrobot/daotest/query/LazyListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Markus Junginger, greenrobot (http://greenrobot.de)
+ * Copyright (C) 2011-2015 Markus Junginger, greenrobot (http://greenrobot.de)
  *
  * This file is part of greenDAO Generator.
  * 
@@ -63,6 +63,23 @@ public void testGetAll100Uncached() {
         listLazy.close();
     }
 
+    public void testSublist() {
+        ArrayList<TestEntity> list = insert(10);
+        LazyList<TestEntity> listLazy = dao.queryBuilder().orderAsc(Properties.SimpleInteger).build().listLazy();
+        assertIds(list.subList(2, 7), listLazy.subList(2, 7));
+    }
+
+    public void testSublistUncached() {
+        ArrayList<TestEntity> list = insert(10);
+        LazyList<TestEntity> listLazy = dao.queryBuilder().orderAsc(Properties.SimpleInteger).build().listLazyUncached();
+        try {
+            assertIds(list.subList(2,7), listLazy.subList(2,7));
+        } catch (DaoException e) {
+            assertEquals("This operation only works with cached lazy lists", e.getMessage());
+        }
+
+    }
+
     public void testIterator() {
         ArrayList<TestEntity> list = insert(100);
         LazyList<TestEntity> listLazy = dao.queryBuilder().orderAsc(Properties.SimpleInteger).build().listLazy();