Project

General

Profile

« Previous | Next » 

Revision 9dc896c9

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase

View differences:

cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.java
45 45 
import eu.etaxonomy.cdm.model.agent.Person;
46 46 
import eu.etaxonomy.cdm.model.molecular.DnaSample;
47 47 
import eu.etaxonomy.cdm.model.name.Rank;
48 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
48 
import eu.etaxonomy.cdm.model.name.TaxonName;
49 49 
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
50 50 
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
51 51 
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
......
145 145 
	public void testDoInvoke() {
146 146 
        boolean result = defaultImport.invoke(configurator).isSuccess();
147 147 
        assertTrue("Return value for import.invoke should be true", result);
148 
        assertEquals("Number of TaxonNames is incorrect", 2, nameService.count(TaxonNameBase.class));
148 
        assertEquals("Number of TaxonNames is incorrect", 2, nameService.count(TaxonName.class));
149 149 
        /*
150 150 
         * Classification
151 151 
         * - Cichorium
......
167 167 
		boolean result = defaultImport.invoke(configurator2).isSuccess();
168 168 
		assertTrue("Return value for import.invoke should be true", result);
169 169 

  		




  170
  
  
    
		assertEquals("Number of TaxonNames is incorrect", 4, nameService.count(TaxonNameBase.class));


  		




  171
  
  
    
		List<TaxonNameBase> listNames = nameService.list(TaxonNameBase.class, 100, 0, null, null);


  		




  
  170
  
    
		assertEquals("Number of TaxonNames is incorrect", 4, nameService.count(TaxonName.class));


  		




  
  171
  
    
		List<TaxonName> listNames = nameService.list(TaxonName.class, 100, 0, null, null);


  		




  172
  172
  
    

  		




  173
  
  
    
		for (TaxonNameBase name: listNames){


  		




  
  173
  
    
		for (TaxonName name: listNames){


  		




  174
  174
  
    
		    System.out.println(name.getTitleCache());


  		




  175
  175
  
    
		}


  		




  176
  176
  
    
		/*


  		




  ......




  210
  210
  
    

  		




  211
  211
  
    
        boolean result = defaultImport.invoke(importConfigurator).isSuccess();


  		




  212
  212
  
    
        assertTrue("Return value for import.invoke should be true", result);


  		




  213
  
  
    
        assertEquals("Number of TaxonNames is incorrect", 3, nameService.count(TaxonNameBase.class));


  		




  
  213
  
    
        assertEquals("Number of TaxonNames is incorrect", 3, nameService.count(TaxonName.class));


  		




  214
  214
  
    
        /*


  		




  215
  215
  
    
         * Classification


  		




  216
  216
  
    
         * - Campanula


  		




  ......




  247
  247
  
    
	     *   - Campanula versicolor var. tomentella Hal.


  		




  248
  248
  
    
	     */


  		




  249
  249
  
    
	    assertEquals(4, taxonNodeService.count(TaxonNode.class));


  		




  250
  
  
    
	    assertEquals(3, nameService.count(TaxonNameBase.class));


  		




  
  250
  
    
	    assertEquals(3, nameService.count(TaxonName.class));


  		




  251
  251
  
    
	    assertEquals(1, occurrenceService.count(DerivedUnit.class));


  		




  252
  252
  
    
	    boolean varietyFound = false;


  		




  253
  
  
    
	    for(TaxonNameBase<?, ?> name:nameService.list(TaxonNameBase.class, null, null, null, null)){


  		




  
  253
  
    
	    for(TaxonName<?, ?> name:nameService.list(TaxonName.class, null, null, null, null)){


  		




  254
  254
  
    
	        if(name.getRank().equals(Rank.VARIETY())){


  		




  255
  255
  
    
	            varietyFound = true;


  		




  256
  256
  
    
	        }


  		




  ......




  280
  280
  
    
	    String nonPreferredNameCache = "Campanula flagellaris";


  		




  281
  281
  
    
	    String preferredNameCache = "Campanula tymphaea";


  		




  282
  282
  
    
	    //Campanula, "Campanula tymphaea Hausskn.", "Campanula flagellaris Halácsy"


  		




  283
  
  
    
	    assertEquals(3, nameService.count(TaxonNameBase.class));


  		




  
  283
  
    
	    assertEquals(3, nameService.count(TaxonName.class));


  		




  284
  284
  
    
	    /*


  		




  285
  285
  
    
	     * Classification


  		




  286
  286
  
    
	     *  - Campanula


  		




  ......




  560
  560
  
    
//                    "DescriptionBase",


  		




  561
  561
  
    
//                    "TaxonBase",


  		




  562
  562
  
    
//                    "TypeDesignationBase",


  		




  563
  
  
    
//                    "TaxonNameBase",


  		




  564
  
  
    
//                    "TaxonNameBase_TypeDesignationBase",


  		




  
  563
  
    
//                    "TaxonName",


  		




  
  564
  
    
//                    "TaxonName_TypeDesignationBase",


  		




  565
  565
  
    
//                    "HomotypicalGroup",


  		




  566
  566
  
    
//                    "AgentBase",


  		




  567
  567
  
    
//                    "AgentBase_AgentBase",


  		




  ......




  737
  737
  
    
                    "DescriptionBase",


  		




  738
  738
  
    
                    "TaxonBase",


  		




  739
  739
  
    
                    "TypeDesignationBase",


  		




  740
  
  
    
                    "TaxonNameBase",


  		




  741
  
  
    
                    "TaxonNameBase_TypeDesignationBase",


  		




  
  740
  
    
                    "TaxonName",


  		




  
  741
  
    
                    "TaxonName_TypeDesignationBase",


  		




  742
  742
  
    
                    "HomotypicalGroup",


  		




  743
  743
  
    
                    "AgentBase",


  		




  744
  744
  
    
                    "AgentBase_AgentBase",


  		












Also available in:  Unified diff