You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/08/17 09:32:12 UTC
[cayenne] branch master updated: Fix tests
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new bfdcbb56d Fix tests
bfdcbb56d is described below
commit bfdcbb56d7ba1fd806c2d1fe4733b45664ae542d
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Aug 17 12:32:05 2022 +0300
Fix tests
---
.../test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java | 4 ++--
.../test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java | 5 +++--
cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java | 5 ++++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java
index 202ee6281..8bb66df2e 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java
@@ -49,7 +49,7 @@ public class SingleClassGenerationTest extends ClassGenerationCase {
String res = renderTemplate(ClassGenerationAction.SINGLE_CLASS_TEMPLATE, context);
assertFalse(res.contains("org.apache.cayenne.exp.property.NumericProperty"));
- assertFalse(res.contains("org.apache.cayenne.exp.property.EntityProperty"));
+ assertFalse(res.contains("org.apache.cayenne.exp.property.ListProperty"));
}
@Test
@@ -70,7 +70,7 @@ public class SingleClassGenerationTest extends ClassGenerationCase {
String res = renderTemplate(ClassGenerationAction.SINGLE_CLASS_TEMPLATE, context);
assertTrue(res.contains("org.apache.cayenne.exp.property.NumericProperty"));
- assertFalse(res.contains("org.apache.cayenne.exp.property.EntityProperty"));
+ assertFalse(res.contains("org.apache.cayenne.exp.property.ListProperty"));
}
@Test
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java
index ca72518b7..295ec3ab7 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java
@@ -20,6 +20,7 @@
package org.apache.cayenne.gen;
import org.apache.cayenne.exp.property.EntityProperty;
+import org.apache.cayenne.exp.property.ListProperty;
import org.apache.cayenne.exp.property.NumericProperty;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
@@ -51,7 +52,7 @@ public class SuperClassGenerationTest extends ClassGenerationCase {
String res = renderTemplate(ClassGenerationAction.SUPERCLASS_TEMPLATE, context);
assertFalse(res.contains(NumericProperty.class.getName()));
- assertFalse(res.contains(EntityProperty.class.getName()));
+ assertFalse(res.contains(ListProperty.class.getName()));
}
@Test
@@ -72,7 +73,7 @@ public class SuperClassGenerationTest extends ClassGenerationCase {
String res = renderTemplate(ClassGenerationAction.SUPERCLASS_TEMPLATE, context);
assertTrue(res.contains(NumericProperty.class.getName()));
- assertFalse(res.contains(EntityProperty.class.getName()));
+ assertFalse(res.contains(ListProperty.class.getName()));
}
@Test
diff --git a/cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java b/cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java
index 83d68ff67..472967583 100644
--- a/cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java
+++ b/cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java
@@ -5,6 +5,9 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.apache.cayenne.BaseDataObject;
+import org.apache.cayenne.exp.property.EntityProperty;
+import org.apache.cayenne.exp.property.PropertyFactory;
+import test.ObjEntity;
/**
* Class _ObjEntity was generated by Cayenne.
@@ -16,7 +19,7 @@ public abstract class _ObjEntity extends BaseDataObject {
private static final long serialVersionUID = 1L;
-
+ public static final EntityProperty<ObjEntity> SELF = PropertyFactory.createSelf(ObjEntity.class);