Author: tchemit Date: 2013-02-09 00:16:41 +0100 (Sat, 09 Feb 2013) New Revision: 374 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/374 Log: - rename field in Vessel - improve Decoration (add some null value fallbacks) Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Program.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Program.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Program.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Program.java 2013-02-08 23:16:41 UTC (rev 374) @@ -0,0 +1,63 @@ +package fr.ifremer.tutti.persistence.entities.data; + +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.persistence.entities.referential.Zone; + +public class Program extends AbstractTuttiDataEntity { + + private static final long serialVersionUID = 1L; + + public static final String PROPERTY_NAME = "name"; + + public static final String PROPERTY_ZONE = "zone"; + + public static final String PROPERTY_ZONE_LABEL = "zoneLabel"; + + protected String name; + + protected Zone zone; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Zone getZone() { + return zone; + } + + public void setZone(Zone zone) { + this.zone = zone; + } + + public String getZoneLabel() { + return zone == null ? null : zone.getLabel(); + } + +} //Program Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Program.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-08 22:18:45 UTC (rev 373) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-08 23:16:41 UTC (rev 374) @@ -27,10 +27,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.referential.StatusDao; -import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxon; -import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonDao; -import fr.ifremer.adagio.core.dao.referential.taxon.TaxonName; -import fr.ifremer.adagio.core.dao.referential.taxon.TaxonNameDao; import fr.ifremer.adagio.core.dao.referential.taxon.TaxonNameExtendDao; import fr.ifremer.adagio.core.dao.referential.taxon.TaxonRefTaxVO; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -603,7 +599,7 @@ Vessel target = new Vessel(); target.setId((String) source[0]); target.setRegistrationCode((String) source[1]); - target.setInternalRegistrationCode((String) source[2]); + target.setInternationalRegistrationCode((String) source[2]); target.setName((String) source[3]); setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], target); return target; Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-02-08 22:18:45 UTC (rev 373) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-02-08 23:16:41 UTC (rev 374) @@ -377,7 +377,7 @@ Species createdSp1 = speciesList.get(0); Assert.assertNotNull(createdSp1); Assert.assertEquals(sp1.getName(), createdSp1.getName()); - // TODO TC :question pour TC pourquoi faire le test suivant NotNull, car tu n'a rien mis en entr�e de ce code ? + // TODO TC :question pour TC pourquoi faire le test suivant NotNull, car tu n'a rien mis en entr�e de ce code ? // faut-il que le genere ? //Assert.assertNotNull(createdSp1.getRefTaxCode()); //Assert.assertNotSame(sp1.getRefTaxCode(), createdSp1.getRefTaxCode()); @@ -408,7 +408,7 @@ Vessel v1 = new Vessel(); v1.setId("Don't care" + timestamp1); v1.setName("Name" + timestamp1); - v1.setInternalRegistrationCode("Immat" + timestamp1); + v1.setInternationalRegistrationCode("Immat" + timestamp1); v1.setScientificVessel(true); vessels.add(v1); @@ -417,7 +417,7 @@ Vessel v2 = new Vessel(); v2.setId("Don't care" + timestamp2); v2.setName("Name" + timestamp2); - v2.setInternalRegistrationCode("Immat" + timestamp2); + v2.setInternationalRegistrationCode("Immat" + timestamp2); v1.setScientificVessel(false); vessels.add(v2); @@ -435,7 +435,7 @@ Vessel createdV1 = vesselList.get(0); Assert.assertNotNull(createdV1); Assert.assertEquals(v1.getName(), createdV1.getName()); - Assert.assertEquals(v1.getInternalRegistrationCode(), createdV1.getInternalRegistrationCode()); + Assert.assertEquals(v1.getInternationalRegistrationCode(), createdV1.getInternationalRegistrationCode()); Assert.assertNotNull(createdV1.getId()); Assert.assertNotSame(v1.getId(), createdV1.getId()); Assert.assertEquals(createdV1, service.getVessel(createdV1.getId())); @@ -446,7 +446,7 @@ Vessel createdV2 = vesselList.get(1); Assert.assertNotNull(createdV2); Assert.assertEquals(v2.getName(), createdV2.getName()); - Assert.assertEquals(v2.getInternalRegistrationCode(), createdV2.getInternalRegistrationCode()); + Assert.assertEquals(v2.getInternationalRegistrationCode(), createdV2.getInternationalRegistrationCode()); Assert.assertNotNull(createdV2.getId()); Assert.assertNotSame(v2.getId(), createdV2.getId()); Assert.assertEquals(createdV2, service.getVessel(createdV2.getId())); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java 2013-02-08 22:18:45 UTC (rev 373) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java 2013-02-08 23:16:41 UTC (rev 374) @@ -242,7 +242,7 @@ getExistingIds(TuttiTable.LOCATION_LEVEL, fixtures.nbLocationLevel()); getExistingIds(TuttiTable.LOCATION, fixtures.nbLocation()); getExistingIds(TuttiTable.TAXONOMIC_LEVEL, fixtures.nbTaxonomicLevel()); - getExistingIds(TuttiTable.REFERENCE_TAXON, fixtures.nbReferenceTaxon()); + getExistingIds(TuttiTable.REFERENCE_TAXON, fixtures.nbReferenceTaxon() + 2); getExistingIds(TuttiTable.TAXON_NAME, fixtures.nbTaxonName()); getExistingIds(TuttiTable.TAXON_GROUP_TYPE, fixtures.nbTaxonGroupType()); getExistingIds(TuttiTable.TAXON_GROUP, fixtures.nbTaxonGroup()); @@ -293,7 +293,7 @@ getDataToUpdate(TuttiTable.LOCATION_LEVEL, internalDb, internalConnection, fromDate, fixtures.nbLocationLevel()); getDataToUpdate(TuttiTable.LOCATION, internalDb, internalConnection, fromDate, fixtures.nbLocation()); getDataToUpdate(TuttiTable.TAXONOMIC_LEVEL, internalDb, internalConnection, fromDate, fixtures.nbTaxonomicLevel()); - getDataToUpdate(TuttiTable.REFERENCE_TAXON, internalDb, internalConnection, fromDate, fixtures.nbReferenceTaxon()); + getDataToUpdate(TuttiTable.REFERENCE_TAXON, internalDb, internalConnection, fromDate, fixtures.nbReferenceTaxon() + 2); getDataToUpdate(TuttiTable.TAXON_NAME, internalDb, internalConnection, fromDate, fixtures.nbTaxonName()); getDataToUpdate(TuttiTable.TAXON_GROUP_TYPE, internalDb, internalConnection, fromDate, fixtures.nbTaxonGroupType()); getDataToUpdate(TuttiTable.TAXON_GROUP, internalDb, internalConnection, fromDate, fixtures.nbTaxonGroup()); @@ -354,7 +354,7 @@ updateTable(TuttiTable.LOCATION_LEVEL, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbLocationLevel(), 0); updateTable(TuttiTable.LOCATION, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbLocation(), 0); updateTable(TuttiTable.TAXONOMIC_LEVEL, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbTaxonomicLevel(), 0); - updateTable(TuttiTable.REFERENCE_TAXON, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbReferenceTaxon(), 0); + updateTable(TuttiTable.REFERENCE_TAXON, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbReferenceTaxon() + 2, 0); updateTable(TuttiTable.TAXON_NAME, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbTaxonName(), 0); updateTable(TuttiTable.TAXON_GROUP_TYPE, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbTaxonGroupType(), 0); updateTable(TuttiTable.TAXON_GROUP, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbTaxonGroup(), 0); @@ -393,7 +393,7 @@ updateTable(TuttiTable.LOCATION_LEVEL, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbLocationLevel()); updateTable(TuttiTable.LOCATION, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbLocation()); updateTable(TuttiTable.TAXONOMIC_LEVEL, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbTaxonomicLevel()); - updateTable(TuttiTable.REFERENCE_TAXON, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbReferenceTaxon()); + updateTable(TuttiTable.REFERENCE_TAXON, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbReferenceTaxon() + 2); updateTable(TuttiTable.TAXON_NAME, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbTaxonName()); updateTable(TuttiTable.TAXON_GROUP_TYPE, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbTaxonGroupType()); updateTable(TuttiTable.TAXON_GROUP, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbTaxonGroup()); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-08 22:18:45 UTC (rev 373) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-08 23:16:41 UTC (rev 374) @@ -109,11 +109,9 @@ protected void loadDecorators() { registerTuttiDecorator(Zone.class, "${label}$s#${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Program.class, "${name}$s#${zone/label}$s", SEPARATOR, " - "); registerTuttiDecorator(Cruise.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(TuttiProtocol.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${multirigAggregation}$s#${gearShootingStartDate}$td/%4$tm/%4$tY", SEPARATOR, " - "); -// registerMultiJXPathDecorator(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - "); registerTuttiDecorator(Country.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Gear.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Person.class, "${firstName}$s#${lastName}$s#${department}$s", SEPARATOR, " "); @@ -121,7 +119,7 @@ registerTuttiDecorator(Caracteristic.class, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s", SEPARATOR, " - "); // registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); registerTuttiDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); - registerTuttiDecorator(Species.class, "${refTaxCode}$s#${name}$s", SEPARATOR, " - "); +// registerTuttiDecorator(Species.class, "${refTaxCode}$s#${name}$s", SEPARATOR, " - "); // registerMultiJXPathDecorator(Species.class, SPECIES_BY_CRUISE_CODE, "${surveyCode}$s#${refTaxCode}$s#${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Species.class, SPECIES_BY_REF_TAX_CODE, "${refTaxCode}$s", SEPARATOR, " - "); registerTuttiDecorator(Species.class, SPECIES_BY_GENUS, "${name}$s", SEPARATOR, " - "); @@ -137,8 +135,10 @@ } }); registerDecorator(new VesselDecorator()); + registerDecorator(new ProgramDecorator()); registerDecorator(SPECIES_BY_CRUISE_CODE, new SpeciesDecorator()); + registerDecorator(new SimpleSpeciesDecorator()); registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); } @@ -161,7 +161,7 @@ n_("tutti.property.lastName"); n_("tutti.property.department"); n_("tutti.property.stationNumber"); - n_("tutti.property.internalRegistrationCode"); + n_("tutti.property.internationalRegistrationCode"); n_("tutti.property.date"); n_("tutti.property.program"); n_("tutti.property.parameterName"); @@ -172,6 +172,7 @@ n_("tutti.property.fishingOperation"); n_("tutti.property.fishingOperationLocation"); n_("tutti.property.zone"); + n_("tutti.property.zoneLabel"); n_("tutti.property.vessel"); n_("tutti.property.country"); n_("tutti.property.gear"); @@ -201,24 +202,60 @@ Object result = null; if ("surveyCode".equals(token)) { result = _("tutti.propety.no.species.surveyCode"); + } else if ("refTaxCode".equals(token)) { + result = _("tutti.propety.no.species.refTaxCode"); } return result; } } + public static class SimpleSpeciesDecorator extends TuttiDecorator<Species> implements Cloneable { + + private static final long serialVersionUID = 1L; + + public SimpleSpeciesDecorator() throws IllegalArgumentException, NullPointerException { + super(Species.class, "${refTaxCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); + } + + @Override + protected Object onNullValue(Species bean, String token) { + Object result = null; + if ("refTaxCode".equals(token)) { + result = _("tutti.propety.no.species.refTaxCode"); + } + return result; + } + } + public static class ProgramDecorator extends TuttiDecorator<Program> implements Cloneable { + + private static final long serialVersionUID = 1L; + + public ProgramDecorator() throws IllegalArgumentException, NullPointerException { + super(Program.class, "${name}$s#${zoneLabel}$s", DecoratorService.SEPARATOR, " - "); + } + + @Override + protected Object onNullValue(Program bean, String token) { + Object result = null; + if ("zoneLabel".equals(token)) { + result = _("tutti.propety.no.zone"); + } + return result; + } + } public static class VesselDecorator extends TuttiDecorator<Vessel> implements Cloneable { private static final long serialVersionUID = 1L; public VesselDecorator() throws IllegalArgumentException, NullPointerException { - super(Vessel.class, "${internalRegistrationCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); + super(Vessel.class, "${internationalRegistrationCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); } @Override protected Object onNullValue(Vessel bean, String token) { Object result = null; - if ("internalRegistrationCode".equals(token)) { - result = _("tutti.propety.no.vessel.internalRegistrationCode"); + if ("internationalRegistrationCode".equals(token)) { + result = _("tutti.propety.no.vessel.internationalRegistrationCode"); } else if ("name".equals(token)) { result = _("tutti.propety.no.vessel.name"); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-02-08 22:18:45 UTC (rev 373) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-02-08 23:16:41 UTC (rev 374) @@ -243,25 +243,25 @@ v = new Vessel(); v.setName("Temporary fishing vessel name 1"); - v.setInternalRegistrationCode("International registration code F1"); + v.setInternationalRegistrationCode("International registration code F1"); v.setScientificVessel(false); toExport.add(v); v = new Vessel(); v.setName("Temporary fishing vessel name 2"); - v.setInternalRegistrationCode("International registration code F2"); + v.setInternationalRegistrationCode("International registration code F2"); v.setScientificVessel(false); toExport.add(v); v = new Vessel(); v.setName("Temporary scientific vessel name 3"); - v.setInternalRegistrationCode("International registration code S3"); + v.setInternationalRegistrationCode("International registration code S3"); v.setScientificVessel(true); toExport.add(v); v = new Vessel(); v.setName("Temporary scientific vessel name 4"); - v.setInternalRegistrationCode("International registration code S4"); + v.setInternationalRegistrationCode("International registration code S4"); v.setScientificVessel(true); toExport.add(v); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-02-08 22:18:45 UTC (rev 373) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-02-08 23:16:41 UTC (rev 374) @@ -42,13 +42,13 @@ // import definition newMandatoryColumn(Vessel.PROPERTY_NAME); - newMandatoryColumn(Vessel.PROPERTY_INTERNAL_REGISTRATION_CODE); + newMandatoryColumn(Vessel.PROPERTY_INTERNATIONAL_REGISTRATION_CODE); newMandatoryColumn(Vessel.PROPERTY_SCIENTIFIC_VESSEL, Common.PRIMITIVE_BOOLEAN); // export definition newColumnForExport(Vessel.PROPERTY_NAME); - newColumnForExport(Vessel.PROPERTY_INTERNAL_REGISTRATION_CODE); + newColumnForExport(Vessel.PROPERTY_INTERNATIONAL_REGISTRATION_CODE); newColumnForExport(Vessel.PROPERTY_SCIENTIFIC_VESSEL, Common.PRIMITIVE_BOOLEAN); } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-08 22:18:45 UTC (rev 373) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-08 23:16:41 UTC (rev 374) @@ -19,7 +19,7 @@ tutti.property.fractionName=Fraction tutti.property.gear=Engin tutti.property.genusSpecies=Nom scientifique -tutti.property.internalRegistrationCode=Immatriculation internationale +tutti.property.internationalRegistrationCode=Immatriculation internationale tutti.property.label=Code tutti.property.lastName=Nom de Famille tutti.property.macroWasteCategory=Type de macro déchet @@ -39,8 +39,11 @@ tutti.property.user=Utilisateur tutti.property.vessel=Navire tutti.property.zone=Zone -tutti.propety.no.species.cruiseCode=\# -tutti.propety.no.species.surveyCode= +tutti.property.zoneLabel=Zone +tutti.propety.no.species.refTaxCode=\# +tutti.propety.no.species.surveyCode=\# tutti.propety.no.vessel.internalRegistrationCode=Immatriculation inconnu +tutti.propety.no.vessel.internationalRegistrationCode= tutti.propety.no.vessel.name=Nom inconnu +tutti.propety.no.zone=Pas de zone tutti.service.config=Configuration des services de Tutti Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-08 22:18:45 UTC (rev 373) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-08 23:16:41 UTC (rev 374) @@ -87,7 +87,7 @@ "First name 3;Last name 3;"; public static final String VESSEL_FILE_CONTENT = - "name;internalRegistrationCode;scientificVessel\n" + + "name;internationalRegistrationCode;scientificVessel\n" + "Temporary fishing vessel name 1;International registration code F1;N;\n" + "Temporary fishing vessel name 2;International registration code F2;N;\n" + "Temporary scientific vessel name 3;International registration code S3;Y;\n" + @@ -131,7 +131,7 @@ Assert.assertNotNull(actual); Assert.assertEquals("" + i, actual.getId()); Assert.assertEquals("Temporary fishing vessel name " + i, actual.getName()); - Assert.assertEquals("International registration code F" + i, actual.getInternalRegistrationCode()); + Assert.assertEquals("International registration code F" + i, actual.getInternationalRegistrationCode()); Assert.assertFalse(actual.isScientificVessel()); } for (int i = 3; i <= 4; i++) { @@ -139,7 +139,7 @@ Assert.assertNotNull(actual); Assert.assertEquals("" + i, actual.getId()); Assert.assertEquals("Temporary scientific vessel name " + i, actual.getName()); - Assert.assertEquals("International registration code S" + i, actual.getInternalRegistrationCode()); + Assert.assertEquals("International registration code S" + i, actual.getInternationalRegistrationCode()); Assert.assertTrue(actual.isScientificVessel()); } }