Author: tchemit Date: 2011-11-25 10:00:46 +0100 (Fri, 25 Nov 2011) New Revision: 119 Url: http://forge.codelutin.com/repositories/revision/echobase/119 Log: - fix model (some properties are reserved keyword on pg) - add tests - prune some empty directories Added: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java Removed: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-24 23:43:49 UTC (rev 118) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-25 09:00:46 UTC (rev 119) @@ -24,9 +24,7 @@ package fr.ifremer.echobase.entities; import com.google.common.collect.Lists; -import org.nuiton.topia.persistence.TopiaEntity; -import java.util.ArrayList; import java.util.List; /** @@ -38,11 +36,13 @@ public class EntitiesUtil { /** - * @return the entity types of reference in correct order for replication + * @return the entity types of data in correct order for replication * purpose. */ - public static EchoBaseEntityEnum[] getReferenceTypes() { + public static EchoBaseEntityEnum[] getDataTypes() { + List<EchoBaseEntityEnum> result = Lists.newLinkedList(); + result.add(EchoBaseEntityEnum.Voyage); result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.EchotypeDepthStratum); @@ -69,10 +69,10 @@ } /** - * @return the entity types of data in correct order for replication + * @return the entity types of reference in correct order for replication * purpose. */ - public static EchoBaseEntityEnum[] getDataTypes() { + public static EchoBaseEntityEnum[] getReferenceTypes() { List<EchoBaseEntityEnum> result = Lists.newLinkedList(); result.add(EchoBaseEntityEnum.Mission); result.add(EchoBaseEntityEnum.AcousticInstrument); @@ -97,7 +97,6 @@ result.add(EchoBaseEntityEnum.Localisation); result.add(EchoBaseEntityEnum.MeasurementMetadata); result.add(EchoBaseEntityEnum.MeasureType); - result.add(EchoBaseEntityEnum.Mission); result.add(EchoBaseEntityEnum.OperationMetadata); result.add(EchoBaseEntityEnum.OperationType); result.add(EchoBaseEntityEnum.ReferenceDatum); @@ -108,23 +107,5 @@ return result.toArray(new EchoBaseEntityEnum[result.size()]); } - /** - * Used to get all contract of a package - * - * @param entitiesPackage package contening desired entities - * @return contracts contained in entitiesPackage - */ - public static EchoBaseEntityEnum[] getContractsOf(Package entitiesPackage) { - EchoBaseEntityEnum[] echoBaseEntityEnums = EchoBaseEntityEnum.values(); - List<EchoBaseEntityEnum> refClasses = new ArrayList<EchoBaseEntityEnum>(); - for (EchoBaseEntityEnum echoBaseEntityEnum : echoBaseEntityEnums) { - // Get all entities in package fr.ifremer.echobase.entities.references - Class<? extends TopiaEntity> contract = echoBaseEntityEnum.getContract(); - if (contract.getPackage().equals(entitiesPackage)) { - refClasses.add(echoBaseEntityEnum); - } - } - return refClasses.toArray(new EchoBaseEntityEnum[refClasses.size()]); - } } Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java 2011-11-24 23:43:49 UTC (rev 118) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java 2011-11-25 09:00:46 UTC (rev 119) @@ -40,7 +40,7 @@ result.setEntityId(getEntityId()); result.setModificationDate(getModificationDate()); result.setModificationText(getModificationText()); - result.setUser(getUser().toDTO()); + result.setModificationUser(getModificationUser().toDTO()); return result; } } Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-24 23:43:49 UTC (rev 118) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-25 09:00:46 UTC (rev 119) @@ -160,8 +160,10 @@ echobase.common.mission=mission echobase.common.missionAbstract= echobase.common.missionName= +echobase.common.missionReferences= echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification +echobase.common.modificationUser= echobase.common.name=Nom echobase.common.notes= echobase.common.numberAtAge= Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Added: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java =================================================================== --- trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java (rev 0) +++ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 2011-11-25 09:00:46 UTC (rev 119) @@ -0,0 +1,74 @@ +package fr.ifremer.echobase.entities; + +import com.google.common.collect.Lists; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Mission; +import junit.framework.Assert; +import org.junit.Test; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.ArrayList; +import java.util.List; + +/** + * To test the class {@link EntitiesUtil}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class EntitiesUtilTest { + + @Test + public void getReferenceTypes() { + + EchoBaseEntityEnum[] types = EntitiesUtil.getReferenceTypes(); + + List<EchoBaseEntityEnum> expectedTypes = + Lists.newArrayList(getContractsOf(Mission.class.getPackage())); + + Assert.assertNotNull(types); + Assert.assertEquals(expectedTypes.size(), types.length); + + for (EchoBaseEntityEnum referenceType : types) { + Assert.assertTrue("Missing type : " + referenceType, + expectedTypes.contains(referenceType)); + } + } + + @Test + public void getDataTypes() { + + EchoBaseEntityEnum[] types = EntitiesUtil.getDataTypes(); + + List<EchoBaseEntityEnum> expectedTypes = + Lists.newArrayList(getContractsOf(Voyage.class.getPackage())); + + Assert.assertNotNull(types); + Assert.assertEquals(expectedTypes.size(), types.length); + + for (EchoBaseEntityEnum referenceType : types) { + Assert.assertTrue("Missing type : " + referenceType, + expectedTypes.contains(referenceType)); + } + } + + /** + * Used to get all contract of a package + * + * @param entitiesPackage package contening desired entities + * @return contracts contained in entitiesPackage + */ + public static EchoBaseEntityEnum[] getContractsOf(Package entitiesPackage) { + EchoBaseEntityEnum[] echoBaseEntityEnums = EchoBaseEntityEnum.values(); + List<EchoBaseEntityEnum> refClasses = new ArrayList<EchoBaseEntityEnum>(); + for (EchoBaseEntityEnum echoBaseEntityEnum : echoBaseEntityEnums) { + + // Get all entities in package fr.ifremer.echobase.entities.references + Class<? extends TopiaEntity> contract = echoBaseEntityEnum.getContract(); + if (entitiesPackage.equals(contract.getPackage())) { + refClasses.add(echoBaseEntityEnum); + } + } + return refClasses.toArray(new EchoBaseEntityEnum[refClasses.size()]); + } +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-24 23:43:49 UTC (rev 118) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 09:00:46 UTC (rev 119) @@ -427,7 +427,7 @@ dao.create( EntityModificationLog.PROPERTY_ENTITY_TYPE, tableMeta.getEntityEnum().name(), EntityModificationLog.PROPERTY_ENTITY_ID, topiaId, - EntityModificationLog.PROPERTY_USER, user, + EntityModificationLog.PROPERTY_MODIFICATION_USER, user, EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), EntityModificationLog.PROPERTY_MODIFICATION_TEXT, buffer.toString() );