From c13b20b489a21c71bedb27299d59c22fff07b688 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Tue, 23 Aug 2016 10:17:44 +0200 Subject: [PATCH] revert the changes in representation of rank infraspecific unranked --- cdmlib-model/src/main/resources/terms/Rank.csv | 2 +- .../cache/name/NonViralNameDefaultCacheStrategyTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cdmlib-model/src/main/resources/terms/Rank.csv b/cdmlib-model/src/main/resources/terms/Rank.csv index 21e6b14332..4bcda9ca0b 100644 --- a/cdmlib-model/src/main/resources/terms/Rank.csv +++ b/cdmlib-model/src/main/resources/terms/Rank.csv @@ -60,7 +60,7 @@ "bed20aee-2f5a-4635-9c02-eff06246d067",,"Special Form","Special Form","f.spec.","IS" "47cfc5b0-0fb7-4ceb-b61d-e1dd8de8b569",,"Subform","Subform","subf.","IS" "1c8ac389-4349-4ae0-87be-7239f6635068",,"Subsubform","Subsubform",,"IS" -"eb75c27d-e154-4570-9d96-227b2df60474",,"Unranked (infraspecific)","`Unranked� Infraspecific Rank: The infraspecific name on purpose has no rank","[unranked]","IS" +"eb75c27d-e154-4570-9d96-227b2df60474",,"Unranked (infraspecific)","`Unranked� Infraspecific Rank: The infraspecific name on purpose has no rank","[infraspec.]","IS" "ead9a1f5-dfd4-4de2-9121-70a47accb10b",,"Candidate","Candidate",,"IS" "49bdf74a-2170-40ed-8be2-887a0db517bf",,"Denomination Class","Denomination Class",,"IS" "08dcb4ff-ac58-48a3-93af-efb3d836ac84",,"Grex","Grex","grex","IS" diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java index d5d511ae70..7205cc98c0 100644 --- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java +++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java @@ -172,7 +172,7 @@ public class NonViralNameDefaultCacheStrategyTest extends NameCacheStrategyTestB unrankedName.setSpecificEpithet("species"); unrankedCache = strategy.getNameCache(unrankedName); - Assert.assertEquals("Correct unranked cache expected", "Genus species [unranked] infraspecific", unrankedCache); + Assert.assertEquals("Correct unranked cache expected", "Genus species [infraspec.] infraspecific", unrankedCache); //infrageneric unrankedName.setRank(Rank.INFRAGENERICTAXON()); -- 2.34.1