Author: fdesbois Date: 2010-05-20 12:55:16 +0200 (Thu, 20 May 2010) New Revision: 3005 Url: http://chorem.org/repositories/revision/pollen/3005 Log: missing refactor for tests Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/TopiaQueryBuilderTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServicePollImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/test/AbstractServiceTest.java Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/TopiaQueryBuilderTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/TopiaQueryBuilderTest.java 2010-05-20 10:42:31 UTC (rev 3004) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/TopiaQueryBuilderTest.java 2010-05-20 10:55:16 UTC (rev 3005) @@ -53,7 +53,7 @@ Assert.assertEquals(builder.getQuery().fullQuery(), "FROM " + UserAccount.class.getName() + - " ORDER BY " + TopiaEntity.CREATE_DATE + " DESC"); + " ORDER BY " + TopiaEntity.TOPIA_CREATE_DATE + " DESC"); } @@ -98,7 +98,7 @@ "SELECT P FROM " + FavoriteParticipant.class.getName() + " P, " + FavoriteList.class.getName() + " L" + " WHERE P IN elements (L." + FavoriteList.FAVORITE_PARTICIPANT + - ") ORDER BY P." + TopiaEntity.CREATE_DATE + " DESC"); + ") ORDER BY P." + TopiaEntity.TOPIA_CREATE_DATE + " DESC"); log.info("test3 : orderBy name and email desc"); String orderBy = FavoriteParticipant.NAME + ", " + FavoriteParticipant.EMAIL + " desc"; Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServicePollImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServicePollImplTest.java 2010-05-20 10:42:31 UTC (rev 3004) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServicePollImplTest.java 2010-05-20 10:55:16 UTC (rev 3005) @@ -108,7 +108,7 @@ try { newPoll = servicePoll.createBasicPoll(transaction, poll); Assert.assertNotNull(newPoll); - Assert.assertNotNull(newPoll.getId()); + Assert.assertNotNull(newPoll.getTopiaId()); Assert.assertNotNull(newPoll.getUid()); Assert.assertEquals("Poll", newPoll.getTitle()); @@ -130,7 +130,7 @@ try { PollDAO dao = PollenDAOHelper.getPollDAO(transaction); - Poll pollFound = dao.findByTopiaId(newPoll.getId()); + Poll pollFound = dao.findByTopiaId(newPoll.getTopiaId()); Assert.assertNotNull(pollFound); Assert.assertNotNull(pollFound.getCreator()); Assert.assertEquals(user, pollFound.getCreator().getUserAccount()); Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/test/AbstractServiceTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/test/AbstractServiceTest.java 2010-05-20 10:42:31 UTC (rev 3004) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/test/AbstractServiceTest.java 2010-05-20 10:55:16 UTC (rev 3005) @@ -232,7 +232,7 @@ PollenDAOHelper.getFavoriteListDAO(transaction); TopiaQuery query = dao.createQuery(). - add(TopiaEntity.ID, id). + add(TopiaEntity.TOPIA_ID, id). addLoad(propertiesLoad); FavoriteList result = dao.findByQuery(query);