Revision 20143e0d
Added by Andreas Kohlbecker almost 11 years ago
| 7.x/modules/cdm_dataportal/test/java/dataportal-selenium-tests/pom.xml | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
<properties> |
| 14 | 14 |
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
| 15 |
<selenium-version>2.32.0</selenium-version>
|
|
| 15 |
<selenium-version>2.33.0</selenium-version>
|
|
| 16 | 16 |
</properties> |
| 17 | 17 |
|
| 18 | 18 |
<scm> |
| 7.x/modules/cdm_dataportal/test/java/dataportal-selenium-tests/src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Cichorieae_CommonNamesTest.java | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// no longer valid since 2012-11-19: String expected = "Common names\nlechuguilla145, escariola145; Albanian (Albania): Ogrisht146; Arabic (Lebanon): خَسّ الزَّيْت147; Arabic (Saudi Arabia): Khass-al-Hammar148; Arabic (Syria): خَسّ الزَّيْت149; Armenian (Armenia): Կաթնուկ կողմնացույց150; Bulgarian (Bulgaria): Компасна салата151; Czech (Czech Republic): Locika kompasová152; Danish (Denmark): Tornet Salat153; English (Australia): compass plant154, Prickly Lettuce155, Prickly Lettuce156, Prickly Lettuce157, Prickly Lettuce158, compass plant159"; |
| 53 | 53 |
// no longer valid since 2013-06-27, sorting and merging implemented: String expected = "Common names\nlechuguilla144, escariola144; Albanian (Albania): Ogrisht145; Arabic (Lebanon): خَسّ الزَّيْت146; Arabic (Saudi Arabia): Khass-al-Hammar147; Arabic (Syria): خَسّ الزَّيْت148; Armenian (Armenia): Կաթնուկ կողմնացույց149; Bulgarian (Bulgaria): Компасна салата150; Czech (Czech Republic): Locika kompasová151; Danish (Denmark): Tornet Salat152; English (Australia): compass plant153, Prickly Lettuce154, Prickly Lettuce155, Prickly Lettuce156, Prickly Lettuce157, compass plant158"; |
| 54 |
String expected = "Common names\nescariola144, lechuguilla144; Albanian (Albania): Ogrisht145; Arabic (Lebanon): خَسّ الزَّيْت146; Arabic (Saudi Arabia): Khass-al-Hammar147; Arabic (Syria): خَسّ الزَّيْت148; Armenian (Armenia): Կաթնուկ կողմնացույց149; Bulgarian (Bulgaria): Компасна салата150; Czech (Czech Republic): Locika kompasová151; Danish (Denmark): Tornet Salat152; English (Australia): Prickly Lettuce153,154,155,156,157,158,159, Prickly lettuce160,161, compass plant160,161, milk thistle160,161"; |
|
| 54 |
String expected = "Common names\n(Mexico): escariola144, lechuguilla144; Albanian (Albania): Ogrisht145; Arabic (Lebanon): خَسّ الزَّيْت146; Arabic (Saudi Arabia): Khass-al-Hammar147; Arabic (Syria): خَسّ الزَّيْت148; Armenian (Armenia): Կաթնուկ կողմնացույց149; Bulgarian (Bulgaria): Компасна салата150; Czech (Czech Republic): Locika kompasová151; Danish (Denmark): Tornet Salat152; English (Australia): Prickly Lettuce153,154,155,156,157,158,159, Prickly lettuce160,161, compass plant160,161, milk thistle160,161";
|
|
| 55 | 55 |
String firstChars = commonNamesBlock.getText().substring(0, expected.length()); |
| 56 | 56 |
|
| 57 | 57 |
assertEquals(expected, firstChars); |
| 7.x/modules/cdm_dataportal/theme/cdm_dataportal.descriptions.theme | ||
|---|---|---|
| 532 | 532 |
if (is_array($elements)) {
|
| 533 | 533 |
foreach ($elements as $element) {
|
| 534 | 534 |
if ($element->class == 'CommonTaxonName') {
|
| 535 |
|
|
| 536 |
// common name without a language or area, should not happen but is possible |
|
| 537 |
$language_area_key = ''; |
|
| 535 | 538 |
if (isset($element->language->representation_L10n)) {
|
| 536 |
$language_area_key = '<b>' . $element->language->representation_L10n . '</b>'; |
|
| 537 |
if(isset($element->area->titleCache) && strlen($element->area->titleCache) > 0){
|
|
| 538 |
$language_area_key .= ' (' . $element->area->titleCache . ')';
|
|
| 539 |
} |
|
| 539 |
$language_area_key .= '<b>' . $element->language->representation_L10n . '</b>'; |
|
| 540 | 540 |
} |
| 541 |
else {
|
|
| 542 |
// common name without a language, should not happen but is possible |
|
| 543 |
// example: flore_gabon/cdm_dataportal/taxon/24f36d18-a6e8-4edb-93bf-4a30f3394bf5. |
|
| 544 |
$language_area_key = ''; |
|
| 541 |
if(isset($element->area->titleCache) && strlen($element->area->titleCache) > 0){
|
|
| 542 |
$language_area_key .= ($language_area_key ? ' ' : '') . '(' . $element->area->titleCache . ')';
|
|
| 545 | 543 |
} |
| 544 |
|
|
| 546 | 545 |
if(isset($common_names[$language_area_key][$element->name])) {
|
| 547 | 546 |
// same name already exists for language and areae combination, se we merge the description elements |
| 548 | 547 |
cdm_merge_description_elements($common_names[$language_area_key][$element->name], $element); |
| ... | ... | |
| 550 | 549 |
// otherwise add as new entry |
| 551 | 550 |
$common_names[$language_area_key][$element->name] = $element; |
| 552 | 551 |
} |
| 552 |
|
|
| 553 | 553 |
} |
| 554 | 554 |
elseif ($element->class == 'TextData') {
|
| 555 | 555 |
$textData_commonNames[] = $element; |
Also available in: Unified diff
fixing #2349 (order of common names in dataportal confused) and upgrading selenium to 2.33.0