Project

General

Profile

« Previous | Next » 

Revision 29796987

Added by Andreas Kohlbecker over 2 years ago

ref #4372 detection of main portal page content for zen and garland theme

View differences:

src/main/java/eu/etaxonomy/dataportal/pages/PortalPage.java
85 85

  
86 86
    // ==== WebElements === //
87 87

  
88
    @FindBy(id = "content")
89
    protected WebElement mainContentZen;
90

  
91
    @FindBy(id = "contento")
92
    protected WebElement mainContentGarland;
93

  
94
//    @FindBy(tagName="title")
95
//    @CacheLookup
96
//    protected WebElement title;
88
    protected BaseElement mainContent = null;
97 89

  
98 90
    @FindBy(className="node")
99 91
    protected WebElement node;
......
113 105

  
114 106
    private Boolean isZenTheme;
115 107

  
116
    private BaseElement mainContentBaseElement;
117 108

  
118 109
    public boolean isZenTheme() {
119 110
        if(isZenTheme == null) {
......
391 382
     * @return the main content div
392 383
     */
393 384
    public BaseElement getDataPortalContent() {
394
        return new BaseElement(mainContent());
395
    }
396

  
397

  
398
    protected WebElement mainContent() {
399
        WebElement mainContent;
400
        if(isZenTheme()) {
401
            mainContent = mainContentZen;
402
        } else {
403
            // fallback to garland
404
            mainContent = mainContentGarland;
385
        if(mainContent == null) {
386
            if(isZenTheme()) {
387
                mainContent = new BaseElement(driver.findElement(By.id("content")));
388
            } else {
389
                // fallback to garland
390
                mainContent = new BaseElement(driver.findElement(By.id("squeeze")));
391
            }
405 392
        }
406 393
        return mainContent;
407 394
    }
src/main/java/eu/etaxonomy/dataportal/pages/TaxonPage.java
76 76
    }
77 77

  
78 78
    public List<WebElement> getTaxonNodeStatusContainer() {
79
        List<WebElement> taxonNodeStatus = mainContent().findElements(By.className("taxon-node-status"));
79
        List<WebElement> taxonNodeStatus = getDataPortalContent().getElement().findElements(By.className("taxon-node-status"));
80 80
        return taxonNodeStatus;
81 81
    }
82 82

  
83 83
    public List<TaxonNodeStatusElement> getTaxonNodeStates() {
84 84
        List<TaxonNodeStatusElement> statusEls = new ArrayList<>();
85
        List<WebElement> taxonNodeStatus = mainContent().findElements(By.className("taxon-node-status"));
85
        List<WebElement> taxonNodeStatus = getDataPortalContent().getElement().findElements(By.className("taxon-node-status"));
86 86
        for(WebElement el : taxonNodeStatus) {
87 87
            statusEls.add(new TaxonNodeStatusElement(el));
88 88
        }
src/main/java/eu/etaxonomy/dataportal/pages/TaxonProfilePage.java
147 147

  
148 148
        logger.setLevel(Level.TRACE);
149 149
        logger.trace("getFeatureBlockAt()");
150
        List<WebElement> featureBlocks = mainContent().findElements(By.className("block-cdm-dataportal-feature"));
150
        List<WebElement> featureBlocks = getDataPortalContent().getElement().findElements(By.className("block-cdm-dataportal-feature"));
151 151
        Assert.assertTrue("Too few feature block elements", featureBlocks.size() >= position);
152 152
        for(WebElement b : featureBlocks){
153 153
            if(logger.isTraceEnabled()) {
......
164 164

  
165 165
    public FeatureBlock getFeatureBlockAt(int position, String featureName, String enclosingTag, String ... elementTag){
166 166

  
167
        List<WebElement> featureBlocks = mainContent().findElements(By.className("block-cdm-dataportal-feature"));
167
        List<WebElement> featureBlocks = getDataPortalContent().getElement().findElements(By.className("block-cdm-dataportal-feature"));
168 168
        Assert.assertTrue("Too few feature block elements", featureBlocks.size() >= position);
169 169
        for(WebElement b : featureBlocks){
170 170
            if (b.getAttribute("id").equals("block-cdm-dataportal-feature-" + normalizeClassAttribute(featureName))){

Also available in: Unified diff