Author: bleny Date: 2010-11-12 16:53:30 +0000 (Fri, 12 Nov 2010) New Revision: 770 Log: fix tests (migration + non-lazy side-effect) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-12 16:53:30 UTC (rev 770) @@ -261,9 +261,11 @@ rowLog.addChangePeriod(oldPeriod, newPeriod, pattern); // before saving profession - row.getProfession().setDcf5code( - insertOrSelect(transaction, - row.getProfession().getDcf5code())); + if (row.getProfession().getDcf5code() != null) { + row.getProfession().setDcf5code( + insertOrSelect(transaction, + row.getProfession().getDcf5code())); + } // Save Profession ProfessionDAO professionDAO = WaoDAOHelper.getProfessionDAO(transaction); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java 2010-11-12 16:53:30 UTC (rev 770) @@ -2,6 +2,7 @@ import fr.ifremer.wao.entity.DCFFiveCode; import org.junit.Test; +import org.mockito.Mockito; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -13,121 +14,15 @@ public class WaoMigrationCallBackTest { - /** A dummy implementation of WaoMigrationCallBack to make it instanciable. */ - public class ConcreteWaoMigrationCallBack extends WaoMigrationCallBack { - @Override - protected void createUserRoleColumn_1_1a(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void changeContactStateColumn_1_1b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void changeSampleRowLogAdminColumn_1_1c(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createBoatInfosNewColumns_1_2a(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createSampleMonthEstimatedTidesColumn_1_2b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void updateWaoUserRoleColumns_1_3a(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createSampleRowLogFromAdminColumn_1_3b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createNewsCompanyColumn_1_4a(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createContactCommentColumns_1_4b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected Map<String, List<String>> retrieveBoatDistrictCodes_1_5a(TopiaContextImplementor tx) throws TopiaException { - throw new UnsupportedOperationException(); - } - - @Override - protected void createBoatDistrictTable_1_5b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected Map<String, String> insertBoatDistricts_1_5c(List<String> queries, Map<String, List<String>> boatDistrictCodes) { - throw new UnsupportedOperationException(); - } - - @Override - protected void updateBoatWithBoatDistrict_1_5d(List<String> queries, Map<String, String> boats) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createContactEmailSentColumn_1_5e(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createTablesForIndicatorsAdministration_1_6(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void insertIndicatorLevelInitialValues_1_6(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void addDataReliability_1_6(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createTablesForDCF5Code_1_6(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected Map<String, String> getCodeDCF5ForMigration_1_6(TopiaContextImplementor tx) throws TopiaException { - throw new UnsupportedOperationException(); - } - - @Override - protected void insertDCFFiveCode_1_6(String codeTopiaId, DCFFiveCode code, List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void insertSplitCodes_1_6(String professionTopiaId, String codeTopiaId, List<String> queries) { - throw new UnsupportedOperationException(); - } - } - @Test public void testSplitCodeDCF5_1_6() { - ConcreteWaoMigrationCallBack migration = new ConcreteWaoMigrationCallBack(); // code to split. 4 codes should be found as result of the split String code = "AAA_BBB et CCC_DDD et EEE_ et FFF"; + WaoMigrationCallBack migration = Mockito.mock(WaoMigrationCallBack.class); + Mockito.when(migration.splitCodeDCF5_1_6(code)).thenCallRealMethod(); + // now, the split List<DCFFiveCode> codes = migration.splitCodeDCF5_1_6(code); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-12 16:53:30 UTC (rev 770) @@ -59,9 +59,6 @@ private static final Logger log = LoggerFactory.getLogger(BoatImplTest.class); - public BoatImplTest() { - } - @BeforeClass public static void setUpClass() throws Exception { manager = new TestManager(); @@ -125,7 +122,7 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = rowDAO.findByCode("2010_0001"); row.getCompany(); - row.getProfession(); + row.getProfession().sizeDcf5code(); row.sizeElligibleBoat(); row.sizeSampleMonth(); transaction.closeContext(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-12 16:53:30 UTC (rev 770) @@ -239,11 +239,11 @@ // Get two SampleRows : 2009_3 & 2010_4 SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row1 = rowDAO.findByCode("2009_0003"); - row1.getProfession(); + row1.getProfession().sizeDcf5code(); row1.sizeElligibleBoat(); row1.sizeSampleMonth(); SampleRow row2 = rowDAO.findByCode("2010_0004"); - row2.getProfession(); + row2.getProfession().sizeDcf5code(); row2.sizeElligibleBoat(); row2.sizeSampleMonth(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-12 16:53:30 UTC (rev 770) @@ -474,6 +474,7 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = rowDAO.findByCode("2010_0001"); row.getProfession(); + row.getProfession().sizeDcf5code(); row.getCompany(); row.sizeSampleMonth(); row.sizeElligibleBoat();