DaoTestAnnotation fixes

greenrobot · Aug 3, 2016 · a6192e6 · a6192e6
1 parent f16e772
commit a6192e6
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 14 deletions.
diff --git a/tests/DaoTestEntityAnnotation/build.gradle b/tests/DaoTestEntityAnnotation/build.gradle
@@ -40,6 +40,7 @@ android {
 
 greendao {
     schemaVersion 1000
+    generateTests true
 }
 
 dependencies {

diff --git a/...o/entityannotation/CustomerOrderTest.java → ...t/entityannotation/CustomerOrderTest.java b/...o/entityannotation/CustomerOrderTest.java → ...t/entityannotation/CustomerOrderTest.java
@@ -1,4 +1,4 @@
-package org.greenrobot.greendao.entityannotation;
+package org.greenrobot.greendao.test.entityannotation;
 
 import org.greenrobot.greendao.test.AbstractDaoSessionTest;
 

diff --git a/...tion/src/androidTest/Java/org/greenrobot/greendao/test/entityannotation/CustomerTest.java b/...tion/src/androidTest/Java/org/greenrobot/greendao/test/entityannotation/CustomerTest.java
@@ -0,0 +1,22 @@
+package org.greenrobot.greendao.test.entityannotation;
+
+import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+public class CustomerTest extends AbstractDaoTestLongPk<CustomerDao, Customer> {
+    private AtomicLong nameNumber = new AtomicLong();
+
+    public CustomerTest() {
+        super(CustomerDao.class);
+    }
+
+    @Override
+    protected Customer createEntity(Long key) {
+        Customer entity = new Customer();
+        entity.setId(key);
+        entity.setName("Ho " + nameNumber.incrementAndGet());
+        return entity;
+    }
+
+}
diff --git a/...t/greendao/entityannotation/NoteTest.java → ...endao/test/entityannotation/NoteTest.java b/...t/greendao/entityannotation/NoteTest.java → ...endao/test/entityannotation/NoteTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenrobot.greendao.entityannotation;
+package org.greenrobot.greendao.test.entityannotation;
 
 import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
 

diff --git a/...otation/src/androidTest/Java/org/greenrobot/greendao/test/entityannotation/OrderTest.java b/...otation/src/androidTest/Java/org/greenrobot/greendao/test/entityannotation/OrderTest.java
@@ -0,0 +1,19 @@
+package org.greenrobot.greendao.test.entityannotation;
+
+import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
+
+public class OrderTest extends AbstractDaoTestLongPk<OrderDao, Order> {
+
+    public OrderTest() {
+        super(OrderDao.class);
+    }
+
+    @Override
+    protected Order createEntity(Long key) {
+        Order entity = new Order();
+        entity.setId(key);
+        entity.setCustomerId(1);
+        return entity;
+    }
+
+}
diff --git a/...TestEntityAnnotation/src/main/java/org/greenrobot/greendao/entityannotation/NoteType.java b/...TestEntityAnnotation/src/main/java/org/greenrobot/greendao/entityannotation/NoteType.java
diff --git a/...nrobot/greendao/entityannotation/App.java → ...t/greendao/test/entityannotation/App.java b/...nrobot/greendao/entityannotation/App.java → ...t/greendao/test/entityannotation/App.java
@@ -1,9 +1,9 @@
-package org.greenrobot.greendao.entityannotation;
+package org.greenrobot.greendao.test.entityannotation;
 
 import android.app.Application;
 
 import org.greenrobot.greendao.database.Database;
-import org.greenrobot.greendao.entityannotation.DaoMaster.DevOpenHelper;
+import org.greenrobot.greendao.test.entityannotation.DaoMaster.DevOpenHelper;
 
 public class App extends Application {
     private DaoSession daoSession;

diff --git a/...t/greendao/entityannotation/Customer.java → ...endao/test/entityannotation/Customer.java b/...t/greendao/entityannotation/Customer.java → ...endao/test/entityannotation/Customer.java
@@ -1,4 +1,4 @@
-package org.greenrobot.greendao.entityannotation;
+package org.greenrobot.greendao.test.entityannotation;
 
 import org.greenrobot.greendao.DaoException;
 import org.greenrobot.greendao.annotation.Entity;

diff --git a/...robot/greendao/entityannotation/Note.java → .../greendao/test/entityannotation/Note.java b/...robot/greendao/entityannotation/Note.java → .../greendao/test/entityannotation/Note.java
@@ -1,4 +1,4 @@
-package org.greenrobot.greendao.entityannotation;
+package org.greenrobot.greendao.test.entityannotation;
 
 import org.greenrobot.greendao.annotation.Convert;
 import org.greenrobot.greendao.annotation.Entity;
@@ -36,7 +36,7 @@ public Note(Long id) {
         this.id = id;
     }
 
-    @Generated(hash = 1686394253)
+    @Generated(hash = 59778150)
     public Note(Long id, @NotNull String text, String comment, Date date, NoteType type) {
         this.id = id;
         this.text = text;

diff --git a/...ntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/NoteType.java b/...ntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/NoteType.java
@@ -0,0 +1,5 @@
+package org.greenrobot.greendao.test.entityannotation;
+
+public enum NoteType {
+    TEXT, LIST, PICTURE
+}
diff --git a/...o/entityannotation/NoteTypeConverter.java → ...t/entityannotation/NoteTypeConverter.java b/...o/entityannotation/NoteTypeConverter.java → ...t/entityannotation/NoteTypeConverter.java
@@ -1,4 +1,4 @@
-package org.greenrobot.greendao.entityannotation;
+package org.greenrobot.greendao.test.entityannotation;
 
 import org.greenrobot.greendao.converter.PropertyConverter;
 

diff --git a/...obot/greendao/entityannotation/Order.java → ...greendao/test/entityannotation/Order.java b/...obot/greendao/entityannotation/Order.java → ...greendao/test/entityannotation/Order.java
@@ -1,4 +1,4 @@
-package org.greenrobot.greendao.entityannotation;
+package org.greenrobot.greendao.test.entityannotation;
 
 import org.greenrobot.greendao.DaoException;
 import org.greenrobot.greendao.annotation.Entity;