You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/30 17:54:30 UTC
cayenne git commit: fixing MySQL failures
Repository: cayenne
Updated Branches:
refs/heads/master eefbc9264 -> 0398bf4da
fixing MySQL failures
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0398bf4d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0398bf4d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0398bf4d
Branch: refs/heads/master
Commit: 0398bf4da4a91ba26c42cf6419d62bbb745189d9
Parents: eefbc92
Author: aadamchik <aa...@apache.org>
Authored: Sun Nov 30 19:31:52 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Sun Nov 30 19:31:52 2014 +0300
----------------------------------------------------------------------
.../apache/cayenne/OneWayRelationshipsIT.java | 257 ++++++++++---------
1 file changed, 129 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0398bf4d/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
index e2152e6..dd5fbc5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
@@ -33,6 +33,7 @@ import org.junit.Before;
import org.junit.Test;
import java.sql.SQLException;
+import java.sql.Types;
import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -43,184 +44,184 @@ import static org.junit.Assert.assertTrue;
@UseServerRuntime(CayenneProjects.ONEWAY_PROJECT)
public class OneWayRelationshipsIT extends ServerCase {
- @Inject
- private ObjectContext context;
+ @Inject
+ private ObjectContext context;
- @Inject
- private DBHelper dbHelper;
+ @Inject
+ private DBHelper dbHelper;
- private TableHelper t1Helper;
- private TableHelper t2Helper;
- private TableHelper t3Helper;
- private TableHelper t4Helper;
+ private TableHelper t1Helper;
+ private TableHelper t2Helper;
+ private TableHelper t3Helper;
+ private TableHelper t4Helper;
- @Before
- public void setUp() throws Exception {
- t1Helper = new TableHelper(dbHelper, "oneway_table1");
- t1Helper.setColumns("ID");
- t2Helper = new TableHelper(dbHelper, "oneway_table2");
- t2Helper.setColumns("ID", "TABLE1_ID");
+ @Before
+ public void setUp() throws Exception {
+ t1Helper = new TableHelper(dbHelper, "oneway_table1");
+ t1Helper.setColumns("ID");
+ t2Helper = new TableHelper(dbHelper, "oneway_table2");
+ t2Helper.setColumns("ID", "TABLE1_ID");
- t3Helper = new TableHelper(dbHelper, "oneway_table3");
- t3Helper.setColumns("ID");
- t4Helper = new TableHelper(dbHelper, "oneway_table4");
- t4Helper.setColumns("ID", "TABLE3_ID");
- }
+ t3Helper = new TableHelper(dbHelper, "oneway_table3");
+ t3Helper.setColumns("ID");
+ t4Helper = new TableHelper(dbHelper, "oneway_table4");
+ t4Helper.setColumns("ID", "TABLE3_ID").setColumnTypes(Types.INTEGER, Types.INTEGER);
+ }
- @Test
- public void testToOne_TwoNew() throws SQLException {
+ @Test
+ public void testToOne_TwoNew() throws SQLException {
- OnewayTable1 t1 = context.newObject(OnewayTable1.class);
- OnewayTable2 t2 = context.newObject(OnewayTable2.class);
- t2.setToOneOneWayDb(t1);
+ OnewayTable1 t1 = context.newObject(OnewayTable1.class);
+ OnewayTable2 t2 = context.newObject(OnewayTable2.class);
+ t2.setToOneOneWayDb(t1);
- context.commitChanges();
+ context.commitChanges();
- int t1Pk = t1Helper.getInt("ID");
- assertEquals(Cayenne.intPKForObject(t1), t1Pk);
- int t2FK = t2Helper.getInt("TABLE1_ID");
- assertEquals(t1Pk, t2FK);
- }
+ int t1Pk = t1Helper.getInt("ID");
+ assertEquals(Cayenne.intPKForObject(t1), t1Pk);
+ int t2FK = t2Helper.getInt("TABLE1_ID");
+ assertEquals(t1Pk, t2FK);
+ }
- @Test
- public void testToOne_Replace() throws SQLException {
+ @Test
+ public void testToOne_Replace() throws SQLException {
- t1Helper.insert(1).insert(2);
- t2Helper.insert(1, 1);
+ t1Helper.insert(1).insert(2);
+ t2Helper.insert(1, 1);
- OnewayTable1 t11 = Cayenne.objectForPK(context, OnewayTable1.class, 1);
- OnewayTable1 t12 = Cayenne.objectForPK(context, OnewayTable1.class, 2);
- OnewayTable2 t2 = Cayenne.objectForPK(context, OnewayTable2.class, 1);
+ OnewayTable1 t11 = Cayenne.objectForPK(context, OnewayTable1.class, 1);
+ OnewayTable1 t12 = Cayenne.objectForPK(context, OnewayTable1.class, 2);
+ OnewayTable2 t2 = Cayenne.objectForPK(context, OnewayTable2.class, 1);
- assertSame(t11, t2.getToOneOneWayDb());
+ assertSame(t11, t2.getToOneOneWayDb());
- t2.setToOneOneWayDb(t12);
- context.commitChanges();
+ t2.setToOneOneWayDb(t12);
+ context.commitChanges();
- assertSame(t12, t2.getToOneOneWayDb());
+ assertSame(t12, t2.getToOneOneWayDb());
- int t2FK = t2Helper.getInt("TABLE1_ID");
- assertEquals(2, t2FK);
- }
+ int t2FK = t2Helper.getInt("TABLE1_ID");
+ assertEquals(2, t2FK);
+ }
- @Test
- public void testToOne_ReplaceWithNull() throws SQLException {
+ @Test
+ public void testToOne_ReplaceWithNull() throws SQLException {
- t1Helper.insert(1);
- t2Helper.insert(1, 1);
+ t1Helper.insert(1);
+ t2Helper.insert(1, 1);
- OnewayTable1 t11 = Cayenne.objectForPK(context, OnewayTable1.class, 1);
- OnewayTable2 t2 = Cayenne.objectForPK(context, OnewayTable2.class, 1);
+ OnewayTable1 t11 = Cayenne.objectForPK(context, OnewayTable1.class, 1);
+ OnewayTable2 t2 = Cayenne.objectForPK(context, OnewayTable2.class, 1);
- assertSame(t11, t2.getToOneOneWayDb());
+ assertSame(t11, t2.getToOneOneWayDb());
- t2.setToOneOneWayDb(null);
- context.commitChanges();
+ t2.setToOneOneWayDb(null);
+ context.commitChanges();
- assertNull(t2.getToOneOneWayDb());
+ assertNull(t2.getToOneOneWayDb());
- Object t2FK = t2Helper.getObject("TABLE1_ID");
- assertNull(t2FK);
- }
+ Object t2FK = t2Helper.getObject("TABLE1_ID");
+ assertNull(t2FK);
+ }
- @Test
- public void testToMany_TwoNew() throws SQLException {
+ @Test
+ public void testToMany_TwoNew() throws SQLException {
- OnewayTable3 t3 = context.newObject(OnewayTable3.class);
- OnewayTable4 t4 = context.newObject(OnewayTable4.class);
- t3.addToToManyOneWayDb(t4);
+ OnewayTable3 t3 = context.newObject(OnewayTable3.class);
+ OnewayTable4 t4 = context.newObject(OnewayTable4.class);
+ t3.addToToManyOneWayDb(t4);
- context.commitChanges();
+ context.commitChanges();
- int t3Pk = t3Helper.getInt("ID");
- assertEquals(Cayenne.intPKForObject(t3), t3Pk);
- int t4FK = t4Helper.getInt("TABLE3_ID");
- assertEquals(t3Pk, t4FK);
- }
+ int t3Pk = t3Helper.getInt("ID");
+ assertEquals(Cayenne.intPKForObject(t3), t3Pk);
+ int t4FK = t4Helper.getInt("TABLE3_ID");
+ assertEquals(t3Pk, t4FK);
+ }
- @Test
- public void testToMany_AddNew() throws SQLException {
+ @Test
+ public void testToMany_AddNew() throws SQLException {
- t3Helper.insert(1);
- t4Helper.insert(1, 1);
+ t3Helper.insert(1);
+ t4Helper.insert(1, 1);
- OnewayTable3 t3 = Cayenne.objectForPK(context, OnewayTable3.class, 1);
- assertEquals(1, t3.getToManyOneWayDb().size());
+ OnewayTable3 t3 = Cayenne.objectForPK(context, OnewayTable3.class, 1);
+ assertEquals(1, t3.getToManyOneWayDb().size());
- OnewayTable4 t41 = Cayenne.objectForPK(context, OnewayTable4.class, 1);
- assertTrue(t3.getToManyOneWayDb().contains(t41));
+ OnewayTable4 t41 = Cayenne.objectForPK(context, OnewayTable4.class, 1);
+ assertTrue(t3.getToManyOneWayDb().contains(t41));
- OnewayTable4 t42 = context.newObject(OnewayTable4.class);
- t3.addToToManyOneWayDb(t42);
- context.commitChanges();
+ OnewayTable4 t42 = context.newObject(OnewayTable4.class);
+ t3.addToToManyOneWayDb(t42);
+ context.commitChanges();
- assertEquals(2, t3.getToManyOneWayDb().size());
+ assertEquals(2, t3.getToManyOneWayDb().size());
- SQLSelect<Integer> fksQuery = SQLSelect.scalarQuery(Integer.class, "oneway-rels",
- "SELECT TABLE3_ID FROM oneway_table4");
+ SQLSelect<Integer> fksQuery = SQLSelect.scalarQuery(Integer.class, "oneway-rels",
+ "SELECT TABLE3_ID FROM oneway_table4");
- List<Integer> fks = context.select(fksQuery);
- assertEquals(2, fks.size());
- for (Integer fk : fks) {
- assertEquals(Integer.valueOf(1), fk);
- }
- }
+ List<Integer> fks = context.select(fksQuery);
+ assertEquals(2, fks.size());
+ for (Integer fk : fks) {
+ assertEquals(Integer.valueOf(1), fk);
+ }
+ }
- @Test
- public void testToMany_AddExisting() throws SQLException {
+ @Test
+ public void testToMany_AddExisting() throws SQLException {
- t3Helper.insert(1);
- t4Helper.insert(1, 1).insert(2, null);
+ t3Helper.insert(1);
+ t4Helper.insert(1, 1).insert(2, null);
- OnewayTable3 t3 = Cayenne.objectForPK(context, OnewayTable3.class, 1);
- assertEquals(1, t3.getToManyOneWayDb().size());
+ OnewayTable3 t3 = Cayenne.objectForPK(context, OnewayTable3.class, 1);
+ assertEquals(1, t3.getToManyOneWayDb().size());
- OnewayTable4 t41 = Cayenne.objectForPK(context, OnewayTable4.class, 1);
- assertTrue(t3.getToManyOneWayDb().contains(t41));
+ OnewayTable4 t41 = Cayenne.objectForPK(context, OnewayTable4.class, 1);
+ assertTrue(t3.getToManyOneWayDb().contains(t41));
- OnewayTable4 t42 = Cayenne.objectForPK(context, OnewayTable4.class, 2);
+ OnewayTable4 t42 = Cayenne.objectForPK(context, OnewayTable4.class, 2);
- t3.addToToManyOneWayDb(t42);
- context.commitChanges();
+ t3.addToToManyOneWayDb(t42);
+ context.commitChanges();
- assertEquals(2, t3.getToManyOneWayDb().size());
+ assertEquals(2, t3.getToManyOneWayDb().size());
- SQLSelect<Integer> fksQuery = SQLSelect.scalarQuery(Integer.class, "oneway-rels",
- "SELECT TABLE3_ID FROM oneway_table4");
+ SQLSelect<Integer> fksQuery = SQLSelect.scalarQuery(Integer.class, "oneway-rels",
+ "SELECT TABLE3_ID FROM oneway_table4");
- List<Integer> fks = context.select(fksQuery);
- assertEquals(2, fks.size());
- for (Integer fk : fks) {
- assertEquals(Integer.valueOf(1), fk);
- }
- }
+ List<Integer> fks = context.select(fksQuery);
+ assertEquals(2, fks.size());
+ for (Integer fk : fks) {
+ assertEquals(Integer.valueOf(1), fk);
+ }
+ }
- @Test
- public void testToMany_RemoveExisting() throws SQLException {
+ @Test
+ public void testToMany_RemoveExisting() throws SQLException {
- t3Helper.insert(1);
- t4Helper.insert(1, 1).insert(2, 1);
+ t3Helper.insert(1);
+ t4Helper.insert(1, 1).insert(2, 1);
- OnewayTable3 t3 = Cayenne.objectForPK(context, OnewayTable3.class, 1);
- assertEquals(2, t3.getToManyOneWayDb().size());
+ OnewayTable3 t3 = Cayenne.objectForPK(context, OnewayTable3.class, 1);
+ assertEquals(2, t3.getToManyOneWayDb().size());
- OnewayTable4 t41 = Cayenne.objectForPK(context, OnewayTable4.class, 1);
- assertTrue(t3.getToManyOneWayDb().contains(t41));
+ OnewayTable4 t41 = Cayenne.objectForPK(context, OnewayTable4.class, 1);
+ assertTrue(t3.getToManyOneWayDb().contains(t41));
- OnewayTable4 t42 = Cayenne.objectForPK(context, OnewayTable4.class, 2);
- assertTrue(t3.getToManyOneWayDb().contains(t42));
+ OnewayTable4 t42 = Cayenne.objectForPK(context, OnewayTable4.class, 2);
+ assertTrue(t3.getToManyOneWayDb().contains(t42));
- t3.removeFromToManyOneWayDb(t42);
- context.commitChanges();
+ t3.removeFromToManyOneWayDb(t42);
+ context.commitChanges();
- assertEquals(1, t3.getToManyOneWayDb().size());
+ assertEquals(1, t3.getToManyOneWayDb().size());
- SQLSelect<Integer> fksQuery = SQLSelect.scalarQuery(Integer.class, "oneway-rels",
- "SELECT TABLE3_ID FROM oneway_table4");
+ SQLSelect<Integer> fksQuery = SQLSelect.scalarQuery(Integer.class, "oneway-rels",
+ "SELECT TABLE3_ID FROM oneway_table4");
- List<Integer> fks = context.select(fksQuery);
- assertEquals(2, fks.size());
- assertTrue(fks.contains(1));
- assertTrue(fks.contains(null));
- }
+ List<Integer> fks = context.select(fksQuery);
+ assertEquals(2, fks.size());
+ assertTrue(fks.contains(1));
+ assertTrue(fks.contains(null));
+ }
}