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 2019/09/12 12:43:21 UTC
[cayenne] 02/02: Cleanup
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit ab7033691683bfcaec61ab5c73d2770791a1bc24
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Sep 12 15:35:27 2019 +0300
Cleanup
---
.../cayenne/access/VerticalInheritanceIT.java | 160 ++++++---------------
.../resources/cayenne-inheritance-vertical.xml | 3 +-
.../test/resources/inheritance-vertical.graph.xml | 41 ++++++
.../test/resources/inheritance-vertical.map.xml | 6 +-
4 files changed, 87 insertions(+), 123 deletions(-)
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
index c8d2077..3e50dc8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.inheritance_vertical.*;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Before;
import org.junit.Test;
import java.sql.SQLException;
@@ -58,12 +59,43 @@ public class VerticalInheritanceIT extends ServerCase {
@Inject
protected ServerRuntime runtime;
- @Test
- public void testInsert_Root() throws Exception {
+ private TableHelper ivRootTable;
+ private TableHelper ivSub1Table;
+ private TableHelper ivSub2Table;
+ private TableHelper ivSub3Table;
+ private TableHelper ivSub1Sub1Table;
+ private TableHelper iv1RootTable;
+ private TableHelper iv1Sub1Table;
+
+
+ @Before
+ public void createTableHelpers() {
+ ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
+ ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes(
+ Types.INTEGER, Types.VARCHAR, Types.VARCHAR);
+
+ ivSub1Table = new TableHelper(dbHelper, "IV_SUB1");
+ ivSub1Table.setColumns("ID", "SUB1_NAME");
+
+ ivSub2Table = new TableHelper(dbHelper, "IV_SUB2");
+ ivSub2Table.setColumns("ID", "SUB2_NAME", "SUB2_ATTR");
+
+ ivSub3Table = new TableHelper(dbHelper, "IV_SUB3");
+ ivSub3Table.setColumns("ID", "IV_ROOT_ID");
+
+ ivSub1Sub1Table = new TableHelper(dbHelper, "IV_SUB1_SUB1");
+ ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME");
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR");
+ iv1RootTable = new TableHelper(dbHelper, "IV1_ROOT");
+ iv1RootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes(
+ Types.INTEGER, Types.VARCHAR, Types.VARCHAR);
+ iv1Sub1Table = new TableHelper(dbHelper, "IV1_SUB1");
+ iv1Sub1Table.setColumns("ID", "SUB1_NAME");
+ }
+
+ @Test
+ public void testInsert_Root() throws Exception {
assertEquals(0, ivRootTable.getRowCount());
IvRoot root = context.newObject(IvRoot.class);
@@ -82,13 +114,6 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testInsert_Sub1() throws Exception {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR");
-
- TableHelper ivSub1Table = new TableHelper(dbHelper, "IV_SUB1");
- ivSub1Table.setColumns("ID", "SUB1_NAME");
-
IvSub1 sub1 = context.newObject(IvSub1.class);
sub1.setName("XyZX");
sub1.getObjectContext().commitChanges();
@@ -131,13 +156,6 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testInsert_Sub2() throws Exception {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR");
-
- TableHelper ivSub2Table = new TableHelper(dbHelper, "IV_SUB2");
- ivSub2Table.setColumns("ID", "SUB2_NAME", "SUB2_ATTR");
-
IvSub2 sub2 = context.newObject(IvSub2.class);
sub2.setName("XyZX");
sub2.getObjectContext().commitChanges();
@@ -201,13 +219,6 @@ public class VerticalInheritanceIT extends ServerCase {
*/
@Test(expected = org.apache.cayenne.validation.ValidationException.class)
public void testValidationOnInsert_Sub3_Exception() {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR");
-
- TableHelper ivSub3Table = new TableHelper(dbHelper, "IV_SUB3");
- ivSub3Table.setColumns("ID", "IV_ROOT_ID");
-
IvSub3 sub3 = context.newObject(IvSub3.class);
sub3.setName("XyZX");
context.commitChanges();
@@ -218,13 +229,6 @@ public class VerticalInheritanceIT extends ServerCase {
*/
@Test
public void testValidationOnInsert_Sub3_Ok() throws Exception {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR");
-
- TableHelper ivSub3Table = new TableHelper(dbHelper, "IV_SUB3");
- ivSub3Table.setColumns("ID", "IV_ROOT_ID");
-
IvSub3 sub3 = context.newObject(IvSub3.class);
sub3.setName("XyZX");
sub3.setIvRoot(sub3);
@@ -239,14 +243,10 @@ public class VerticalInheritanceIT extends ServerCase {
*/
@Test
public void testUpdateRelation_Sub3() throws Exception {
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR");
ivRootTable.insert(1, "root1", null);
ivRootTable.insert(2, "root2", null);
ivRootTable.insert(3, "name", "IvSub3");
- TableHelper ivSub3Table = new TableHelper(dbHelper, "IV_SUB3");
- ivSub3Table.setColumns("ID", "IV_ROOT_ID");
ivSub3Table.insert(3, 1);
IvRoot root = SelectById.query(IvRoot.class, 2).selectOne(context);
@@ -272,16 +272,6 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testInsert_Sub1Sub1() throws Exception {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR");
-
- TableHelper ivSub1Table = new TableHelper(dbHelper, "IV_SUB1");
- ivSub1Table.setColumns("ID", "SUB1_NAME");
-
- TableHelper ivSub1Sub1Table = new TableHelper(dbHelper, "IV_SUB1_SUB1");
- ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME");
-
IvSub1Sub1 sub1Sub1 = context.newObject(IvSub1Sub1.class);
sub1Sub1.setName("XyZN");
sub1Sub1.setSub1Name("mDA");
@@ -312,14 +302,6 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testSelectQuery_SuperSub() throws Exception {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes(
- Types.INTEGER, Types.VARCHAR, Types.VARCHAR);
-
- TableHelper ivSub1Table = new TableHelper(dbHelper, "IV_SUB1");
- ivSub1Table.setColumns("ID", "SUB1_NAME");
-
// insert
ivRootTable.insert(1, "xROOT", null);
ivRootTable.insert(2, "xSUB1_ROOT", "IvSub1");
@@ -354,20 +336,6 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testSelectQuery_DeepAndWide() throws Exception {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes(
- Types.INTEGER, Types.VARCHAR, Types.VARCHAR);
-
- TableHelper ivSub1Table = new TableHelper(dbHelper, "IV_SUB1");
- ivSub1Table.setColumns("ID", "SUB1_NAME");
-
- TableHelper ivSub2Table = new TableHelper(dbHelper, "IV_SUB2");
- ivSub2Table.setColumns("ID", "SUB2_NAME");
-
- TableHelper ivSub1Sub1Table = new TableHelper(dbHelper, "IV_SUB1_SUB1");
- ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME");
-
// insert
ivRootTable.insert(1, "xROOT", null);
@@ -379,7 +347,7 @@ public class VerticalInheritanceIT extends ServerCase {
ivSub1Sub1Table.insert(3, "xSUB1_SUB1");
ivRootTable.insert(4, "xROOT_SUB2", "IvSub2");
- ivSub2Table.insert(4, "xSUB2");
+ ivSub2Table.insert(4, "xSUB2", "");
SelectQuery<IvRoot> query = new SelectQuery<>(IvRoot.class);
List<IvRoot> results = context.select(query);
@@ -424,20 +392,6 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testSelectQuery_MiddleLeaf() throws Exception {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes(
- Types.INTEGER, Types.VARCHAR, Types.VARCHAR);
-
- TableHelper ivSub1Table = new TableHelper(dbHelper, "IV_SUB1");
- ivSub1Table.setColumns("ID", "SUB1_NAME");
-
- TableHelper ivSub2Table = new TableHelper(dbHelper, "IV_SUB2");
- ivSub2Table.setColumns("ID", "SUB2_NAME");
-
- TableHelper ivSub1Sub1Table = new TableHelper(dbHelper, "IV_SUB1_SUB1");
- ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME");
-
// insert
ivRootTable.insert(1, "xROOT", null);
@@ -449,7 +403,7 @@ public class VerticalInheritanceIT extends ServerCase {
ivSub1Sub1Table.insert(3, "xSUB1_SUB1");
ivRootTable.insert(4, "xROOT_SUB2", "IvSub2");
- ivSub2Table.insert(4, "xSUB2");
+ ivSub2Table.insert(4, "xSUB2", "");
SelectQuery<IvSub1> query = new SelectQuery<>(IvSub1.class);
List<IvSub1> results = context.select(query);
@@ -483,20 +437,6 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testDelete_Mix() throws Exception {
-
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes(
- Types.INTEGER, Types.VARCHAR, Types.VARCHAR);
-
- TableHelper ivSub1Table = new TableHelper(dbHelper, "IV_SUB1");
- ivSub1Table.setColumns("ID", "SUB1_NAME");
-
- TableHelper ivSub2Table = new TableHelper(dbHelper, "IV_SUB2");
- ivSub2Table.setColumns("ID", "SUB2_NAME");
-
- TableHelper ivSub1Sub1Table = new TableHelper(dbHelper, "IV_SUB1_SUB1");
- ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME");
-
// insert
ivRootTable.insert(1, "xROOT", null);
@@ -508,7 +448,7 @@ public class VerticalInheritanceIT extends ServerCase {
ivSub1Sub1Table.insert(3, "xSUB1_SUB1");
ivRootTable.insert(4, "xROOT_SUB2", "IvSub2");
- ivSub2Table.insert(4, "xSUB2");
+ ivSub2Table.insert(4, "xSUB2", "");
SelectQuery<IvRoot> query = new SelectQuery<>(IvRoot.class);
@@ -542,14 +482,6 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testSelectQuery_AttributeOverrides() throws Exception {
-
- TableHelper iv1RootTable = new TableHelper(dbHelper, "IV1_ROOT");
- iv1RootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes(
- Types.INTEGER, Types.VARCHAR, Types.VARCHAR);
-
- TableHelper iv1Sub1Table = new TableHelper(dbHelper, "IV1_SUB1");
- iv1Sub1Table.setColumns("ID", "SUB1_NAME");
-
// insert
iv1RootTable.insert(1, "xROOT", null);
iv1RootTable.insert(2, "xSUB1_ROOT", "Iv1Sub1");
@@ -724,17 +656,7 @@ public class VerticalInheritanceIT extends ServerCase {
@Test
public void testCountEjbqlQuery() throws Exception {
- TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
- ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR");
-
- TableHelper ivSub1Table = new TableHelper(dbHelper, "IV_SUB1");
- ivSub1Table.setColumns("ID", "SUB1_NAME");
-
- TableHelper ivSub2Table = new TableHelper(dbHelper, "IV_SUB2");
- ivSub2Table.setColumns("ID", "SUB2_ATTR", "SUB2_NAME");
-
// Root, IvSub1, IvSub2
-
ivRootTable.insert(1, "root1", "");
ivRootTable.insert(2, "sub11", "IvSub1");
@@ -742,8 +664,8 @@ public class VerticalInheritanceIT extends ServerCase {
ivRootTable.insert(3, "sub21", "IvSub2");
ivRootTable.insert(4, "sub22", "IvSub2");
- ivSub2Table.insert(3, "attr1", "sub_name2_1");
- ivSub2Table.insert(4, "attr2", "sub_name2_2");
+ ivSub2Table.insert(3, "sub_name2_1", "attr1");
+ ivSub2Table.insert(4, "sub_name2_2", "attr2");
EJBQLQuery query1 = new EJBQLQuery("SELECT COUNT(a) FROM IvRoot a");
assertEquals(Collections.singletonList(4L), context.performQuery(query1));
diff --git a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
index 3118079..ddacd79 100644
--- a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
+++ b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<domain xmlns="http://cayenne.apache.org/schema/10/domain"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/10/domain http://cayenne.apache.org/schema/10/domain.xsd"
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/domain https://cayenne.apache.org/schema/10/domain.xsd"
project-version="10">
<map name="inheritance-vertical"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inheritance-vertical.graph.xml"/>
</domain>
diff --git a/cayenne-server/src/test/resources/inheritance-vertical.graph.xml b/cayenne-server/src/test/resources/inheritance-vertical.graph.xml
new file mode 100644
index 0000000..023c01a
--- /dev/null
+++ b/cayenne-server/src/test/resources/inheritance-vertical.graph.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<graphs xmlns="http://cayenne.apache.org/schema/10/graph">
+ <graph type="ER" scale="0.21970000000000015">
+ <entity name="IV1_SUB1" x="2026.71" y="707.58" width="77.0" height="66.0"/>
+ <entity name="IV_BASE" x="914.9" y="322.39" width="55.0" height="82.0"/>
+ <entity name="IV_BASE_WITH_LOCK" x="1219.19" y="545.81" width="141.0" height="82.0"/>
+ <entity name="IV_CONCRETE" x="263.39" y="531.42" width="95.0" height="66.0"/>
+ <entity name="IV_SUB1_SUB1" x="1350.73" y="826.24" width="115.0" height="66.0"/>
+ <entity name="IV2_SUB1" x="1713.4" y="996.68" width="65.0" height="66.0"/>
+ <entity name="IV_SUB1" x="662.25" y="1066.22" width="77.0" height="66.0"/>
+ <entity name="IV_ABSTRACT" x="0.0" y="328.65" width="93.0" height="82.0"/>
+ <entity name="IV_SUB3" x="1315.12" y="1109.12" width="78.0" height="66.0"/>
+ <entity name="IV_SUB2" x="625.08" y="739.23" width="77.0" height="82.0"/>
+ <entity name="IV1_ROOT" x="1793.48" y="1270.67" width="104.0" height="82.0"/>
+ <entity name="IV2_X" x="1534.75" y="1396.77" width="40.0" height="50.0"/>
+ <entity name="IV_OTHER" x="1030.6" y="1054.24" width="69.0" height="66.0"/>
+ <entity name="IV_IMPL" x="1070.57" y="774.13" width="74.0" height="114.0"/>
+ <entity name="IV_IMPL_WITH_LOCK" x="860.67" y="846.99" width="140.0" height="82.0"/>
+ <entity name="IV_ROOT" x="908.9" y="1271.25" width="104.0" height="82.0"/>
+ <entity name="IV2_ROOT" x="1655.12" y="0.0" width="104.0" height="66.0"/>
+ </graph>
+ <graph type="CLASS" scale="0.8157307210000007">
+ <entity name="IvSub1Sub1" x="261.0" y="557.35" width="100.0" height="98.0"/>
+ <entity name="IvSub1" x="277.0" y="423.75" width="86.0" height="82.0"/>
+ <entity name="IvSub2" x="410.97" y="417.06" width="86.0" height="98.0"/>
+ <entity name="Iv1Sub1" x="96.86" y="395.9" width="86.0" height="66.0"/>
+ <entity name="Iv2Root" x="244.0" y="41.09" width="86.0" height="50.0"/>
+ <entity name="IvBase" x="885.89" y="29.29" width="45.0" height="66.0"/>
+ <entity name="IvConcrete" x="74.0" y="150.01" width="74.0" height="66.0"/>
+ <entity name="IvImplWithLock" x="495.0" y="185.9" width="105.0" height="82.0"/>
+ <entity name="IvAbstract" x="102.49" y="29.28" width="71.0" height="50.0"/>
+ <entity name="Iv2X" x="400.91" y="151.01" width="32.0" height="18.0"/>
+ <entity name="IvOther" x="698.93" y="201.74" width="53.0" height="50.0"/>
+ <entity name="IvBaseWithLock" x="492.0" y="36.54" width="106.0" height="66.0"/>
+ <entity name="IvRoot" x="406.0" y="313.33" width="86.0" height="66.0"/>
+ <entity name="IvSub3" x="574.88" y="432.63" width="86.0" height="66.0"/>
+ <entity name="Iv1Root" x="95.11" y="264.1" width="86.0" height="66.0"/>
+ <entity name="Iv2Sub1" x="245.0" y="143.08" width="86.0" height="50.0"/>
+ <entity name="IvImpl" x="875.23" y="176.14" width="44.0" height="98.0"/>
+ </graph>
+</graphs>
diff --git a/cayenne-server/src/test/resources/inheritance-vertical.map.xml b/cayenne-server/src/test/resources/inheritance-vertical.map.xml
index 4af9df1..2714b8f 100644
--- a/cayenne-server/src/test/resources/inheritance-vertical.map.xml
+++ b/cayenne-server/src/test/resources/inheritance-vertical.map.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap https://cayenne.apache.org/schema/10/modelMap.xsd"
project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_vertical"/>
<db-entity name="IV1_ROOT">
@@ -201,10 +201,10 @@
<db-attribute-pair source="OTHER1_ID" target="ID"/>
</db-relationship>
<db-relationship name="impls" source="IV_OTHER" target="IV_IMPL" toMany="true">
- <db-attribute-pair source="ID" target="OTHER_ID"/>
+ <db-attribute-pair source="ID" target="OTHER1_ID"/>
</db-relationship>
<db-relationship name="implsWithLock" source="IV_OTHER" target="IV_IMPL_WITH_LOCK" toMany="true">
- <db-attribute-pair source="ID" target="OTHER_ID"/>
+ <db-attribute-pair source="ID" target="OTHER1_ID"/>
</db-relationship>
<db-relationship name="ivSub3s" source="IV_ROOT" target="IV_SUB3" toMany="true">
<db-attribute-pair source="ID" target="IV_ROOT_ID"/>