ref #10241 fix tests in other test classes

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/out/DwcaExportTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/out/DwcaExportTest.java
index a3a92ee7e2122664aeeae8e2ed5e99415afd62fe..c9120f11d8d75c0d639546d6789973d7c9954f10 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/out/DwcaExportTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/out/DwcaExportTest.java
@@ -29,6 +29,7 @@ import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
+import eu.etaxonomy.cdm.format.description.QuantitativeDataFormatter;
 import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultExport;
 import eu.etaxonomy.cdm.io.common.ExportDataWrapper;
 import eu.etaxonomy.cdm.io.common.ExportResult;
@@ -283,7 +284,8 @@ public class DwcaExportTest  extends CdmTransactionalIntegrationTest{
         System.out.println(descriptionStr);
 
         //   quantitative data
-        expected = "\"9182e136-f2e2-4f9a-9010-3f35908fb5e0\",\"0.1-1.3 [n=2]\",\"Chromosome Numbers\"";
+        String sep = QuantitativeDataFormatter.lowerUpperSep;
+        expected = "\"9182e136-f2e2-4f9a-9010-3f35908fb5e0\",\"0.1"+sep+"1.3 [n=2]\",\"Chromosome Numbers\"";
         Assert.assertTrue(descriptionStr.contains(expected));
         //   textdata
         expected = "\"9182e136-f2e2-4f9a-9010-3f35908fb5e0\",\"My Description\",\"Description\",,\"eng\",,,,,";

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/description/QuantitativeDataFormatter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/description/QuantitativeDataFormatter.java
index 41a1052b03b1f1abda14e6c97b6a65518df6fea5..d60e1fb6ac196af9b49da60612f22ccdd084a45e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/description/QuantitativeDataFormatter.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/description/QuantitativeDataFormatter.java
@@ -31,7 +31,7 @@ public class QuantitativeDataFormatter
     static final String sepDash = "-";   //TODO which "-"
     static final String minSep = UTF8.NARROW_NO_BREAK + sepDash;
     static final String maxSep = sepDash + UTF8.NARROW_NO_BREAK;
-    static final String lowerUpperSep = UTF8.NARROW_NO_BREAK + sepDash + UTF8.NARROW_NO_BREAK;
+    public static final String lowerUpperSep = UTF8.NARROW_NO_BREAK + sepDash + UTF8.NARROW_NO_BREAK;
 
     static final String modifierSep = UTF8.NARROW_NO_BREAK.toString();
 

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/ReferencingObjectFormatterTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/ReferencingObjectFormatterTest.java
index 38a42e7a734bc0e18101ee0a96cb77a5ab779616..25a12fc98036d0dbe0cf30c6611859e2ec5532c6 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/ReferencingObjectFormatterTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/ReferencingObjectFormatterTest.java
@@ -15,6 +15,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.common.UTF8;
+import eu.etaxonomy.cdm.format.description.QuantitativeDataFormatter;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.ExtendedTimePeriod;
@@ -130,7 +131,8 @@ public class ReferencingObjectFormatterTest extends TermTestBase {
         //Quantitative Data
         QuantitativeData quantData = QuantitativeData.NewMinMaxInstance(Feature.DESCRIPTION(), BigDecimal.valueOf(2d), BigDecimal.valueOf(4d));
         taxonDescription1.addElement(quantData);
-        Assert.assertEquals("2.0-4.0 (Abies alba Mill. sec. Linne 1753)", defaultFormat(quantData));
+        String sep = QuantitativeDataFormatter.lowerUpperSep;
+        Assert.assertEquals("2.0"+sep+"4.0 (Abies alba Mill. sec. Linne 1753)", defaultFormat(quantData));
         StatisticalMeasurementValue minValue = quantData.getStatisticalValues().stream().filter(v->v.getType().equals(StatisticalMeasure.MIN())).findFirst().get();
         //TODO
         Assert.assertEquals("Min=2.0 (Abies alba Mill. sec. Linne 1753)", defaultFormat(minValue));