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 <stari...@gmail.com> Authored: Mon Dec 19 15:24:39 2016 +0300 Committer: Nikita Timofeev <stari...@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"); }
