Project

General

Profile

« Previous | Next » 

Revision bf3b1132

Added by Andreas Müller almost 4 years ago

ref #9071, ref #6276 Change TimePeriodFormatting to YYYY-MMM-DD

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TimePeriodTest.java
26 26 
import org.junit.Before;
27 27 
import org.junit.Test;
28 28 

  		




  29
  
  
    
import eu.etaxonomy.cdm.strategy.cache.common.TimePeriodPartialFormatter;


  		




  
  29
  
    
import eu.etaxonomy.cdm.common.UTF8;


  		




  30
  30
  
    
import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;


  		




  31
  31
  
    

  		




  32
  32
  
    
/**


  		




  ......




  110
  110
  
    
		startAndEndYear = TimePeriod.NewInstance(1931, 1957);


  		




  111
  111
  
    
		assertEquals(Integer.valueOf(1957), startAndEndYear.getEndYear());


  		




  112
  112
  
    
		assertEquals(Integer.valueOf(1931), startAndEndYear.getStartYear());


  		




  113
  
  
    
		assertEquals("1931-1957", startAndEndYear.getYear());


  		




  
  113
  
    
		assertEquals("1931"+TimePeriod.SEP+"1957", startAndEndYear.getYear());


  		




  114
  114
  
    
	}


  		




  115
  115
  
    

  		




  116
  116
  
    
	/**


  		




  ......




  304
  304
  
    
		tp.setStartYear(1999);


  		




  305
  305
  
    
		Assert.assertEquals("Year should be 1999", "1999", tp.getYear());


  		




  306
  306
  
    
		tp.setEndYear(2002);


  		




  307
  
  
    
		Assert.assertEquals("Year should be 1999-2002", "1999-2002", tp.getYear());


  		




  
  307
  
    
		Assert.assertEquals("Year should be 1999-2002", "1999"+TimePeriod.SEP+"2002", tp.getYear());


  		




  308
  308
  
    
		tp.setContinued(true);


  		




  309
  309
  
    
		Assert.assertEquals("Year should be 1999+", "1999+", tp.getYear());


  		




  310
  310
  
    
	}


  		




  ......




  315
  315
  
    
	 */


  		




  316
  316
  
    
	@Test


  		




  317
  317
  
    
	public void testToStringTimePeriod() {


  		




  318
  
  
    
		TimePeriod tp1 = TimePeriod.NewInstance(1788,1799);


  		




  
  318
  
    
		String endash = UTF8.EN_DASH.toString();


  		




  
  319
  
    
	    TimePeriod tp1 = TimePeriod.NewInstance(1788,1799);


  		




  319
  320
  
    
		assertNotNull(tp1);


  		




  320
  
  
    
		Assert.assertEquals("1788-1799", tp1.toString());


  		




  
  321
  
    
		Assert.assertEquals("1788"+endash+"1799", tp1.toString());


  		




  321
  322
  
    
		tp1.setStartDay(3);


  		




  322
  
  
    
		Assert.assertEquals("3.xx.1788-1799", tp1.toString());


  		




  
  323
  
    
		Assert.assertEquals("1788 MMM 3"+endash+"1799", tp1.toString());


  		




  323
  324
  
    
		tp1.setEndMonth(11);


  		




  324
  
  
    
		Assert.assertEquals("3.xx.1788-11.1799", tp1.toString());


  		




  
  325
  
    
		Assert.assertEquals("1788 MMM 3"+endash+"1799 Nov", tp1.toString());


  		




  325
  326
  
    
		tp1.setContinued(true);


  		




  326
  
  
    
		Assert.assertEquals("3.xx.1788+", tp1.toString());


  		




  
  327
  
    
		Assert.assertEquals("1788 MMM 3+", tp1.toString());


  		




  327
  328
  
    

  		




  328
  329
  
    
		tp1 = TimePeriod.NewInstance(1788,1799);


  		




  329
  330
  
    
		tp1.setContinued(true);


  		












Also available in:  Unified diff