Project

General

Profile

Revision fadab744

IDfadab744533445028265169302c8d70def2f328e
Parent 59ef934f
Child 619e9df3

Added by Andreas Kohlbecker over 2 years ago

ref #7347 refacoring of the dataportal test suite for more flexibility

View differences:

src/main/java/eu/etaxonomy/dataportal/DataPortalContext.java
11 11
import java.net.URI;
12 12
import java.util.UUID;
13 13

  
14
import org.apache.log4j.Logger;
15

  
16 14
/**
17 15
 *
18 16
 * @author a.kohlbecker
19 17
 *
20 18
 */
21
public enum DataPortalContext {
22

  
23
    cichorieae,
24
    palmae,
25
    cyprus,
26
    floramalesiana,
27
    reference;
19
public class DataPortalContext {
28 20

  
29 21
    URI baseUri;
30 22
    URI cdmServerUri;
31 23
    UUID classificationUUID;
32 24
    String siteName; //TODO could be read with drush: $ drush vget site_name
33 25
    String themeName;
34

  
35

  
36
    public final Logger logger = Logger.getLogger(DataPortalContext.class);
37

  
38
    private DataPortalContext() {
39

  
40
        try {
41
            this.baseUri = TestConfiguration.getProperty(composePropertyKey("baseUri"), URI.class, true);
42
            this.cdmServerUri = TestConfiguration.getProperty(composePropertyKey("cdmServerUri"), URI.class, false);
43
            this.classificationUUID = TestConfiguration.getProperty(composePropertyKey("classificationUUID"), UUID.class, true);
44
            this.siteName = TestConfiguration.getProperty(composePropertyKey("siteName"));
45
        } catch (TestConfigurationException e) {
46
            logger.error("Configuration Error: ", e);
47
            System.exit(-1);
48
        }
49
    }
50

  
51
    private String composePropertyKey(String fieldName) {
52
        String key = this.getClass().getSimpleName().substring(0, 1).toLowerCase() + this.getClass().getSimpleName().substring(1) + "." + this.name() + "." + fieldName;
53
        return key;
26
    private String siteLabel;
27

  
28
    public DataPortalContext(URI baseUri, URI cdmServerUri, UUID classificationUUID, String siteName, String siteLabel) {
29
            this.baseUri = baseUri;
30
            this.cdmServerUri = cdmServerUri;
31
            this.classificationUUID = classificationUUID;
32
            this.siteName = siteName;
33
            this.siteLabel = siteLabel;
54 34
    }
55 35

  
56 36
    public URI getBaseUri() {
......
69 49
        return siteName;
70 50
    }
71 51

  
52
    public String getSiteLabel() {
53
        return siteLabel;
54
    }
55

  
56

  
57

  
58
    /**
59
     *
60
     * @param pageHeader
61
     *
62
     * @return The drupal site title as it is produced by drupal
63
     */
72 64
    public String prepareTitle(String pageHeader) {
73 65
        return pageHeader + " | " + getSiteName();
74 66
    }
src/main/java/eu/etaxonomy/dataportal/DataPortalSite.java
1
/**
2
 * Copyright (C) 2009 EDIT
3
 * European Distributed Institute of Taxonomy
4
 * http://www.e-taxonomy.eu
5
 *
6
 * The contents of this file are subject to the Mozilla Public License Version 1.1
7
 * See LICENSE.TXT at the top of this package for the full license terms.
8
 */
9
package eu.etaxonomy.dataportal;
10

  
11
import java.net.URI;
12
import java.util.UUID;
13

  
14
import org.apache.log4j.Logger;
15

  
16
/**
17
 *
18
 * @author a.kohlbecker
19
 *
20
 */
21
public enum DataPortalSite {
22

  
23
    cichorieae,
24
    palmae,
25
    cyprus,
26
    floramalesiana,
27
    reference;
28

  
29
    DataPortalContext context;
30

  
31
    public final Logger logger = Logger.getLogger(DataPortalSite.class);
32

  
33
    private DataPortalSite() {
34

  
35
        try {
36

  
37
            URI baseUri = TestConfiguration.getProperty(composePropertyKey("baseUri"), URI.class, true);
38
            URI cdmServerUri = TestConfiguration.getProperty(composePropertyKey("cdmServerUri"), URI.class, false);
39
            UUID classificationUUID = TestConfiguration.getProperty(composePropertyKey("classificationUUID"), UUID.class, true);
40
            String siteName = TestConfiguration.getProperty(composePropertyKey("siteName"));
41
            String siteLabel = this.name();
42
            context = new DataPortalContext(baseUri, cdmServerUri, classificationUUID, siteName, siteLabel);
43
        } catch (TestConfigurationException e) {
44
            logger.error("Configuration Error: ", e);
45
            System.exit(-1);
46
        }
47
    }
48

  
49
    private String composePropertyKey(String fieldName) {
50
        String key = DataPortalContext.class.getSimpleName().substring(0, 1).toLowerCase() + DataPortalContext.class.getSimpleName().substring(1) + "." + this.name() + "." + fieldName;
51
        return key;
52
    }
53

  
54
    /**
55
     * @return
56
     */
57
    public DataPortalContext getContext() {
58
        return context;
59
    }
60

  
61
}
src/main/java/eu/etaxonomy/dataportal/junit/CdmDataPortalSeleniumRCTestBase.java
16 16
import com.thoughtworks.selenium.Selenium;
17 17
import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium;
18 18

  
19
import eu.etaxonomy.dataportal.DataPortalContext;
19
import eu.etaxonomy.dataportal.DataPortalSite;
20 20
import eu.etaxonomy.dataportal.DataPortalManager;
21 21

  
22 22
/**
src/main/java/eu/etaxonomy/dataportal/junit/CdmDataPortalTestBase.java
11 11
import org.openqa.selenium.WebDriver;
12 12

  
13 13
import eu.etaxonomy.dataportal.DataPortalContext;
14
import eu.etaxonomy.dataportal.DataPortalSite;
14 15
import eu.etaxonomy.dataportal.selenium.WebDriverFactory;
15 16

  
16 17
/**
......
50 51
	}
51 52

  
52 53
	/**
53
	 * Return the {@link DataPortalContext#getBaseUri()} of the currently active
54
	 * Return the {@link DataPortalSite#getBaseUri()} of the currently active
54 55
	 * context as String
55 56
	 *
56
	 * @return string representatoin of the DataPortal base URI
57
	 * @return string representation of the DataPortal base URI
57 58
	 */
58 59
	public String getBaseUrl() {
59 60
		return context.getBaseUri().toString();
src/main/java/eu/etaxonomy/dataportal/junit/DataPortalContextSuite.java
21 21
import org.junit.runners.model.Statement;
22 22

  
23 23
import eu.etaxonomy.dataportal.DataPortalContext;
24
import eu.etaxonomy.dataportal.DataPortalSite;
24 25

  
25 26

  
26 27
/**
......
39 40
	@Inherited
40 41
	public @interface DataPortalContexts {
41 42
		/**
42
		 * @return an array of DataPortalContext to which the annotated test
43
		 * @return an array of DataPortalSite to which the annotated test
43 44
		 *         class is applicable
44 45
		 */
45
		DataPortalContext[] value();
46
		DataPortalSite[] value();
46 47
	}
47 48

  
48 49
	private final List<Runner> runners = new ArrayList<Runner>();
......
67 68

  
68 69
		@Override
69 70
		protected String getName() {
70
			return String.format("%s@%s", getTestClass().getName(), context.name());
71
			return String.format("%s@%s", getTestClass().getName(), context.getSiteLabel());
71 72
		}
72 73

  
73 74
		@Override
74 75
		protected String testName(final FrameworkMethod method) {
75
			return String.format("%s@%s", method.getName(), context.name());
76
			return String.format("%s@%s", method.getName(), context.getSiteLabel());
76 77

  
77 78
		}
78 79

  
......
102 103
	public DataPortalContextSuite(Class<?> klass) throws InitializationError {
103 104
		super(klass, Collections.<Runner>emptyList());
104 105
		DataPortalContexts dataPortalContextsAnotation = getTestClass().getJavaClass().getAnnotation(DataPortalContexts.class);
105
		for (DataPortalContext cntxt : dataPortalContextsAnotation.value()) {
106
			runners.add(new TestClassRunnerWithDataPortalContext(klass, cntxt));
106
		for (DataPortalSite dataPortalSite : dataPortalContextsAnotation.value()) {
107
			runners.add(new TestClassRunnerWithDataPortalContext(klass, dataPortalSite.getContext()));
107 108
		}
108 109
	}
109 110

  
src/main/java/eu/etaxonomy/dataportal/pages/PortalPage.java
30 30
import com.google.common.base.Function;
31 31

  
32 32
import eu.etaxonomy.dataportal.DataPortalContext;
33
import eu.etaxonomy.dataportal.DataPortalSite;
33 34
import eu.etaxonomy.dataportal.elements.BaseElement;
34 35
import eu.etaxonomy.dataportal.elements.ClassificationTreeBlock;
35 36
import eu.etaxonomy.dataportal.elements.LinkElement;
......
390 391
        Constructor<T> constructor;
391 392
        T pageInstance;
392 393
        try {
393
            constructor = pageType.getConstructor(WebDriver.class, DataPortalContext.class);
394
            constructor = pageType.getConstructor(WebDriver.class, DataPortalSite.class);
394 395
            pageInstance = constructor.newInstance(driver, context);
395 396
        } catch (Exception e) {
396 397
            throw new RuntimeException(e);
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Chichorieae_Feature_ImageSourcesTest.java
15 15

  
16 16
import org.junit.Test;
17 17

  
18
import eu.etaxonomy.dataportal.DataPortalContext;
18
import eu.etaxonomy.dataportal.DataPortalSite;
19 19
import eu.etaxonomy.dataportal.elements.FeatureBlock;
20 20
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
21 21
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
......
25 25
 * @author a.kohlbecker
26 26
 *
27 27
 */
28
@DataPortalContexts( { DataPortalContext.cichorieae })
28
@DataPortalContexts( { DataPortalSite.cichorieae })
29 29
public class Chichorieae_Feature_ImageSourcesTest extends CdmDataPortalTestBase {
30 30

  
31 31
    static UUID hieracium_bupleuroides_aggr = UUID.fromString("f85a5f90-fc61-4622-939f-ba6e50500b0d");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_CommonNamesTest.java
15 15
import org.openqa.selenium.By;
16 16
import org.openqa.selenium.WebElement;
17 17

  
18
import eu.etaxonomy.dataportal.DataPortalContext;
18
import eu.etaxonomy.dataportal.DataPortalSite;
19 19
import eu.etaxonomy.dataportal.elements.FeatureBlock;
20 20
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
21 21
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
......
27 27
 *
28 28
 */
29 29

  
30
@DataPortalContexts( { DataPortalContext.cichorieae })
30
@DataPortalContexts( { DataPortalSite.cichorieae })
31 31
public class Cichorieae_CommonNamesTest extends CdmDataPortalTestBase{
32 32

  
33 33

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_FootnoteTest.java
14 14

  
15 15
import org.junit.Test;
16 16

  
17
import eu.etaxonomy.dataportal.DataPortalContext;
17
import eu.etaxonomy.dataportal.DataPortalSite;
18 18
import eu.etaxonomy.dataportal.elements.BaseElement;
19 19
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
20 20
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
......
26 26
 *
27 27
 */
28 28

  
29
@DataPortalContexts( { DataPortalContext.cichorieae })
29
@DataPortalContexts( { DataPortalSite.cichorieae })
30 30
public class Cichorieae_FootnoteTest extends CdmDataPortalTestBase{
31 31

  
32 32

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_HybridTest.java
15 15

  
16 16
import org.junit.Test;
17 17

  
18
import eu.etaxonomy.dataportal.DataPortalContext;
18
import eu.etaxonomy.dataportal.DataPortalSite;
19 19
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
20 20
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
21 21
import eu.etaxonomy.dataportal.pages.TaxonSynonymyPage;
......
26 26
 *
27 27
 */
28 28

  
29
@DataPortalContexts( { DataPortalContext.cichorieae })
29
@DataPortalContexts( { DataPortalSite.cichorieae })
30 30
public class Cichorieae_HybridTest extends CdmDataPortalTestBase{
31 31

  
32 32

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_NamePageTest.java
17 17
import org.openqa.selenium.By;
18 18
import org.openqa.selenium.WebElement;
19 19

  
20
import eu.etaxonomy.dataportal.DataPortalContext;
20
import eu.etaxonomy.dataportal.DataPortalSite;
21 21
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
22 22
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
23 23
import eu.etaxonomy.dataportal.pages.GenericPortalPage;
......
29 29
 *
30 30
 */
31 31

  
32
@DataPortalContexts( { DataPortalContext.cichorieae })
32
@DataPortalContexts( { DataPortalSite.cichorieae })
33 33
public class Cichorieae_NamePageTest extends CdmDataPortalTestBase{
34 34

  
35 35

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_SearchTest.java
16 16
import org.openqa.selenium.By;
17 17
import org.openqa.selenium.WebElement;
18 18

  
19
import eu.etaxonomy.dataportal.DataPortalContext;
19
import eu.etaxonomy.dataportal.DataPortalSite;
20 20
import eu.etaxonomy.dataportal.ElementUtils;
21 21
import eu.etaxonomy.dataportal.elements.GalleryImage;
22 22
import eu.etaxonomy.dataportal.elements.TaxonListElement;
......
28 28
import eu.etaxonomy.dataportal.selenium.VisibilityOfElementLocated;
29 29
import junit.framework.Assert;
30 30

  
31
@DataPortalContexts( { DataPortalContext.cichorieae })
31
@DataPortalContexts( { DataPortalSite.cichorieae })
32 32
public class Cichorieae_SearchTest extends CdmDataPortalTestBase {
33 33

  
34 34
    private static final UUID UUID_L_COMMUNIS = UUID.fromString("5d65f017-0c23-43e4-888d-9649de50dd45");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_TechnicalAnnnotationsTest.java
18 18

  
19 19
import org.junit.Test;
20 20

  
21
import eu.etaxonomy.dataportal.DataPortalContext;
21
import eu.etaxonomy.dataportal.DataPortalSite;
22 22
import eu.etaxonomy.dataportal.elements.FeatureBlock;
23 23
import eu.etaxonomy.dataportal.elements.LinkElement;
24 24
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
32 32
 *
33 33
 */
34 34

  
35
@DataPortalContexts( { DataPortalContext.cichorieae })
35
@DataPortalContexts( { DataPortalSite.cichorieae })
36 36
public class Cichorieae_TechnicalAnnnotationsTest extends CdmDataPortalTestBase{
37 37

  
38 38

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_TypeTest.java
14 14

  
15 15
import org.junit.Test;
16 16

  
17
import eu.etaxonomy.dataportal.DataPortalContext;
17
import eu.etaxonomy.dataportal.DataPortalSite;
18 18
import eu.etaxonomy.dataportal.elements.TypeDesignationElement;
19 19
import eu.etaxonomy.dataportal.elements.TypeDesignationType;
20 20
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
28 28
 *
29 29
 */
30 30

  
31
@DataPortalContexts( { DataPortalContext.cichorieae })
31
@DataPortalContexts( { DataPortalSite.cichorieae })
32 32
public class Cichorieae_TypeTest extends CdmDataPortalTestBase{
33 33

  
34 34
    static UUID cichorium_uuid = UUID.fromString("21d7161a-455e-4f4d-9d61-7f0100c38ff3");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Crepis_tectorum_SynonymyTest.java
15 15

  
16 16
import org.junit.Test;
17 17

  
18
import eu.etaxonomy.dataportal.DataPortalContext;
18
import eu.etaxonomy.dataportal.DataPortalSite;
19 19
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
20 20
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
21 21
import eu.etaxonomy.dataportal.pages.TaxonSynonymyPage;
......
26 26
 *
27 27
 */
28 28

  
29
@DataPortalContexts( { DataPortalContext.cichorieae })
29
@DataPortalContexts( { DataPortalSite.cichorieae })
30 30
public class Crepis_tectorum_SynonymyTest extends CdmDataPortalTestBase{
31 31

  
32 32
    static UUID crepis_tectorum_Uuid = UUID.fromString("c62dff09-3f04-4f05-9aac-904d51ac1b77");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/FeatureBlock_Media_Test.java
18 18

  
19 19
import org.junit.Test;
20 20

  
21
import eu.etaxonomy.dataportal.DataPortalContext;
21
import eu.etaxonomy.dataportal.DataPortalSite;
22 22
import eu.etaxonomy.dataportal.ElementUtils;
23 23
import eu.etaxonomy.dataportal.elements.FeatureBlock;
24 24
import eu.etaxonomy.dataportal.elements.GalleryImage;
......
30 30
 * @author a.kohlbecker
31 31
 *
32 32
 */
33
@DataPortalContexts( { DataPortalContext.cichorieae })
33
@DataPortalContexts( { DataPortalSite.cichorieae })
34 34
public class FeatureBlock_Media_Test extends CdmDataPortalTestBase {
35 35

  
36 36
    static UUID erythroseris_amabilis_Uuid = UUID.fromString("b335ceee-d6c1-4c93-841d-3b4bd279d855");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/HomonymTest.java
15 15

  
16 16
import org.junit.Test;
17 17

  
18
import eu.etaxonomy.dataportal.DataPortalContext;
18
import eu.etaxonomy.dataportal.DataPortalSite;
19 19
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
20 20
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
21 21
import eu.etaxonomy.dataportal.pages.TaxonSynonymyPage;
......
26 26
 *
27 27
 */
28 28

  
29
@DataPortalContexts( { DataPortalContext.cichorieae })
29
@DataPortalContexts( { DataPortalSite.cichorieae })
30 30
public class HomonymTest extends CdmDataPortalTestBase{
31 31

  
32 32
    static UUID pilosella_guthnikiana_Uuid = UUID.fromString("6d711fa0-77c3-42df-9d44-83fdc78f3482");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Lactuca_triquetra_TaxonProfileTest.java
19 19
import org.openqa.selenium.NoSuchElementException;
20 20
import org.openqa.selenium.WebElement;
21 21

  
22
import eu.etaxonomy.dataportal.DataPortalContext;
22
import eu.etaxonomy.dataportal.DataPortalSite;
23 23
import eu.etaxonomy.dataportal.elements.FeatureBlock;
24 24
import eu.etaxonomy.dataportal.elements.ImgElement;
25 25
import eu.etaxonomy.dataportal.elements.LinkElement;
......
33 33
 *
34 34
 */
35 35

  
36
@DataPortalContexts( { DataPortalContext.cichorieae })
36
@DataPortalContexts( { DataPortalSite.cichorieae })
37 37
public class Lactuca_triquetra_TaxonProfileTest extends CdmDataPortalTestBase{
38 38

  
39 39
    public static final Logger logger = Logger.getLogger(Lactuca_triquetra_TaxonProfileTest.class);
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Scorzonera_SynonymyTest.java
16 16

  
17 17
import org.junit.Test;
18 18

  
19
import eu.etaxonomy.dataportal.DataPortalContext;
19
import eu.etaxonomy.dataportal.DataPortalSite;
20 20
import eu.etaxonomy.dataportal.elements.TypeDesignationElement;
21 21
import eu.etaxonomy.dataportal.elements.TypeDesignationType;
22 22
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
29 29
 *
30 30
 */
31 31

  
32
@DataPortalContexts( { DataPortalContext.cichorieae })
32
@DataPortalContexts( { DataPortalSite.cichorieae })
33 33
public class Scorzonera_SynonymyTest extends CdmDataPortalTestBase{
34 34

  
35 35
    static UUID scorzonera_Uuid = UUID.fromString("c1e8a3f2-2b65-4aad-ad25-1cf9df92e290");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/Allium_guttatum_subsp_guttatum_TaxonProfileTest.java
23 23
import org.openqa.selenium.By;
24 24
import org.openqa.selenium.WebElement;
25 25

  
26
import eu.etaxonomy.dataportal.DataPortalContext;
26
import eu.etaxonomy.dataportal.DataPortalSite;
27 27
import eu.etaxonomy.dataportal.elements.BaseElement;
28 28
import eu.etaxonomy.dataportal.elements.FeatureBlock;
29 29
import eu.etaxonomy.dataportal.elements.ImgElement;
......
37 37
 *
38 38
 */
39 39

  
40
@DataPortalContexts( { DataPortalContext.cyprus })
40
@DataPortalContexts( { DataPortalSite.cyprus })
41 41
public class Allium_guttatum_subsp_guttatum_TaxonProfileTest extends CdmDataPortalTestBase{
42 42

  
43 43
    static UUID taxonUuid = UUID.fromString("6d04598b-3852-4038-91c9-13c7581b21a6");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/Bassia_indica_TaxonProfileTest.java
16 16
import org.junit.Before;
17 17
import org.junit.Test;
18 18

  
19
import eu.etaxonomy.dataportal.DataPortalContext;
19
import eu.etaxonomy.dataportal.DataPortalSite;
20 20
import eu.etaxonomy.dataportal.elements.FeatureBlock;
21 21
import eu.etaxonomy.dataportal.elements.LinkElement;
22 22
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
28 28
 *
29 29
 */
30 30

  
31
@DataPortalContexts( { DataPortalContext.cyprus })
31
@DataPortalContexts( { DataPortalSite.cyprus })
32 32
public class Bassia_indica_TaxonProfileTest extends CdmDataPortalTestBase{
33 33

  
34 34
    static UUID taxonUuid = UUID.fromString("5250a30a-9e6f-4f2f-9663-93127a1a3829");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/CyprusPolytomousKeyTest.java
14 14
import org.junit.Assert;
15 15
import org.junit.Test;
16 16

  
17
import eu.etaxonomy.dataportal.DataPortalContext;
17
import eu.etaxonomy.dataportal.DataPortalSite;
18 18
import eu.etaxonomy.dataportal.elements.BaseElement;
19 19
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
20 20
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
......
28 28
 *
29 29
 */
30 30

  
31
@DataPortalContexts({ DataPortalContext.cyprus })
31
@DataPortalContexts({ DataPortalSite.cyprus })
32 32
public class CyprusPolytomousKeyTest extends CdmDataPortalTestBase {
33 33

  
34 34

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/CyprusSearchTest.java
12 12
import org.junit.Test;
13 13
import org.openqa.selenium.By;
14 14

  
15
import eu.etaxonomy.dataportal.DataPortalContext;
15
import eu.etaxonomy.dataportal.DataPortalSite;
16 16
import eu.etaxonomy.dataportal.elements.TaxonListElement;
17 17
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
18 18
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
......
24 24
 *
25 25
 */
26 26

  
27
@DataPortalContexts( { DataPortalContext.cyprus })
27
@DataPortalContexts( { DataPortalSite.cyprus })
28 28
public class CyprusSearchTest extends CdmDataPortalTestBase{
29 29

  
30 30
	private GenericPortalPage homePage;
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/Cyprus_HybridTest.java
16 16

  
17 17
import org.junit.Test;
18 18

  
19
import eu.etaxonomy.dataportal.DataPortalContext;
19
import eu.etaxonomy.dataportal.DataPortalSite;
20 20
import eu.etaxonomy.dataportal.elements.ClassificationTreeBlock;
21 21
import eu.etaxonomy.dataportal.elements.ClassificationTreeElement;
22 22
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
30 30
 *
31 31
 */
32 32

  
33
@DataPortalContexts( { DataPortalContext.cyprus })
33
@DataPortalContexts( { DataPortalSite.cyprus })
34 34
public class Cyprus_HybridTest extends CdmDataPortalTestBase{
35 35

  
36 36

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cyprus/Cyprus_OriginalSourceTest.java
18 18
import org.openqa.selenium.By;
19 19
import org.openqa.selenium.WebElement;
20 20

  
21
import eu.etaxonomy.dataportal.DataPortalContext;
21
import eu.etaxonomy.dataportal.DataPortalSite;
22 22
import eu.etaxonomy.dataportal.elements.FeatureBlock;
23 23
import eu.etaxonomy.dataportal.elements.LinkElement;
24 24
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
31 31
 *
32 32
 */
33 33

  
34
@DataPortalContexts( { DataPortalContext.cyprus })
34
@DataPortalContexts( { DataPortalSite.cyprus })
35 35
public class Cyprus_OriginalSourceTest extends CdmDataPortalTestBase{
36 36

  
37 37
    // Taxon Cistus creticus subsp. creticus
src/test/java/eu/etaxonomy/dataportal/selenium/tests/flMalesiana/FloraMalesianaPolytomousKeyTest.java
13 13
import org.junit.Assert;
14 14
import org.junit.Test;
15 15

  
16
import eu.etaxonomy.dataportal.DataPortalContext;
16
import eu.etaxonomy.dataportal.DataPortalSite;
17 17
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
18 18
import eu.etaxonomy.dataportal.junit.DataPortalContextSuite.DataPortalContexts;
19 19
import eu.etaxonomy.dataportal.pages.PolytomousKeyPage;
......
26 26
 *
27 27
 */
28 28

  
29
@DataPortalContexts({ DataPortalContext.floramalesiana })
29
@DataPortalContexts({ DataPortalSite.floramalesiana })
30 30
public class FloraMalesianaPolytomousKeyTest extends CdmDataPortalTestBase {
31 31

  
32 32
    /**
src/test/java/eu/etaxonomy/dataportal/selenium/tests/flMalesiana/FloraMalesiana_DescriptionTest.java
19 19
import org.junit.Test;
20 20
import org.openqa.selenium.WebElement;
21 21

  
22
import eu.etaxonomy.dataportal.DataPortalContext;
22
import eu.etaxonomy.dataportal.DataPortalSite;
23 23
import eu.etaxonomy.dataportal.elements.FeatureBlock;
24 24
import eu.etaxonomy.dataportal.elements.LinkElement;
25 25
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
32 32
 *
33 33
 */
34 34

  
35
@DataPortalContexts( { DataPortalContext.floramalesiana})
35
@DataPortalContexts( { DataPortalSite.floramalesiana})
36 36
public class FloraMalesiana_DescriptionTest extends CdmDataPortalTestBase{
37 37

  
38 38
    private static final UUID tristiropsis_acutangula_uuid = UUID.fromString("87e76e43-e4b7-44a1-a195-2c36a63b34bb");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/flMalesiana/FloraMalesiana_OriginalSourceTest.java
18 18
import org.junit.Ignore;
19 19
import org.junit.Test;
20 20

  
21
import eu.etaxonomy.dataportal.DataPortalContext;
21
import eu.etaxonomy.dataportal.DataPortalSite;
22 22
import eu.etaxonomy.dataportal.elements.LinkElement;
23 23
import eu.etaxonomy.dataportal.elements.TaxonListElement;
24 24
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
33 33
 *
34 34
 */
35 35

  
36
@DataPortalContexts( { DataPortalContext.floramalesiana})
36
@DataPortalContexts( { DataPortalSite.floramalesiana})
37 37
public class FloraMalesiana_OriginalSourceTest extends CdmDataPortalTestBase{
38 38

  
39 39
    private static final UUID UUID_ILLICIUM = UUID.fromString("502e28ca-23d0-44a8-9c13-85fb3d076bff");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/palmae/Calamus_acanthospathus_TaxonProfileTest.java
16 16
import org.junit.Test;
17 17
import org.openqa.selenium.By;
18 18

  
19
import eu.etaxonomy.dataportal.DataPortalContext;
19
import eu.etaxonomy.dataportal.DataPortalSite;
20 20
import eu.etaxonomy.dataportal.elements.FeatureBlock;
21 21
import eu.etaxonomy.dataportal.elements.ImgElement;
22 22
import eu.etaxonomy.dataportal.elements.LinkElement;
......
29 29
 *
30 30
 */
31 31

  
32
@DataPortalContexts( { DataPortalContext.palmae })
32
@DataPortalContexts( { DataPortalSite.palmae })
33 33
public class Calamus_acanthospathus_TaxonProfileTest extends CdmDataPortalTestBase{
34 34

  
35 35
    static UUID taxonUuid = UUID.fromString("bb340c78-880e-4dd0-91ff-81788a482b31");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/palmae/Iriartea_deltoidea_UsesTest.java
17 17
import org.openqa.selenium.By;
18 18
import org.openqa.selenium.WebElement;
19 19

  
20
import eu.etaxonomy.dataportal.DataPortalContext;
20
import eu.etaxonomy.dataportal.DataPortalSite;
21 21
import eu.etaxonomy.dataportal.elements.FeatureBlock;
22 22
import eu.etaxonomy.dataportal.elements.LinkElement;
23 23
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
29 29
 *
30 30
 */
31 31

  
32
@DataPortalContexts( { DataPortalContext.palmae })
32
@DataPortalContexts( { DataPortalSite.palmae })
33 33
public class Iriartea_deltoidea_UsesTest extends CdmDataPortalTestBase{
34 34

  
35 35
    static UUID taxonUuid = UUID.fromString("ce870eca-0422-4a3c-b849-0f5ca0370b1f");
src/test/java/eu/etaxonomy/dataportal/selenium/tests/reference/MisappliedNamesTest.java
16 16
import org.junit.Test;
17 17
import org.openqa.selenium.WebElement;
18 18

  
19
import eu.etaxonomy.dataportal.DataPortalContext;
19
import eu.etaxonomy.dataportal.DataPortalSite;
20 20
import eu.etaxonomy.dataportal.ElementUtils;
21 21
import eu.etaxonomy.dataportal.elements.BaseElement;
22 22
import eu.etaxonomy.dataportal.junit.CdmDataPortalTestBase;
......
28 28
 *
29 29
 */
30 30

  
31
@DataPortalContexts( { DataPortalContext.reference })
31
@DataPortalContexts( { DataPortalSite.reference })
32 32
public class MisappliedNamesTest extends CdmDataPortalTestBase{
33 33

  
34 34
    static final UUID miconia_cubacinerea_Uuid = UUID.fromString("c6716cee-2039-4ba8-a239-4b1b353f9c84");

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)