Project

General

Profile

« Previous | Next » 

Revision 0ac7ad4a

Added by Fabian Reimeier about 6 years ago

ref #7101 using uppercase column names to fix HSQLDB tests and enabled testSynonyms test

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/container/LeafNodeTaxonContainer.java
42 42
    private static final Logger logger = Logger.getLogger(LeafNodeTaxonContainer.class);
43 43

  
44 44

  
45
    public static final String NAME_ID = "Name";
46
    public static final String ACCTAXON_ID = "AccTaxonId";
47
    public static final String PB_ID = "Pb";
48
    public static final String FN_ID = "Fn";
49
    public static final String UNP_ID = "Unp";
50
    public static final String UNR_ID = "Unr";
51
    public static final String RANK_ID = "Rank";
52
    public static final String HAS_SYN_ID = "HasSynonyms";
45
    public static final String NAME_ID = "NAME";
46
    public static final String ACCTAXON_ID = "ACCTAXON";
47
    public static final String PB_ID = "PB";
48
    public static final String FN_ID = "FN";
49
    public static final String UNP_ID = "UNP";
50
    public static final String UNR_ID = "UNR";
51
    public static final String RANK_ID = "RANK";
52
    public static final String HAS_SYN_ID = "HASSYN";
53 53

  
54 54
    public Set<Filter> currentFilters;
55 55

  
src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java
36 36

  
37 37

  
38 38
	public static final String DTYPE_COLUMN = "DTYPE";
39
	public static final String ID_COLUMN = "id";
40
	public static final String UUID_COLUMN = "uuid";
41
	public static final String CLASSIFICATION_COLUMN = "classification";
42
	public static final String RANK_COLUMN = "Rang";
43
	public static final String TAXON_COLUMN = "Taxon";
44

  
45
    public static final String ID = "id";
46
    public static final String UUID_ID = "uuid";
39
	public static final String ID_COLUMN = "ID";
40
	public static final String UUID_COLUMN = "UUID";
41
	public static final String CLASSIFICATION_COLUMN = "CLASSIFICATION";
42
	public static final String RANK_COLUMN = "RANK";
43
	public static final String TAXON_COLUMN = "TAXON";
44

  
45
    public static final String ID = "ID";
46
    public static final String UUID_ID = "UUID";
47 47

  
48 48
    public static QueryDelegate generateTaxonTreeQuery(String name_id, String classificationId)  {
49 49
        String FROM_QUERY = " FROM TaxonBase tb " +
src/test/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.java
74 74
    }
75 75

  
76 76
    @Test
77
    @Ignore
78 77
    public void testSynonyms() throws SQLException {
79 78

  
80 79
        LeafNodeTaxonContainer container = sp.loadTaxa(11);

Also available in: Unified diff