Author: tchemit Date: 2012-05-17 00:40:42 +0200 (Thu, 17 May 2012) New Revision: 2486 Url: http://nuiton.org/repositories/revision/topia/2486 Log: rename roles in mapping tests (otherwise same table can be used by more than one relations Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java 2012-05-15 16:27:19 UTC (rev 2485) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java 2012-05-16 22:40:42 UTC (rev 2486) @@ -41,7 +41,7 @@ A13 a = aDAO.create(); B13 b = bDAO.create(); - a.addRoleB(b); + a.addRoleB13(b); tx.commitTransaction(); @@ -53,16 +53,16 @@ A13 aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(1, aBis.sizeRoleB()); - Assert.assertEquals(a.getRoleB().iterator().next(), - aBis.getRoleB().iterator().next()); + Assert.assertEquals(1, aBis.sizeRoleB13()); + Assert.assertEquals(a.getRoleB13().iterator().next(), + aBis.getRoleB13().iterator().next()); - Assert.assertEquals(b, aBis.getRoleB().iterator().next()); + Assert.assertEquals(b, aBis.getRoleB13().iterator().next()); B13 bBis = bDAO.findByTopiaId(b.getTopiaId()); Assert.assertEquals(b, bBis); - Assert.assertEquals(aBis.getRoleB().iterator().next(), bBis); - Assert.assertEquals(a, bBis.getRoleA()); + Assert.assertEquals(aBis.getRoleB13().iterator().next(), bBis); + Assert.assertEquals(a, bBis.getRoleA13()); } @Test public void delete() throws TopiaException { @@ -87,7 +87,7 @@ Assert.assertEquals(1, nbB); B13 b = bDAO.findAll().get(0); - Assert.assertNull(b.getRoleA()); + Assert.assertNull(b.getRoleA13()); bDAO.delete(b); tx.commitTransaction(); Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java 2012-05-15 16:27:19 UTC (rev 2485) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java 2012-05-16 22:40:42 UTC (rev 2486) @@ -40,7 +40,7 @@ A11 a = aDAO.create(); B11 b = bDAO.create(); - a.addRoleB(b); + a.addRoleB11(b); tx.commitTransaction(); @@ -52,13 +52,13 @@ A11 aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(1, aBis.sizeRoleB()); - Assert.assertEquals(a.getRoleB().iterator().next(), - aBis.getRoleB().iterator().next()); + Assert.assertEquals(1, aBis.sizeRoleB11()); + Assert.assertEquals(a.getRoleB11().iterator().next(), + aBis.getRoleB11().iterator().next()); B11 bBis = bDAO.findByTopiaId(b.getTopiaId()); Assert.assertEquals(b, bBis); - Assert.assertEquals(aBis.getRoleB().iterator().next(), bBis); + Assert.assertEquals(aBis.getRoleB11().iterator().next(), bBis); } @Test Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java 2012-05-15 16:27:19 UTC (rev 2485) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java 2012-05-16 22:40:42 UTC (rev 2486) @@ -41,7 +41,7 @@ A23 a = aDAO.create(); B23 b = bDAO.create(); - b.addRoleA(a); + b.addRoleA23(a); tx.commitTransaction(); @@ -53,12 +53,12 @@ A23 aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(b, aBis.getRoleB()); + Assert.assertEquals(b, aBis.getRoleB23()); B23 bBis = bDAO.findByTopiaId(b.getTopiaId()); Assert.assertEquals(b, bBis); - Assert.assertEquals(1, bBis.sizeRoleA()); - Assert.assertEquals(a, bBis.getRoleA().iterator().next()); + Assert.assertEquals(1, bBis.sizeRoleA23()); + Assert.assertEquals(a, bBis.getRoleA23().iterator().next()); } @Test public void delete() throws TopiaException { Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java 2012-05-15 16:27:19 UTC (rev 2485) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java 2012-05-16 22:40:42 UTC (rev 2486) @@ -40,7 +40,7 @@ A21 a = aDAO.create(); B21 b = bDAO.create(); - a.setRoleB(b); + a.setRoleB21(b); tx.commitTransaction(); @@ -52,11 +52,11 @@ A21 aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(b, aBis.getRoleB()); + Assert.assertEquals(b, aBis.getRoleB21()); B21 bBis = bDAO.findByTopiaId(b.getTopiaId()); Assert.assertEquals(b, bBis); - Assert.assertEquals(aBis.getRoleB(), bBis); + Assert.assertEquals(aBis.getRoleB21(), bBis); } @Test public void delete() throws TopiaException { Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java 2012-05-15 16:27:19 UTC (rev 2485) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java 2012-05-16 22:40:42 UTC (rev 2486) @@ -40,7 +40,7 @@ A33 a = aDAO.create(); B33 b = bDAO.create(); - b.addRoleA(a); + b.addRoleA33(a); tx.commitTransaction(); @@ -52,14 +52,14 @@ A33 aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(1, aBis.sizeRoleB()); - Assert.assertEquals(b, aBis.getRoleB().iterator().next()); - Assert.assertEquals(a.getRoleB(), aBis.getRoleB()); + Assert.assertEquals(1, aBis.sizeRoleB33()); + Assert.assertEquals(b, aBis.getRoleB33().iterator().next()); + Assert.assertEquals(a.getRoleB33(), aBis.getRoleB33()); B33 bBis = bDAO.findByTopiaId(b.getTopiaId()); Assert.assertEquals(b, bBis); - Assert.assertEquals(1, bBis.sizeRoleA()); - Assert.assertEquals(a, bBis.getRoleA().iterator().next()); + Assert.assertEquals(1, bBis.sizeRoleA33()); + Assert.assertEquals(a, bBis.getRoleA33().iterator().next()); } @Test Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java 2012-05-15 16:27:19 UTC (rev 2485) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java 2012-05-16 22:40:42 UTC (rev 2486) @@ -40,7 +40,7 @@ A31 a = aDAO.create(); B31 b = bDAO.create(); - a.addRoleB(b); + a.addRoleB31(b); tx.commitTransaction(); @@ -52,12 +52,12 @@ A31 aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(1, aBis.sizeRoleB()); - Assert.assertEquals(b, aBis.getRoleB().iterator().next()); + Assert.assertEquals(1, aBis.sizeRoleB31()); + Assert.assertEquals(b, aBis.getRoleB31().iterator().next()); B31 bBis = bDAO.findByTopiaId(b.getTopiaId()); Assert.assertEquals(b, bBis); - Assert.assertEquals(aBis.getRoleB().iterator().next(), bBis); + Assert.assertEquals(aBis.getRoleB31().iterator().next(), bBis); } @Test Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java 2012-05-15 16:27:19 UTC (rev 2485) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java 2012-05-16 22:40:42 UTC (rev 2486) @@ -45,8 +45,8 @@ B61 b2 = bDAO.create(); B61 b3 = bDAO.create(); - a.addRoleB(b); - a.addRoleB(b2); + a.addRoleB61(b); + a.addRoleB61(b2); tx.commitTransaction(); @@ -58,8 +58,8 @@ A61 aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(2, aBis.sizeRoleB()); - List<B61> bs = aBis.getRoleB(); + Assert.assertEquals(2, aBis.sizeRoleB61()); + List<B61> bs = aBis.getRoleB61(); Assert.assertEquals(b, bs.get(0)); Assert.assertEquals(b2, bs.get(1)); @@ -69,13 +69,13 @@ bsBis = Lists.newArrayList(); bsBis.add(b2); bsBis.add(b); - a.setRoleB(bsBis); + a.setRoleB61(bsBis); tx.commitTransaction(); aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(2, aBis.sizeRoleB()); - bs = aBis.getRoleB(); + Assert.assertEquals(2, aBis.sizeRoleB61()); + bs = aBis.getRoleB61(); Assert.assertEquals(b2, bs.get(0)); Assert.assertEquals(b, bs.get(1)); @@ -85,13 +85,13 @@ bsBis.add(b3); bsBis.add(b2); bsBis.add(b); - a.setRoleB(bsBis); + a.setRoleB61(bsBis); tx.commitTransaction(); aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); - Assert.assertEquals(3, aBis.sizeRoleB()); - bs = aBis.getRoleB(); + Assert.assertEquals(3, aBis.sizeRoleB61()); + bs = aBis.getRoleB61(); Assert.assertEquals(b3, bs.get(0)); Assert.assertEquals(b2, bs.get(1)); Assert.assertEquals(b, bs.get(2)); Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo =================================================================== (Binary files differ)