Project

General

Profile

« Previous | Next » 

Revision e6d7b501

Added by Andreas Müller almost 7 years ago

ref #6368 remove TaxonNameBase subclasses

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
60 60
import eu.etaxonomy.cdm.model.description.TextData;
61 61
import eu.etaxonomy.cdm.model.location.Country;
62 62
import eu.etaxonomy.cdm.model.location.NamedArea;
63
import eu.etaxonomy.cdm.model.name.BotanicalName;
63
import eu.etaxonomy.cdm.model.name.IBotanicalName;
64 64
import eu.etaxonomy.cdm.model.name.Rank;
65
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
65 66
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
66 67
import eu.etaxonomy.cdm.model.reference.Reference;
67 68
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
......
635 636
        t_abies_balsamea.addDescription(d_abies_balsamea_new);
636 637
        // set authorshipCache to null to avoid validation exception,
637 638
        // this is maybe not needed in future,  see ticket #3344
638
        BotanicalName abies_balsamea = HibernateProxyHelper.deproxy(t_abies_balsamea.getName(), BotanicalName.class);
639
        IBotanicalName abies_balsamea = CdmBase.deproxy(t_abies_balsamea.getName(), TaxonNameBase.class);
639 640
        abies_balsamea.setAuthorshipCache(null);
640 641
        printDataSet(System.err, new String[] {"LANGUAGESTRING_AUD"});
641 642
        taxonService.saveOrUpdate(t_abies_balsamea);
......
1271 1272
        referenceService.save(sec);
1272 1273
        referenceService.save(sec_sensu);
1273 1274

  
1274
        BotanicalName n_abies = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
1275
        IBotanicalName n_abies = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
1275 1276
        n_abies.setNameCache("Abies", true);
1276 1277
        Taxon t_abies = Taxon.NewInstance(n_abies, sec);
1277 1278
        taxonService.save(t_abies);
1278 1279

  
1279
        BotanicalName n_abies_alba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1280
        IBotanicalName n_abies_alba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1280 1281
        n_abies_alba.setNameCache("Abies alba", true);
1281 1282
        Taxon t_abies_alba = Taxon.NewInstance(n_abies_alba, sec);
1282 1283
        t_abies_alba.setUuid(UUID.fromString(ABIES_ALBA_UUID));
1283 1284
        taxonService.save(t_abies_alba);
1284 1285

  
1285
        BotanicalName n_abies_subalpina = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1286
        IBotanicalName n_abies_subalpina = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1286 1287
        n_abies_subalpina.setNameCache("Abies subalpina", true);
1287 1288
        Synonym s_abies_subalpina = Synonym.NewInstance(n_abies_subalpina, sec);
1288 1289
        taxonService.save(s_abies_subalpina);
1289 1290

  
1290
        BotanicalName n_abies_balsamea = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1291
        IBotanicalName n_abies_balsamea = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1291 1292
        n_abies_balsamea.setNameCache("Abies balsamea", true);
1292 1293
        Taxon t_abies_balsamea = Taxon.NewInstance(n_abies_balsamea, sec);
1293 1294
        t_abies_balsamea.setUuid(UUID.fromString(ABIES_BALSAMEA_UUID));
1294 1295
        t_abies_balsamea.addSynonym(s_abies_subalpina, SynonymType.SYNONYM_OF());
1295 1296
        taxonService.save(t_abies_balsamea);
1296 1297

  
1297
        BotanicalName n_abies_grandis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1298
        IBotanicalName n_abies_grandis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1298 1299
        n_abies_grandis.setNameCache("Abies grandis", true);
1299 1300
        Taxon t_abies_grandis = Taxon.NewInstance(n_abies_grandis, sec);
1300 1301
        taxonService.save(t_abies_grandis);
1301 1302

  
1302
        BotanicalName n_abies_kawakamii = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1303
        IBotanicalName n_abies_kawakamii = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1303 1304
        n_abies_kawakamii.setNameCache("Abies kawakamii", true);
1304 1305
        Taxon t_abies_kawakamii = Taxon.NewInstance(n_abies_kawakamii, sec);
1305 1306
        t_abies_kawakamii.getTitleCache();
......
1311 1312
        t_abies_kawakamii_sensu_komarov.addTaxonRelation(t_abies_balsamea, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null);
1312 1313
        taxonService.saveOrUpdate(t_abies_kawakamii_sensu_komarov);
1313 1314

  
1314
        BotanicalName n_abies_lasiocarpa = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1315
        IBotanicalName n_abies_lasiocarpa = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1315 1316
        n_abies_lasiocarpa.setNameCache("Abies lasiocarpa", true);
1316 1317
        Taxon t_abies_lasiocarpa = Taxon.NewInstance(n_abies_lasiocarpa, sec);
1317 1318
        taxonService.save(t_abies_lasiocarpa);
......
1428 1429
            String radomName = RandomStringUtils.randomAlphabetic(5) + " " + RandomStringUtils.randomAlphabetic(10);
1429 1430
            String radomCommonName = RandomStringUtils.randomAlphabetic(10);
1430 1431

  
1431
            BotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1432
            IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1432 1433
            name.setNameCache(radomName, true);
1433 1434
            Taxon taxon = Taxon.NewInstance(name, sec);
1434 1435
            taxonService.save(taxon);

Also available in: Unified diff