Project

General

Profile

« Previous | Next » 

Revision ba5dcea5

Added by Andreas Müller almost 6 years ago

ref #7334 adapt DwCA and CDM light export to new pro parte synonym handling, also add misapplied name handling to CDM light

View differences:

cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/cdmLight/out/CdmLightExportTest.java
10 10

  
11 11
import java.io.BufferedReader;
12 12
import java.io.ByteArrayInputStream;
13
import java.io.File;
14 13
import java.io.FileNotFoundException;
15 14
import java.io.IOException;
16 15
import java.io.InputStreamReader;
......
160 159
        @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="/eu/etaxonomy/cdm/database/BlankDataSet.xml")
161 160
        public void testFullTreeWithUnpublished(){
162 161

  
163

  
164 162
            CdmLightExportConfigurator config = new CdmLightExportConfigurator(null);
165 163
            config.setTarget(TARGET.EXPORT_DATA);
166 164
            config.getTaxonNodeFilter().setIncludeUnpublished(true);
......
194 192
                }
195 193
                Assert.assertTrue("There should be 1 synonym", count == 2);
196 194
            } catch (IOException e) {
197
                // TODO Auto-generated catch block
198 195
                e.printStackTrace();
196
                Assert.fail("IO Exception thrown during test.");
199 197
            }
200 198
            byte[] taxon = data.get(CdmLightExportTable.TAXON.getTableName());
201 199
            Assert.assertNotNull("Taxon table must not be null", taxon);
......
243 241
        @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="/eu/etaxonomy/cdm/database/BlankDataSet.xml")
244 242
        public void testFullData(){
245 243

  
246
            File destinationFolder = null;
247 244
            CdmLightExportConfigurator config = new CdmLightExportConfigurator(null);
248 245
            config.setTarget(TARGET.EXPORT_DATA);
249 246

  
......
270 267
                }
271 268
                Assert.assertTrue("There should be 4 references", count == 5);
272 269
                try{
273
                stream = new ByteArrayInputStream(data.get(CdmLightExportTable.SYNONYM.getTableName()));
274
                Assert.fail("There should not be a synonym table, because the only synonym is not public.");
270
                    stream = new ByteArrayInputStream(data.get(CdmLightExportTable.SYNONYM.getTableName()));
271
                    Assert.fail("There should not be a synonym table, because the only synonym is not public.");
275 272
                }catch(NullPointerException e){
276

  
273
                    //OK, should be thrown
277 274
                }
278 275

  
279 276
            } catch (IOException e) {
280
                // TODO Auto-generated catch block
281
                e.printStackTrace();
277
                throw new RuntimeException(e);
282 278
            }
283

  
284

  
285 279
        }
286 280

  
287 281
        /**
......
301 295
            TaxonName familyName = parser.parseReferencedName("Family L., Sp. Pl. 3: 22. 1752",
302 296
                    NomenclaturalCode.ICNAFP, Rank.FAMILY());
303 297
            setUuid(familyName,"e983cc5e-4c77-4c80-8cb0-73d43df31ef7");
304
            setUuid((Reference)familyName.getNomenclaturalReference(), "b0dd7f4a-0c7f-4372-bc5d-3b676363bc63");
298
            setUuid(familyName.getNomenclaturalReference(), "b0dd7f4a-0c7f-4372-bc5d-3b676363bc63");
305 299
            Taxon family = Taxon.NewInstance(familyName, sec1);
306 300
            setUuid(family,"3162e136-f2e2-4f9a-9010-3f35908fbae1");
307 301
            TaxonNode node1 = classification.addChildTaxon(family, sec1, "22");
......
311 305
            TaxonName genusName = parser.parseReferencedName("Genus Humb., The book of botany 3: 22. 1804",
312 306
                    NomenclaturalCode.ICNAFP, Rank.GENUS());
313 307
            setUuid(genusName,"5e83cc5e-4c77-4d80-8cb0-73d63df35ee3");
314
            setUuid((Reference)genusName.getNomenclaturalReference(), "5ed27f4a-6c7f-4372-bc5d-3b67636abc52");
308
            setUuid(genusName.getNomenclaturalReference(), "5ed27f4a-6c7f-4372-bc5d-3b67636abc52");
315 309
            Taxon genus = Taxon.NewInstance(genusName, sec1);
316 310
            setUuid(genus,"3f52e136-f2e1-4f9a-9010-2f35908fbd39");
317 311

  
......
323 317
            TaxonName speciesName = parser.parseReferencedName("Genus species Mill., The book of botany 3: 22. 1804",
324 318
                    NomenclaturalCode.ICNAFP, Rank.SPECIES());
325 319
            setUuid(speciesName,"f983cc5e-4c77-4c80-8cb0-73d43df31ee9");
326
            setUuid((Reference)speciesName.getNomenclaturalReference(), "a0dd7f4a-0c7f-4372-bc5d-3b676363bc0e");
320
            setUuid(speciesName.getNomenclaturalReference(), "a0dd7f4a-0c7f-4372-bc5d-3b676363bc0e");
327 321
            Taxon species = Taxon.NewInstance(speciesName, sec1);
328 322
            setUuid(species,"9182e136-f2e2-4f9a-9010-3f35908fb5e0");
329 323
            TaxonName synonymName = parser.parseReferencedName("Genus synonym Mill., The book of botany 3: 22. 1804", NomenclaturalCode.ICNAFP, Rank.SPECIES());
......
340 334
            TaxonName subspeciesName = parser.parseReferencedName("Genus species subsp. subspec Mill., The book of botany 3: 22. 1804",
341 335
                    NomenclaturalCode.ICNAFP, Rank.SUBSPECIES());
342 336
            setUuid(subspeciesName,"3483cc5e-4c77-4c80-8cb0-73d43df31ee3");
343
            setUuid((Reference)subspeciesName.getNomenclaturalReference(), "b8dd7f4a-0c7f-4372-bc5d-3b676363bc0f");
337
            setUuid(subspeciesName.getNomenclaturalReference(), "b8dd7f4a-0c7f-4372-bc5d-3b676363bc0f");
344 338

  
345 339
            Taxon subspecies = Taxon.NewInstance(subspeciesName, sec1);
346 340
            setUuid(subspecies, "b2c86698-500e-4efb-b9ae-6bb6e701d4bc");

Also available in: Unified diff