Project

General

Profile

« Previous | Next » 

Revision b9e54ec8

Added by Andreas Müller almost 8 years ago

#5960 Use abbrevTitle for reference parsing

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
412 412
        IReference nomRef = multipleAuthorRefName.getNomenclaturalReference();
413 413
        Assert.assertNotNull("nomRef must have inRef", ((Reference)nomRef).getInReference());
414 414
        Reference inRef = ((Reference)nomRef).getInReference();
415
        String title = inRef.getTitle();
416
        assertEquals("InRef title should be Sp. Pl.", "Sp. Pl.", title);
415
        String abbrevTitle = inRef.getAbbrevTitle();
416
        assertEquals("InRef title should be Sp. Pl.", "Sp. Pl.", abbrevTitle);
417 417
        assertTrue(inRef.getAuthorship() instanceof Team);
418 418
        Team team = (Team)inRef.getAuthorship();
419 419
        assertEquals(3, team.getTeamMembers().size());
......
438 438
	    nomRef = multipleAuthorName.getNomenclaturalReference();
439 439
        Assert.assertNotNull("nomRef must have inRef", ((Reference)nomRef).getInReference());
440 440
        inRef = ((Reference)nomRef).getInReference();
441
        title = inRef.getTitle();
442
        assertEquals("InRef title should be Sp. Pl.", "Sp. Pl.", title);
441
        abbrevTitle = inRef.getAbbrevTitle();
442
        assertEquals("InRef title should be Sp. Pl.", "Sp. Pl.", abbrevTitle);
443 443
        assertTrue(inRef.getAuthorship() instanceof Person);
444 444
        Person person = (Person)inRef.getAuthorship();
445 445
        assertEquals("Book author should be L.", "L.", person.getNomenclaturalTitle());
......
454 454
	    assertEquals("Second team member should be Aber", "Aber", team.getTeamMembers().get(1).getTitleCache());
455 455
	    nomRef = multipleAuthorName.getNomenclaturalReference();
456 456
        Assert.assertNull("nomRef must not have inRef as it is a book itself", ((Reference)nomRef).getInReference());
457
        title = nomRef.getTitle();
458
        assertEquals("InRef title should be Sp. Pl.", "Sp. Pl.", title);
457
        abbrevTitle = nomRef.getAbbrevTitle();
458
        assertEquals("InRef title should be Sp. Pl.", "Sp. Pl.", abbrevTitle);
459 459
        assertTrue(nomRef.getAuthorship() instanceof Team);
460 460
        team = (Team)nomRef.getAuthorship();
461 461
        assertEquals(3, team.getTeamMembers().size());
......
997 997
		assertNotNull(inBook.getAuthorship());
998 998
		assertEquals("Otto", inBook.getAuthorship().getTitleCache());
999 999
		assertEquals("Otto, Sp. Pl. 4(6)", inBook.getTitleCache());
1000
		assertEquals("Sp. Pl.", inBook.getTitle());
1000
		assertEquals("Sp. Pl.", inBook.getAbbrevTitle());
1001 1001
		assertEquals("4(6)", inBook.getVolume());
1002 1002
		assertTrue("Name author and reference author should be the same", name2.getCombinationAuthorship() == ((Reference)name2.getNomenclaturalReference()).getAuthorship());
1003 1003

  
......
1015 1015
		assertNotNull(journal);
1016 1016
		//assertEquals("Sp. Pl. 4(6)", inBook.getTitleCache());
1017 1017
		assertEquals("Sp. Pl.",((Reference) journal).getTitleCache());
1018
		assertEquals("Sp. Pl.", journal.getTitle());
1018
		assertEquals("Sp. Pl.", journal.getAbbrevTitle());
1019 1019
		assertEquals("4(6)",((IArticle)ref).getVolume());
1020 1020
		assertTrue("Name author and reference author should be the same", name3.getCombinationAuthorship() == name3.getNomenclaturalReference().getAuthorship());
1021 1021

  
......
1047 1047
		journal = ((IArticle)ref).getInJournal();
1048 1048
		assertNotNull(journal);
1049 1049
		assertEquals(journalTitle, ((Reference) journal).getTitleCache());
1050
		assertEquals(journalTitle, journal.getTitle());
1050
		assertEquals(journalTitle, journal.getAbbrevTitle());
1051 1051
		assertEquals("4(6)", ((IArticle)ref).getVolume());
1052 1052

  
1053 1053
		//Zoo name
......
1460 1460
		assertNotNull(name.getNomenclaturalReference());
1461 1461
		INomenclaturalReference ref = name.getNomenclaturalReference();
1462 1462
		assertEquals("1987", ref.getYear());
1463
		assertEquals("Sp. Pl.", ref.getTitle());
1463
		assertEquals("Sp. Pl.", ref.getAbbrevTitle());
1464 1464
	}
1465 1465

  
1466 1466

  
......
1930 1930
        assertEquals( "Nees & Mart.", combinationAuthor.getNomenclaturalTitle());
1931 1931
        nomRef = (Reference)name.getNomenclaturalReference();
1932 1932
        assertEquals(ReferenceType.Article, nomRef.getType());
1933
        assertEquals("Nova Acta Phys.-Med. Acad. Caes.\u2013Leop. Nat. Cur.", nomRef.getInReference().getTitle());
1933
        assertEquals("Nova Acta Phys.-Med. Acad. Caes.\u2013Leop. Nat. Cur.", nomRef.getInReference().getAbbrevTitle());
1934 1934
        assertEquals("12", nomRef.getVolume());
1935 1935
        assertEquals("14", name.getNomenclaturalMicroReference());
1936 1936
        assertEquals("1824", nomRef.getYear());

Also available in: Unified diff