Project

General

Profile

« Previous | Next » 

Revision 292b1ebe

Added by Andreas Kohlbecker over 3 years ago

ref #7599, ref #7599 specimen tree view: fixing bug and adapting test

View differences:

modules/cdm_dataportal/includes/occurrences.inc
1324 1324

  
1325 1325
                    /* ---- SpecimenOrObservationBase --- */
1326 1326
                    case 'derivationEvent':
1327
                        @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $value, NULL, 1);
1327
                        @_description_list_group_add($groups, 'Gathering type:', ucfirst($value->derivationEventType), NULL, 1);
1328 1328
                        break;
1329 1329
                    case 'kindOfUnit':
1330 1330
                        @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $value, NULL, 1);
......
1332 1332
                    case 'accessionNumber':
1333 1333
                        @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $value, NULL, 0);
1334 1334
                        break;
1335

  
1336 1335
                    case 'preferredStableUri':
1337

  
1338 1336
                        @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), array(array('#markup' => cdm_external_uri($value, false))));
1339 1337
                        break;
1340

  
1341 1338
                    case 'specimenTypeDesignations':
1342 1339
                        @_description_list_group_add(
1343 1340
                            $groups,
src/test/java/eu/etaxonomy/dataportal/selenium/tests/reference/SpecimensTreeViewTest.java
16 16
import org.apache.log4j.Level;
17 17
import org.apache.log4j.Logger;
18 18
import org.junit.Before;
19
import org.junit.Ignore;
20 19
import org.junit.Test;
21 20
import org.openqa.selenium.By;
22 21
import org.openqa.selenium.WebElement;
......
55 54
    }
56 55

  
57 56
    @Test
58
    @Ignore // see #9234
57
    //@Ignore
59 58
    public void test1() throws MalformedURLException {
60 59
        TaxonPage p = new TaxonPage(driver, getContext(), glenodinium_apiculatum_t, "specimens");
61 60
        WebElement specimensTable = p.getDataPortalContent().getElement().findElement(By.cssSelector("#specimens table.derivate_tree"));
......
93 92
        assertEquals("2017E68", dl2.joinedDescriptionElementText("Accession number:"));
94 93
        assertEquals("\nCode:\nCEDiT", dl2.joinedDescriptionElementText("Collection"));
95 94
        assertEquals("Specimen", dl2.joinedDescriptionElementText("Kind of unit:"));
95
        assertEquals("Gathering in-situ", dl2.joinedDescriptionElementText("Gathering type:"));
96 96
        assertEquals("Epitype (designated by Kretschmann, J., Žerdoner ?alasan, A. & Kusber, W.-H. 20171): Germany, Berlin, 52°31'1.2\"N, 13°21'E, 28 Mar 2016, D047 (CEDiT 2017E68).",
97 97
                dl2.joinedDescriptionElementText("Specimen type designations:"));
98 98
        DescriptionElement specimenTypeDesignation_dd = dl2.getDescriptionGroups().get("Specimen type designations:").get(0);
......
125 125
        assertEquals("M-0289351", dl2.joinedDescriptionElementText("Accession number:"));
126 126
        assertEquals("\nCode:\nM", dl2.joinedDescriptionElementText("Collection"));
127 127
        assertEquals("Specimen", dl2.joinedDescriptionElementText("Kind of unit:"));
128
        assertEquals("Gathering in-situ", dl2.joinedDescriptionElementText("Gathering type:"));
128 129
        assertEquals("Isolectotype (designated by Kretschmann, J., Žerdoner ?alasan, A. & Kusber, W.-H. 20172): Germany, Berlin, 52°31'1.2\"N, 13°21'E, 28 Mar 2016, D047 (M M-0289351). http://herbarium.bgbm.org/object/B400042045",
129 130
                dl2.joinedDescriptionElementText("Specimen type designations:"));
130 131
        specimenTypeDesignationLinks = dl2.getDescriptionGroups().get("Specimen type designations:").get(0).getDescriptionElementContent().getLinksInElement();

Also available in: Unified diff