aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Mandrikov <Godin@users.noreply.github.com>2017-10-13 07:03:39 +0200
committerMarc R. Hoffmann <hoffmann@mountainminds.com>2017-10-13 07:03:39 +0200
commit88d7b01d00451a1351aa7eec4783860844b58c29 (patch)
tree2fcfd37ef2c4cbdf356fc32bacc2643ca7ab172b
parentbdfa45fe6c4bc5b4bcc22cac83ff46c0b794838e (diff)
downloadjacoco-88d7b01d00451a1351aa7eec4783860844b58c29.tar.gz
Fix test to not require additional settings on JDK 9 (#611)
-rwxr-xr-x.travis.sh4
-rw-r--r--org.jacoco.report.test/src/org/jacoco/report/internal/html/table/PercentageColumnTest.java7
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.sh b/.travis.sh
index e8411f70..040cc567 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -83,10 +83,8 @@ case "$JDK" in
;;
9)
export MAVEN_OPTS="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts"
- # see https://bugs.openjdk.java.net/browse/JDK-8131041 about "java.locale.providers"
mvn -V -B -e verify -Dbytecode.version=1.9 \
- -Dinvoker.mavenOpts="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts" \
- -DargLine=-Djava.locale.providers=JRE,SPI
+ -Dinvoker.mavenOpts="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts"
;;
*)
echo "Incorrect JDK [$JDK]"
diff --git a/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/PercentageColumnTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/PercentageColumnTest.java
index 730154bc..7ab39ce1 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/PercentageColumnTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/PercentageColumnTest.java
@@ -115,8 +115,11 @@ public class PercentageColumnTest {
column.item(td, item, resources, root);
doc.close();
final Document doc = support.parse(output.getFile("Test.html"));
- assertEquals("100 %",
- support.findStr(doc, "/html/body/table/tr/td[1]/text()"));
+ // After integration of JEP 252 into JDK9, CLDR locale data is used by
+ // default, which results in usage of non-breaking space below, while
+ // the legacy locale data uses regular space:
+ assertTrue(support.findStr(doc, "/html/body/table/tr/td[1]/text()")
+ .matches("100[ \u00A0]%"));
}
@Test