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 2018/12/29 08:55:49 UTC
cayenne git commit: CAY-2467 New type-aware Property API - fix tests
Repository: cayenne
Updated Branches:
refs/heads/master 27096f1b2 -> 2707ee810
CAY-2467 New type-aware Property API
- fix tests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2707ee81
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2707ee81
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2707ee81
Branch: refs/heads/master
Commit: 2707ee81094c80c82325eda624fcc2f0be219751
Parents: 27096f1
Author: Nikita Timofeev <st...@gmail.com>
Authored: Sat Dec 29 11:55:44 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Sat Dec 29 11:55:44 2018 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/tools/CayenneGeneratorTaskTest.java | 8 +++++---
.../test/java/org/apache/cayenne/gen/PropertyUtilsTest.java | 6 +++---
.../cayenne/tools/CayenneGeneratorIntegrationTest.java | 8 +++++---
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2707ee81/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java b/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
index 1879cfd..a9de296 100644
--- a/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
+++ b/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
@@ -270,7 +270,7 @@ public class CayenneGeneratorTaskTest {
File _e = new File(mapDir, convertPath("org/apache/cayenne/testdo/embeddable/auto/_Embeddable1.java"));
assertTrue(_e.exists());
- assertContents(_e, "_Embeddable1", "org.apache.cayenne.testdo.embeddable.auto", "Object");
+ assertContents(_e, "_Embeddable1", "org.apache.cayenne.testdo.embeddable.auto", null);
}
private String convertPath(String unixPath) {
@@ -306,8 +306,10 @@ public class CayenneGeneratorTaskTest {
while ((s = in.readLine()) != null) {
if (classPattern.matcher(s).find()) {
assertTrue(s.indexOf(className) > 0);
- assertTrue(s.indexOf(extendsName) > 0);
- assertTrue(s.indexOf(className) < s.indexOf(extendsName));
+ if(extendsName != null) {
+ assertTrue(s.indexOf(extendsName) > 0);
+ assertTrue(s.indexOf(className) < s.indexOf(extendsName));
+ }
return;
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2707ee81/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
----------------------------------------------------------------------
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
index 84cfc1a..96e19de 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
@@ -56,7 +56,7 @@ public class PropertyUtilsTest {
}
@Test
- public void testImportAttribute() {
+ public void testImportAttribute() throws Exception {
ObjAttribute attribute = new ObjAttribute();
attribute.setName("test");
attribute.setType(java.util.Date.class.getName());
@@ -99,7 +99,7 @@ public class PropertyUtilsTest {
}
@Test
- public void simpleNumericDefinition() {
+ public void simpleNumericDefinition() throws Exception {
importUtils.addType(NumericProperty.class.getName());
ObjAttribute attribute = new ObjAttribute();
@@ -112,7 +112,7 @@ public class PropertyUtilsTest {
}
@Test
- public void simpleStringDefinition() {
+ public void simpleStringDefinition() throws Exception {
importUtils.addType(StringProperty.class.getName());
ObjAttribute attribute = new ObjAttribute();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2707ee81/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java b/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
index 2142389..060e5ce 100644
--- a/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
+++ b/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
@@ -127,7 +127,7 @@ public class CayenneGeneratorIntegrationTest {
assertContents("org/apache/cayenne/testdo/embeddable/Embeddable1.java", "Embeddable1",
"org.apache.cayenne.testdo.embeddable", "_Embeddable1");
assertContents("org/apache/cayenne/testdo/embeddable/auto/_Embeddable1.java", "_Embeddable1",
- "org.apache.cayenne.testdo.embeddable.auto", "Object");
+ "org.apache.cayenne.testdo.embeddable.auto", null);
}
private String convertPath(String unixPath) {
@@ -175,8 +175,10 @@ public class CayenneGeneratorIntegrationTest {
while ((s = in.readLine()) != null) {
if (classPattern.matcher(s).find()) {
assertTrue(s.indexOf(className) > 0);
- assertTrue(s.indexOf(extendsName) > 0);
- assertTrue(s.indexOf(className) < s.indexOf(extendsName));
+ if(extendsName != null) {
+ assertTrue(s.indexOf(extendsName) > 0);
+ assertTrue(s.indexOf(className) < s.indexOf(extendsName));
+ }
return;
}
}