Project

General

Profile

« Previous | Next » 

Revision e3a4a3ff

Added by Andreas Müller almost 7 years ago

ref #6446 merge taxon name subclasses in TaxEditor

View differences:

eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
27 27
import eu.etaxonomy.cdm.model.agent.Person;
28 28
import eu.etaxonomy.cdm.model.agent.Team;
29 29
import eu.etaxonomy.cdm.model.common.CdmBase;
30
import eu.etaxonomy.cdm.model.name.BotanicalName;
31
import eu.etaxonomy.cdm.model.name.NonViralName;
32
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
30
import eu.etaxonomy.cdm.model.name.IBotanicalName;
31
import eu.etaxonomy.cdm.model.name.INonViralName;
32
import eu.etaxonomy.cdm.model.name.TaxonName;
33 33
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
34 34
import eu.etaxonomy.cdm.model.taxon.Taxon;
35 35
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
......
93 93
            String taxonTitle = taxon.getTitleCache();
94 94
            logger.info("Taxon : " + taxonTitle);
95 95

  
96
            TaxonNameBase name = taxon.getName();
96
            TaxonName name = taxon.getName();
97 97
            Assert.assertNotNull(name);
98 98

  
99 99
            String nameTitle = name.getTitleCache();
......
141 141

  
142 142
        Team combAuthor = Team.NewInstance();
143 143
        combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
144
        BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
144
        IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
145 145
        name.setCombinationAuthorship(combAuthor);
146 146
        Taxon taxon = Taxon.NewInstance(name, null);
147 147
        UUID taxonUuid = taxonService.save(taxon).getUuid();
......
163 163
                "name"
164 164
        });
165 165
        Taxon taxonNew = (Taxon)taxonService.findTaxonByUuid(taxonUuid,TAXON_INIT_STRATEGY);
166
        NonViralName nvn = CdmBase.deproxy(taxonNew.getName(),NonViralName.class);
166
        TaxonName nvn = CdmBase.deproxy(taxonNew.getName());
167 167
        Team team = CdmBase.deproxy(nvn.getCombinationAuthorship(),Team.class);
168 168
        String oldTitleCache = nvn.getTitleCache();
169 169
        System.out.println("Taxon Name Title : " + oldTitleCache);
......
177 177
    public void testCDMEntitySaveLazy() {
178 178
        Taxon taxon = (Taxon)taxonService.find(taxonUuid1);
179 179

  
180
        NonViralName nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
180
        INonViralName nvn = CdmBase.deproxy(taxon.getName());
181 181
        String oldTitleCache = nvn.getTitleCache();
182 182
        System.out.println("Taxon Name Title : " + oldTitleCache);
183 183
        nvn.setTitleCache(oldTitleCache + ":updated", true);
......
203 203
    public void testCDMEntitySaveLazyNew() {
204 204
        Team combAuthor = Team.NewInstance();
205 205
        combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
206
        BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
206
        IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
207 207
        name.setCombinationAuthorship(combAuthor);
208 208
        Taxon tax1 = Taxon.NewInstance(name, null);
209 209
        UUID taxonUuid1 = taxonService.save(tax1).getUuid();
210 210

  
211 211
        Taxon taxon = (Taxon)taxonService.find(taxonUuid1);
212 212

  
213
        NonViralName nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
213
        INonViralName nvn = CdmBase.deproxy(taxon.getName());
214 214
        String oldTitleCache = nvn.getTitleCache();
215 215
        logger.info("Taxon Name Title : " + oldTitleCache);
216 216
        nvn.setTitleCache(oldTitleCache + ":updated",false);
217 217
        taxonService.update(taxon);
218 218

  
219 219
        Taxon taxonNew = (Taxon)taxonService.find(taxonUuid1);
220
        NonViralName nvnNew = CdmBase.deproxy(taxon.getName(),NonViralName.class);
220
        INonViralName nvnNew = CdmBase.deproxy(taxon.getName());
221 221
        logger.info("New Taxon Name Title : " + nvnNew.getTitleCache());
222 222

  
223 223
        Assert.assertTrue("Title caches should not be equal",oldTitleCache.equals(nvnNew.getTitleCache()));
......
226 226
        taxonService.update(taxon);
227 227

  
228 228
        Taxon taxonOld = (Taxon)taxonService.find(taxonUuid1);
229
        NonViralName nvnOld = CdmBase.deproxy(taxon.getName(),NonViralName.class);
229
        INonViralName nvnOld = CdmBase.deproxy(taxon.getName());
230 230
        logger.info("Old Taxon Name Title : " + nvnNew.getTitleCache());
231 231

  
232 232
        Assert.assertEquals("Title caches should be equal",oldTitleCache,nvnOld.getTitleCache());

Also available in: Unified diff