Project

General

Profile

Revision 1b1c2bc9

ID1b1c2bc9466b6d6a012872d87f00dddf27a3ba07
Parent 44707ee3
Child ee5d420b

Added by Andreas Kohlbecker over 2 years ago

ref #4372 page elementd DupalBlock and FeatureBlock compatible also with zen theme

View differences:

src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_CommonNamesTest.java
61 61
         * AQ. Komarov, V. L., Flora SSSR 29. 1964 (as Lactuca altaica),
62 62
         * AR. Komarov, V. L., Flora SSSR 29. 1964,
63 63
        */
64
        WebElement northCaucasus = distributionBlock.getContent().findElement(By.className("descriptionElement617733b9-d59d-4215-9e77-728a5f60e627"));
64
        WebElement northCaucasus = distributionBlock.getElement().findElement(By.className("descriptionElement617733b9-d59d-4215-9e77-728a5f60e627"));
65 65
        assertEquals("North CaucasusAN,AO,AP,AQ,AR", northCaucasus.getText());
66 66
        assertEquals("AN. Galuško, A. I., Flora severnogo Kavkaza 3. 1980", distributionBlock.getFootNote(39).getText());
67 67
        assertEquals("AO. Galuško, A. I., Flora severnogo Kavkaza 3. 1980 (as Lactuca altaica)", distributionBlock.getFootNote(40).getText());
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/Allium_guttatum_subsp_guttatum_TaxonProfileTest.java
104 104
        featureBlock = p.getFeatureBlockAt(4, "distribution", "div", "span");
105 105

  
106 106
        assertEquals("Distribution\nDivision 2A,B\nA. R. D. Meikle, Flora of Cyprus 2. 1985, B. R. Hand, Supplementary notes to the flora of Cyprus VI. in Willdenowia 39. 2009", featureBlock.getText());
107
        assertEquals("Distribution", featureBlock.getHeader());
107
        assertEquals("Distribution", featureBlock.getHeaderText());
108 108
        assertEquals("expecting two footnote keys", 2, featureBlock.countFootNoteKeys());
109 109

  
110 110
//        ------- prepared for  bibliography ---------
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/Bassia_indica_TaxonProfileTest.java
81 81
                + "Division 5B\n"
82 82
                + "Division 6C\n"
83 83
                + "The record for division 5 may refer to division 6.\nA. J. Chrtek & B. Slavík, Contribution to the flora of Cyprus. 4. in Fl. Medit. 10. 2001, B. A. Della & G. Iatrou, New plant records from Cyprus in Kew Bull. 50. 1995, C. R. Hand, Supplementary notes to the flora of Cyprus III. in Willdenowia 33. 2003", featureBlock.getText());
84
        assertEquals("Distribution", featureBlock.getHeader());
84
        assertEquals("Distribution", featureBlock.getHeaderText());
85 85
        assertEquals("expecting two footnote keys", 3, featureBlock.countFootNoteKeys());
86 86

  
87 87
//        ------- prepared for  bibliography ---------
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/Cyprus_OriginalSourceTest.java
76 76
        p.testTableOfContentEntry(tocIndex++, "Distribution", "distribution");
77 77

  
78 78
        FeatureBlock featureBlock = p.getFeatureBlockAt(2, "chromosome-numbers", "ul", "li");
79
        assertEquals("Chromosome numbers", featureBlock.getHeader());
79
        assertEquals("Chromosome numbers", featureBlock.getHeaderText());
80 80

  
81 81
        // see  #2288 (Cyprus: ChromosomeNumbers: formating nameInSource)
82 82
        assertEquals("Chromosome numbers\n2n = 18 (B. Slavík & V. Jarolímová & J. Chrtek, Chromosome counts of some plants from Cyprus in Candollea 48. 1993 (as Cistus creticus L.)) (B. Slavík & V. Jarolímová & J. Chrtek, Chromosome counts of some plants from Cyprus. 2 in Acta Univ. Carol., Biol. 46. 2002 (as Cistus creticus L.))", featureBlock.getText());
src/test/java/eu/etaxonomy/dataportal/selenium/tests/palmae/Calamus_acanthospathus_TaxonProfileTest.java
108 108
        FeatureBlock featureBlockDistribution = p.getFeatureBlockAt(featureId, featureClass, "div", "span");
109 109

  
110 110
        assertEquals(featureLabel, featureBlockDistribution.getTitle().getText());
111
        assertEquals(contentTextFull, featureBlockDistribution.getContent().getText().trim());
111
        assertEquals(contentTextFull, featureBlockDistribution.getContentText().trim());
112 112

  
113 113
        featureBlockDistribution.testDescriptionElementLayout(0, indent, descriptionElementFontSize, expectedCssDisplay, expectedListStyleType, expectedListStylePosition, expectedListStyleImage);
114 114
        assertEquals(1, featureBlockDistribution.getOriginalSourcesSections().size());
src/test/java/eu/etaxonomy/dataportal/selenium/tests/palmae/Iriartea_deltoidea_UsesTest.java
93 93
        FeatureBlock featureBlockDistribution = p.getFeatureBlockAt(featureId, featureClass, "div", "span");
94 94

  
95 95
        assertEquals(featureLabel, featureBlockDistribution.getTitle().getText());
96
        assertEquals(blockTextFull, featureBlockDistribution.getContent().getText().trim());
96
        assertEquals(blockTextFull, featureBlockDistribution.getContentText().trim());
97 97

  
98 98
        featureBlockDistribution.testDescriptionElementLayout(0, indent, descriptionElementFontSize, expectedCssDisplay, expectedListStyleType, expectedListStylePosition, expectedListStyleImage);
99 99

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/reference/DescriptionElementsTest.java
12 12
import java.util.UUID;
13 13

  
14 14
import org.junit.Before;
15
import org.junit.Ignore;
16 15
import org.junit.Test;
17 16

  
18 17
import eu.etaxonomy.dataportal.DataPortalSite;
......
46 45
     *
47 46
     */
48 47
    @Test
49
    @Ignore
50 48
    public void tesIssue3616() throws MalformedURLException {
51 49

  
52 50

  

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)