Project

General

Profile

« Previous | Next » 

Revision af68bbe0

Added by Andreas Kohlbecker over 2 years ago

ref #9599 better error reporting

View differences:

modules/cdm_dataportal/cdm_api/cdm_api.module
1937 1937
 */
1938 1938
function cdm_ws_getNomenclaturalReference($referenceUuid, $microreference) {
1939 1939

  
1940
  drupal_set_message("reference/$0/nomenclaturalCitation' must no longer be used.", "error");
1941

  
1942 1940
  // TODO the below statement avoids error boxes due to #4644 remove it once this ticket is solved
1943 1941
  if(is_array($microreference) || is_object($microreference)) {
1944 1942
    return '';
modules/cdm_dataportal/includes/name.inc
415 415
      $microreference = $taxon_name->nomenclaturalSource->citationMicroReference;
416 416
      if(count($nomref_tagged_text) == 0 && isset($taxon_name->nomenclaturalSource->citation)){
417 417
        // TODO is this case still relevant? The tagged text should already contain all information!
418
        drupal_set_message("reference/$0/nomenclaturalCitation' must no longer be used (type: "
419
          . $taxon_name_or_taxon_base->class . (isset($taxon_name_or_taxon_base->type) ? " - " +$taxon_name_or_taxon_base->type : ""  . ")"), "error");
418 420
        $citation = cdm_ws_getNomenclaturalReference($taxon_name->nomenclaturalSource->citation->uuid, $microreference);
419 421
        // Find preceding element of the reference.
420 422
        $precedingKey = get_preceding_contentElementKey('reference', $renderTemplate);
src/main/java/eu/etaxonomy/dataportal/pages/PortalPage.java
200 200
            if(getAciveHealthChecks().contains(HealthChecks.NO_ERROR)) {
201 201
                String ignore_error = null;
202 202
                List<String> errors = getErrors().stream().filter(str -> ignore_error == null || !str.startsWith(ignore_error)).collect(Collectors.toList());
203
                assertTrue("The page must not show an error box", errors.size() == 0);
203
                assertTrue("The page must not show an error box: (" + String.join(" | ", errors) + ")", errors.size() == 0);
204 204
            }
205 205
            if(getAciveHealthChecks().contains(HealthChecks.NO_WARNING)) {
206 206
                String ignore_warning = null;
207 207
                List<String> warnings = getWarnings().stream().filter(str -> ignore_warning == null || !str.startsWith(ignore_warning)).collect(Collectors.toList());
208
                assertTrue("The page must not show an warning box", warnings.size() == 0);
208
                assertTrue("The page must not show an warning box: (" + String.join(" | ", warnings) + ")", warnings.size() == 0);
209 209
            }
210 210
        } catch (NoSuchElementException e) {
211 211
            //IGNORE since this is expected!

Also available in: Unified diff