You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/12/19 12:38:39 UTC
[1/3] cayenne git commit: Fix integration test after merging pull
requests
Repository: cayenne
Updated Branches:
refs/heads/master 437bc348e -> 1fd28cb46
Fix integration test after merging pull requests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d9f916b0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d9f916b0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d9f916b0
Branch: refs/heads/master
Commit: d9f916b0167769a56e48637ddbaa5e1b12567688
Parents: 437bc34
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Dec 19 15:23:44 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Dec 19 15:23:44 2016 +0300
----------------------------------------------------------------------
.../cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d9f916b0/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
index 95c3495..d68faf1 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
@@ -38,7 +38,6 @@
<obj-attribute name="addrstr" type="java.lang.String" db-attribute-path="ADDRSTR"/>
</obj-entity>
<obj-entity name="Child" className="Child" dbEntityName="CHILD">
- <obj-attribute name="addressId" type="java.lang.Integer" db-attribute-path="ADDRESS_ID"/>
<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/>
<obj-attribute name="name" type="java.lang.String"/>
</obj-entity>
[3/3] cayenne git commit: Merge branch '164'
Posted by sk...@apache.org.
Merge branch '164'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1fd28cb4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1fd28cb4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1fd28cb4
Branch: refs/heads/master
Commit: 1fd28cb468c3ba982f5cca6c8b95c07b14c2a170
Parents: 437bc34 d8106a4
Author: Savva Kolbachev <s....@gmail.com>
Authored: Mon Dec 19 15:38:27 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Mon Dec 19 15:38:27 2016 +0300
----------------------------------------------------------------------
.../src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java | 2 --
.../cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result | 1 -
2 files changed, 3 deletions(-)
----------------------------------------------------------------------
[2/3] cayenne git commit: Fix integration test after merging pull
requests
Posted by sk...@apache.org.
Fix integration test after merging pull requests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d8106a46
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d8106a46
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d8106a46
Branch: refs/heads/master
Commit: d8106a46f1cbbbc195f7eb21853112aa47cf206d
Parents: d9f916b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Dec 19 15:24:39 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Dec 19 15:24:39 2016 +0300
----------------------------------------------------------------------
.../src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d8106a46/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
index 111199b..b9dbcb2 100644
--- a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
+++ b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
@@ -209,8 +209,6 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
@Test
public void testComplexChangeOrder() throws Exception {
- // after applying fix for CAY-2174 addressId should no longer be in CHILD table so this test will fail
- // to fix it just remove "addressId" ObjAttribute in testComplexChangeOrder.map.xml-result
test("testComplexChangeOrder");
}