Fix failing tests + cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/93e1c8c1 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/93e1c8c1 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/93e1c8c1 Branch: refs/heads/STABLE-3.1 Commit: 93e1c8c107116da3740a8dab51ad125dbc792c71 Parents: 8933c79 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Nov 10 19:05:39 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Nov 10 19:05:39 2017 +0300 ---------------------------------------------------------------------- .../access/DataContextEJBQLInheritanceTest.java | 9 +++++-- ...ataContextObjectIdQuery_PolymorphicTest.java | 27 +++++++++++++++++++- .../modeler/cayennemodeler-strings.properties | 2 +- rat.sh | 3 ++- 4 files changed, 36 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/93e1c8c1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java index d43abb6..b709b7c 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java @@ -43,8 +43,6 @@ public class DataContextEJBQLInheritanceTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PERSON"); - TableHelper person = new TableHelper(dbHelper, "PERSON"); person.setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY") .setColumnTypes( @@ -53,6 +51,13 @@ public class DataContextEJBQLInheritanceTest extends ServerCase { Types.CHAR, Types.FLOAT); + person.update().set("DEPARTMENT_ID", null, Types.INTEGER).execute(); + dbHelper.deleteAll("ADDRESS"); + dbHelper.deleteAll("DEPARTMENT"); + dbHelper.deleteAll("PERSON_NOTES"); + dbHelper.deleteAll("PERSON"); + dbHelper.deleteAll("CLIENT_COMPANY"); + person.insert(1, "a", "EE", 20000); person.insert(2, "b", "EE", 25000); person.insert(4, "c", "EM", 30000); http://git-wip-us.apache.org/repos/asf/cayenne/blob/93e1c8c1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java index e656b7d..99f3cfb 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicTest.java @@ -1,3 +1,22 @@ +/***************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + ****************************************************************/ + package org.apache.cayenne.access; import org.apache.cayenne.Cayenne; @@ -36,9 +55,15 @@ public class DataContextObjectIdQuery_PolymorphicTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PERSON"); tPerson = new TableHelper(dbHelper, "PERSON").setColumns("PERSON_ID", "NAME", "PERSON_TYPE") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); + + tPerson.update().set("DEPARTMENT_ID", null, Types.INTEGER).execute(); + dbHelper.deleteAll("ADDRESS"); + dbHelper.deleteAll("DEPARTMENT"); + dbHelper.deleteAll("PERSON_NOTES"); + dbHelper.deleteAll("PERSON"); + dbHelper.deleteAll("CLIENT_COMPANY"); } public void testPolymorphicSharedCache() throws SQLException { http://git-wip-us.apache.org/repos/asf/cayenne/blob/93e1c8c1/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties index 3ac1d27..de6e56a 100644 --- a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties +++ b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties @@ -17,7 +17,7 @@ cayenne.bugreport.url = http://issues.apache.org/jira/browse/CAY -cayenne.modeler.about.info = (c) 2001-2016 Apache Software Foundation and individual authors.\ +cayenne.modeler.about.info = (c) 2001-2017 Apache Software Foundation and individual authors.\ <br><br>http://cayenne.apache.org/<br> http://git-wip-us.apache.org/repos/asf/cayenne/blob/93e1c8c1/rat.sh ---------------------------------------------------------------------- diff --git a/rat.sh b/rat.sh index 648efbc..092d823 100755 --- a/rat.sh +++ b/rat.sh @@ -63,6 +63,7 @@ java -jar $RAT -d $DIR \ -e 'CLOVER.txt' \ -e '*.html' \ -e '*.css' \ - -e 'derby.log' + -e 'derby.log' \ + -e '*.iml'