Revision bf3b1132
Added by Andreas Müller almost 4 years ago
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/VerbatimTimePeriodTest.java | ||
---|---|---|
25 | 25 |
import org.junit.Before; |
26 | 26 |
import org.junit.Test; |
27 | 27 |
|
28 |
import eu.etaxonomy.cdm.strategy.cache.common.TimePeriodPartialFormatter; |
|
28 |
import eu.etaxonomy.cdm.common.UTF8; |
|
29 |
import eu.etaxonomy.cdm.format.common.TimePeriodPartialFormatter; |
|
29 | 30 |
import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser; |
30 | 31 |
|
31 | 32 |
/** |
... | ... | |
45 | 46 |
private static final Integer month = 1; |
46 | 47 |
private static final Integer day = 5; |
47 | 48 |
|
49 |
private static final String SEP = TimePeriod.SEP; |
|
50 |
|
|
48 | 51 |
@Before |
49 | 52 |
public void setUp() throws Exception { |
50 | 53 |
onlyStartYear = VerbatimTimePeriod.NewVerbatimInstance(1922); |
... | ... | |
107 | 110 |
startAndEndYear = VerbatimTimePeriod.NewVerbatimInstance(1931, 1957); |
108 | 111 |
assertEquals(Integer.valueOf(1957), startAndEndYear.getEndYear()); |
109 | 112 |
assertEquals(Integer.valueOf(1931), startAndEndYear.getStartYear()); |
110 |
assertEquals("1931-1957", startAndEndYear.getYear());
|
|
113 |
assertEquals("1931"+SEP+"1957", startAndEndYear.getYear());
|
|
111 | 114 |
} |
112 | 115 |
|
113 | 116 |
/** |
... | ... | |
300 | 303 |
tp.setStartYear(1999); |
301 | 304 |
Assert.assertEquals("Year should be 1999", "1999", tp.getYear()); |
302 | 305 |
tp.setEndYear(2002); |
303 |
Assert.assertEquals("Year should be 1999-2002", "1999-2002", tp.getYear());
|
|
306 |
Assert.assertEquals("Year should be 1999-2002", "1999"+SEP+"2002", tp.getYear());
|
|
304 | 307 |
} |
305 | 308 |
|
306 | 309 |
|
... | ... | |
309 | 312 |
*/ |
310 | 313 |
@Test |
311 | 314 |
public void testToStringTimePeriod() { |
315 |
String endash = UTF8.EN_DASH.toString(); |
|
312 | 316 |
VerbatimTimePeriod tp1 = VerbatimTimePeriod.NewVerbatimInstance(1788,1799); |
313 | 317 |
assertNotNull(tp1); |
314 |
Assert.assertEquals("1788-1799", tp1.toString());
|
|
318 |
Assert.assertEquals("1788"+endash+"1799", tp1.toString());
|
|
315 | 319 |
tp1.setStartDay(3); |
316 |
Assert.assertEquals("3.xx.1788-1799", tp1.toString());
|
|
320 |
Assert.assertEquals("1788 MMM 3"+endash+"1799", tp1.toString());
|
|
317 | 321 |
tp1.setEndMonth(11); |
318 |
Assert.assertEquals("3.xx.1788-11.1799", tp1.toString());
|
|
322 |
Assert.assertEquals("1788 MMM 3"+endash+"1799 Nov", tp1.toString());
|
|
319 | 323 |
} |
320 | 324 |
|
321 | 325 |
|
Also available in: Unified diff
ref #9071, ref #6276 Change TimePeriodFormatting to YYYY-MMM-DD