Author: athimel Date: 2012-05-30 18:39:02 +0200 (Wed, 30 May 2012) New Revision: 2568 Url: http://nuiton.org/repositories/revision/topia/2568 Log: Apply exceptions refactoring to tests Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaReplicationServiceImplTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java 2012-05-30 16:38:41 UTC (rev 2567) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java 2012-05-30 16:39:02 UTC (rev 2568) @@ -32,6 +32,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceException; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.NaturalizedEntity; import org.nuiton.topia.tck.it.NaturalizedEntityDAO; @@ -79,7 +80,7 @@ transaction.commitTransaction(); } - @Test(expected = TopiaException.class) + @Test(expected = TopiaPersistenceException.class) public void testCreateFailed() throws Exception { log.debug("Test naturalId : create failed"); TopiaContext transaction = db.beginTransaction(); Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-30 16:38:41 UTC (rev 2567) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-30 16:39:02 UTC (rev 2568) @@ -28,6 +28,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceException; import org.nuiton.topia.tck.mapping.AbstractMappingTest; import java.util.Date; @@ -50,8 +51,8 @@ aDAO = getDAO(tx, A12A.class); } - @Test(expected = TopiaException.class) - public void createwithNull() throws TopiaException { + @Test(expected = TopiaPersistenceException.class) + public void createWithNull() throws TopiaException { long nbA = aDAO.count(); Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java 2012-05-30 16:38:41 UTC (rev 2567) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java 2012-05-30 16:39:02 UTC (rev 2568) @@ -28,6 +28,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceException; import org.nuiton.topia.tck.mapping.AbstractMappingTest; import java.util.Date; @@ -50,8 +51,8 @@ aDAO = getDAO(tx, A13A.class); } - @Test(expected = TopiaException.class) - public void createwithNull() throws TopiaException { + @Test(expected = TopiaPersistenceException.class) + public void createWithNull() throws TopiaException { long nbA = aDAO.count(); Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/AbstractTopiaReplicationServiceTest.java 2012-05-30 16:38:41 UTC (rev 2567) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/AbstractTopiaReplicationServiceTest.java 2012-05-30 16:39:02 UTC (rev 2568) @@ -71,7 +71,7 @@ protected TopiaContext ctxt; - protected TopiaContextImplementor dstCtxt; + protected TopiaContext dstCtxt; protected TopiaReplicationService service; Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaReplicationServiceImplTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaReplicationServiceImplTest.java 2012-05-30 16:38:41 UTC (rev 2567) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaReplicationServiceImplTest.java 2012-05-30 16:39:02 UTC (rev 2568) @@ -33,6 +33,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.persistence.TopiaPersistenceException; import org.nuiton.topia.persistence.util.TopiaEntityIdsMap; import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.topia.replication.operation.DettachAssociation; @@ -219,14 +220,14 @@ /** * Cette methode montre pourquoi la simple replication ne peut pas - * fonctionne :) + * fonctionner :) * <p/> * Le replicateur ne deplique pas dans le bon ordre et on a donc des * violations de clef etrangeres... * * @throws Exception pour toute erreur */ - @Test(expected = TopiaException.class) + @Test(expected = TopiaPersistenceException.class) public void testSimpleReplicateFailed() throws Exception { TopiaContext dstRootCtxt = createDb2("testSimpleReplicateFailed"); @@ -234,7 +235,7 @@ //model = service.prepare(contracts, pet.getTopiaId()); TopiaContext srcCtxt = ctxt.beginTransaction(); - dstCtxt = (TopiaContextImplementor) dstRootCtxt.beginTransaction(); + dstCtxt = dstRootCtxt.beginTransaction(); try {