Fixed tests to adapt to changing Entity to BaseEntity.

shannah · shannah · commit a60f5b0e6602 · 2021-04-27T13:36:10.000-07:00
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/libraries/Maven__com_codenameone_coderad_common_1_0_2_SNAPSHOT.xml b/.idea/libraries/Maven__com_codenameone_coderad_common_1_0_2_SNAPSHOT.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>com.codenameone</groupId>
   <artifactId>coderad-annotations</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
 
   <name>coderad-annotations</name>
   <!-- FIXME change it to the project's website -->
diff --git a/common/coderad-common.iml b/common/coderad-common.iml
@@ -12,11 +12,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.codenameone:coderad-annotations:1.0.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.codenameone:coderad-annotation-processor:1.0.2-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.codenameone:codenameone-core:7.0.24-SNAPSHOT" level="project" />
-    <orderEntry type="module" module-name="annotations" />
-    <orderEntry type="module" module-name="coderad-annotation-processor" scope="PROVIDED" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup:javapoet:1.13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.codenameone:coderad-annotations:2.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.codenameone:coderad-annotation-processor:2.0-SNAPSHOT" level="project" />
   </component>
 </module>
diff --git a/tests/common/coderad-tests-common.iml b/tests/common/coderad-tests-common.iml
@@ -20,7 +20,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.codenameone:codenameone-javase:7.0.22" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.xerial:sqlite-jdbc:3.7.15-M1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
-    <orderEntry type="module" module-name="coderad-common" />
+    <orderEntry type="library" name="Maven: com.codenameone:coderad-common:1.0.2-SNAPSHOT" level="project" />
     <orderEntry type="module" module-name="coderad-annotation-processor" />
     <orderEntry type="module" module-name="annotations" />
     <orderEntry type="library" name="Maven: com.squareup:javapoet:1.13.0" level="project" />
diff --git a/tests/common/src/main/java/com/codename1/rad/tests/EntityListTest.java b/tests/common/src/main/java/com/codename1/rad/tests/EntityListTest.java
@@ -5,6 +5,7 @@
  */
 package com.codename1.rad.tests;
 
+import com.codename1.rad.models.BaseEntity;
 import com.codename1.rad.models.Entity;
 import com.codename1.rad.models.EntityList;
 import com.codename1.rad.models.EntityList.EntityAddedEvent;
@@ -46,9 +47,9 @@ public boolean runTest() throws Exception {
     private void testGenericList() throws Exception {
         EntityList list = new EntityList();
         assertEqual(0, list.size());
-        list.add(new Entity());
-        list.add(new Entity());
-        list.add(new Entity());
+        list.add(new BaseEntity());
+        list.add(new BaseEntity());
+        list.add(new BaseEntity());
         assertEqual(3, list.size());
         Entity firstEntity = list.get(0);
         assertNotNull(firstEntity);
@@ -73,7 +74,7 @@ class Stats {
         assertEqual(stats.counter, 1);
         list.notifyObservers();
         assertEqual(1, stats.counter);
-        list.add(new Entity());
+        list.add(new BaseEntity());
         assertEqual(1, stats.counter);
         list.notifyObservers();
         assertEqual(2, stats.counter);
@@ -105,9 +106,9 @@ class Stats {
     
     private void testTransactions() throws Exception {
         EntityList el = new EntityList();
-        Entity bob = new Entity();
-        Entity gary = new Entity();
-        Entity june = new Entity();
+        Entity bob = new BaseEntity();
+        Entity gary = new BaseEntity();
+        Entity june = new BaseEntity();
         
         class Stats {
             private Object data;
diff --git a/tests/common/src/main/java/com/codename1/rad/tests/EntityListViewTest.java b/tests/common/src/main/java/com/codename1/rad/tests/EntityListViewTest.java
@@ -5,8 +5,11 @@
  */
 package com.codename1.rad.tests;
 
+import com.codename1.rad.models.BaseEntity;
 import com.codename1.rad.models.Entity;
-import static com.codename1.rad.models.Entity.entityTypeBuilder;
+
+import static com.codename1.rad.models.BaseEntity.entityTypeBuilder;
+
 import com.codename1.rad.models.EntityList;
 import com.codename1.rad.models.EntityType;
 import com.codename1.rad.schemas.Thing;
@@ -96,7 +99,7 @@ protected List createInternalList() {
             
         };
         
-        class Person extends Entity {}
+        class Person extends BaseEntity {}
         entityTypeBuilder(Person.class)
                 .string(Thing.name)
                 .factory(cls -> {return new Person();})
diff --git a/tests/common/src/main/java/com/codename1/rad/tests/EntityTests.java b/tests/common/src/main/java/com/codename1/rad/tests/EntityTests.java
@@ -5,12 +5,10 @@
  */
 package com.codename1.rad.tests;
 
-import com.codename1.rad.models.Entity;
-import com.codename1.rad.models.EntityType;
+import com.codename1.rad.models.*;
+
 import static com.codename1.rad.models.EntityType.tags;
-import com.codename1.rad.models.EntityTypeBuilder;
-import com.codename1.rad.models.Property;
-import com.codename1.rad.models.StringProperty;
+
 import com.codename1.rad.schemas.ChatMessage;
 import com.codename1.rad.schemas.Comment;
 import com.codename1.rad.schemas.Person;
@@ -47,7 +45,7 @@ public boolean runTest() throws Exception {
     }
     
     private void gettersAndSettersTest() throws Exception {
-        class MyProduct extends Entity {}
+        class MyProduct extends BaseEntity {}
         EntityType productType = new EntityTypeBuilder()
                 .string(Thing.name)
                 .Double(Product.width)
@@ -154,7 +152,7 @@ private void testChatMessageEntities() throws Exception {
 
 
 
-class ChatAccount extends Entity {
+class ChatAccount extends BaseEntity {
     
     // The name property
     public static StringProperty name, thumbnailUrl, phone;
@@ -176,7 +174,7 @@ public ChatAccount(String nm, String thumb, String phoneNum) {
     
 }
 
-class ChatMessageModel extends Entity {
+class ChatMessageModel extends BaseEntity {
     public static final EntityType TYPE = new EntityType(){{
         string(ChatMessage.text);
         date(ChatMessage.datePublished);
diff --git a/tests/common/src/main/java/com/codename1/rad/tests/EntityTypeTests.java b/tests/common/src/main/java/com/codename1/rad/tests/EntityTypeTests.java
@@ -5,10 +5,7 @@
  */
 package com.codename1.rad.tests;
 
-import com.codename1.rad.models.Entity;
-import com.codename1.rad.models.EntityList;
-import com.codename1.rad.models.EntityType;
-import com.codename1.rad.models.EntityTypeBuilder;
+import com.codename1.rad.models.*;
 
 import com.codename1.rad.schemas.Thing;
 import com.codename1.testing.AbstractTest;
@@ -44,7 +41,7 @@ private void testCreateInstance() throws Exception {
         EntityType personType = new EntityTypeBuilder()
                 .string(Thing.name)
                 .build();
-        class Person extends Entity {
+        class Person extends BaseEntity {
             {
                 setEntityType(personType);
             }
@@ -78,7 +75,7 @@ class People extends EntityList<Person>{}
         
     }
     
-    public static class StaticPerson extends Entity {
+    public static class StaticPerson extends BaseEntity {
         
     }
     static {
diff --git a/tests/common/src/main/java/com/codename1/rad/tests/PropertySelectorTest.java b/tests/common/src/main/java/com/codename1/rad/tests/PropertySelectorTest.java
@@ -6,13 +6,10 @@
 package com.codename1.rad.tests;
 
 import com.codename1.rad.io.ResultParser;
-import com.codename1.rad.models.Entity;
-import com.codename1.rad.models.EntityList;
-import com.codename1.rad.models.EntityType;
-import com.codename1.rad.models.EntityTypeBuilder;
-import com.codename1.rad.models.PropertySelector;
+import com.codename1.rad.models.*;
+
 import static com.codename1.rad.models.PropertySelector.propertySelector;
-import com.codename1.rad.models.Tag;
+
 import com.codename1.rad.schemas.Thing;
 import com.codename1.testing.AbstractTest;
 
@@ -169,7 +166,7 @@ private void manualExampleTest() throws Exception {
             .string(Thing.name)
             .string(Thing.description)
             .build();
-        class Book extends Entity {}
+        class Book extends BaseEntity {}
         EntityType.register(Book.class, bookType, cls->{return new Book();});
         class Books extends EntityList<Book> {}
         EntityType.registerList(Books.class, Book.class, cls->{return new Books();});
@@ -180,7 +177,7 @@ class Books extends EntityList<Book> {}
         EntityType catalogType = new EntityTypeBuilder()
             .list(Books.class, BOOKS)
             .build();
-        class Catalog extends Entity {{setEntityType(catalogType);}}
+        class Catalog extends BaseEntity {{setEntityType(catalogType);}}
         EntityType.register(Catalog.class, cls->{return new Catalog();});
        
         
diff --git a/tests/common/src/main/java/com/codename1/rad/tests/ResultParserTest.java b/tests/common/src/main/java/com/codename1/rad/tests/ResultParserTest.java
@@ -8,17 +8,15 @@
 import com.codename1.io.Log;
 import com.codename1.l10n.ParseException;
 import com.codename1.l10n.SimpleDateFormat;
+import com.codename1.rad.models.*;
 import com.codename1.rad.processing.Result;
 import com.codename1.rad.io.ResultParser;
 import com.codename1.rad.io.ResultParser.PropertyParserCallback;
 import static com.codename1.rad.io.ResultParser.resultParser;
 import com.codename1.rad.io.ParsingService;
-import com.codename1.rad.models.Entity;
-import static com.codename1.rad.models.Entity.entityTypeBuilder;
-import com.codename1.rad.models.EntityList;
-import com.codename1.rad.models.EntityType;
-import com.codename1.rad.models.EntityTypeBuilder;
-import com.codename1.rad.models.Tag;
+
+import static com.codename1.rad.models.BaseEntity.entityTypeBuilder;
+
 import com.codename1.rad.schemas.Person;
 import com.codename1.rad.schemas.Product;
 import com.codename1.rad.schemas.Thing;
@@ -242,7 +240,7 @@ private void dateFormatXMLAttsTest() throws Exception {
                 .build();
         
         
-        public static class PersonModel extends Entity {
+        public static class PersonModel extends BaseEntity {
             
             {
                 setEntityType(personType);
@@ -257,7 +255,7 @@ public static class People extends EntityList<PersonModel> {
             }
         }
         
-        public static class PublicationModel extends Entity {
+        public static class PublicationModel extends BaseEntity {
             {
                 setEntityType(publicationType);
             }
@@ -592,7 +590,7 @@ private void manualExampleTest() throws Exception {
             .string(Thing.name)
             .string(Thing.description)
             .build();
-        class Book extends Entity {}
+        class Book extends BaseEntity {}
         EntityType.register(Book.class, bookType, cls->{return new Book();});
         class Books extends EntityList<Book> {}
         EntityType.registerList(Books.class, Book.class, cls->{return new Books();});
@@ -603,7 +601,7 @@ class Books extends EntityList<Book> {}
         EntityType catalogType = new EntityTypeBuilder()
             .list(Books.class, BOOKS)
             .build();
-        class Catalog extends Entity {{setEntityType(catalogType);}}
+        class Catalog extends BaseEntity {{setEntityType(catalogType);}}
         EntityType.register(Catalog.class, cls->{return new Catalog();});
        
         
@@ -687,7 +685,7 @@ private void manualJSONTest() throws Exception {
             "  ]\n" +
             "}";
         
-        class Color extends Entity {}
+        class Color extends BaseEntity {}
         Tag type = new Tag("type");
         Tag red = new Tag("red"), green = new Tag("green"), blue = new Tag("blue"), alpha = new Tag("alpha");
         EntityType colorType = entityTypeBuilder(Color.class)
@@ -704,7 +702,7 @@ class Colors extends EntityList<Color>{}
         EntityType.registerList(Colors.class, Color.class, cls -> {return new Colors();});
         
         Tag colors = new Tag("colors");
-        class ColorSet extends Entity {}
+        class ColorSet extends BaseEntity {}
         EntityType colorsetType = entityTypeBuilder(ColorSet.class)
                 .list(Colors.class, colors)
                 .factory(cls -> {return new ColorSet();})
@@ -863,7 +861,7 @@ private void parserServiceTest() throws Exception {
             "  ]\n" +
             "}";
         
-        class Color extends Entity {}
+        class Color extends BaseEntity {}
         Tag type = new Tag("type");
         Tag red = new Tag("red"), green = new Tag("green"), blue = new Tag("blue"), alpha = new Tag("alpha");
         EntityType colorType = entityTypeBuilder(Color.class)
@@ -880,7 +878,7 @@ class Colors extends EntityList<Color>{}
         EntityType.registerList(Colors.class, Color.class, cls -> {return new Colors();});
         
         Tag colors = new Tag("colors");
-        class ColorSet extends Entity {}
+        class ColorSet extends BaseEntity {}
         EntityType colorsetType = entityTypeBuilder(ColorSet.class)
                 .list(Colors.class, colors)
                 .factory(cls -> {return new ColorSet();})
diff --git a/tests/common/src/test/java/com/codename1/rad/tests/EntityListTest.java b/tests/common/src/test/java/com/codename1/rad/tests/EntityListTest.java
@@ -4,6 +4,7 @@
  * and open the template in the editor.
  */
 package com.codename1.rad.tests;
+import com.codename1.rad.models.BaseEntity;
 import com.codename1.rad.models.Entity;
 import com.codename1.rad.models.EntityList;
 import com.codename1.rad.models.EntityType;
@@ -17,7 +18,7 @@
  */
 public class EntityListTest extends AbstractTest {
     
-    static class MyEntity extends Entity {
+    static class MyEntity extends BaseEntity {
         public static final EntityType TYPE = new EntityType(){{
             date(ChatMessage.dateCreated);
         }};
diff --git a/tests/common/src/test/java/com/codename1/rad/tests/EntityTest.java b/tests/common/src/test/java/com/codename1/rad/tests/EntityTest.java
@@ -4,6 +4,7 @@
  * and open the template in the editor.
  */
 package com.codename1.rad.tests;
+import com.codename1.rad.models.BaseEntity;
 import com.codename1.rad.models.Entity;
 import com.codename1.rad.models.EntityType;
 import com.codename1.rad.schemas.ChatMessage;
@@ -15,7 +16,7 @@
  */
 public class EntityTest extends AbstractTest {
     
-    static class MyEntity extends Entity {
+    static class MyEntity extends BaseEntity {
         public static final EntityType TYPE = new EntityType(){{
             date(ChatMessage.dateCreated);
         }};
diff --git a/tests/javase/coderad-tests-javase.iml b/tests/javase/coderad-tests-javase.iml
@@ -22,7 +22,7 @@
     <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.15-M1" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
     <orderEntry type="module" module-name="coderad-tests-common" />
-    <orderEntry type="module" module-name="coderad-common" />
+    <orderEntry type="library" name="Maven: com.codenameone:coderad-common:1.0.2-SNAPSHOT" level="project" />
     <orderEntry type="module" module-name="coderad-tests-common" scope="TEST" production-on-test="" />
     <orderEntry type="module" module-name="coderad-annotation-processor" />
     <orderEntry type="module" module-name="annotations" />

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`	`package com.codename1.rad.tests;`
`7`	`7`
`8`		`-import com.codename1.rad.models.Entity;`
`9`		`-import com.codename1.rad.models.EntityList;`
`10`		`-import com.codename1.rad.models.EntityType;`
`11`		`-import com.codename1.rad.models.EntityTypeBuilder;`
	`8`	`+import com.codename1.rad.models.*;`
`12`	`9`
`13`	`10`	`import com.codename1.rad.schemas.Thing;`
`14`	`11`	`import com.codename1.testing.AbstractTest;`
`@@ -44,7 +41,7 @@ private void testCreateInstance() throws Exception {`
`44`	`41`	`EntityType personType = new EntityTypeBuilder()`
`45`	`42`	`.string(Thing.name)`
`46`	`43`	`.build();`
`47`		`- class Person extends Entity {`
	`44`	`+ class Person extends BaseEntity {`
`48`	`45`	`{`
`49`	`46`	`setEntityType(personType);`
`50`	`47`	`}`
`@@ -78,7 +75,7 @@ class People extends EntityList<Person>{}`
`78`	`75`
`79`	`76`	`}`
`80`	`77`
`81`		`- public static class StaticPerson extends Entity {`
	`78`	`+ public static class StaticPerson extends BaseEntity {`
`82`	`79`
`83`	`80`	`}`
`84`	`81`	`static {`