Fix "unmappable character for ascii" warnings in libcore tests.
The libcore "core" and "core-test" builds are now warning-free. (For Java.)
diff --git a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrgetvalue1.java b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrgetvalue1.java
index d2e38ca..f3484da 100644
--- a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrgetvalue1.java
+++ b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrgetvalue1.java
@@ -69,7 +69,7 @@
attributes = testNode.getAttributes();
titleAttr = (Attr) attributes.getNamedItem("class");
value = titleAttr.getValue();
- assertEquals("attrValue1", "Yα", value);
+ assertEquals("attrValue1", "Y\u03b1", value); // android-changed: GREEK LOWER CASE ALPHA
}
/**
* Gets URI that identifies the test.
diff --git a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrgetvalue2.java b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrgetvalue2.java
index fd5b211..814b693 100644
--- a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrgetvalue2.java
+++ b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrgetvalue2.java
@@ -89,7 +89,7 @@
firstChild = titleAttr.getFirstChild();
retval = titleAttr.insertBefore(alphaRef, firstChild);
value = titleAttr.getValue();
- assertEquals("attrValue1", "αYα", value);
+ assertEquals("attrValue1", "\u03b1Y\u03b1", value); // android-changed: GREEK LOWER CASE ALPHA
}
}
diff --git a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrspecifiedvaluechanged.java b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrspecifiedvaluechanged.java
index c9a2e62..8ba4c57 100644
--- a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrspecifiedvaluechanged.java
+++ b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_attrspecifiedvaluechanged.java
@@ -71,7 +71,7 @@
doc = (Document) load("hc_staff", true);
addressList = doc.getElementsByTagName("acronym");
testNode = addressList.item(2);
- ((Element) /*Node */testNode).setAttribute("class", "Yα");
+ ((Element) /*Node */testNode).setAttribute("class", "Y\u03b1"); // android-changed: GREEK LOWER CASE ALPHA
attributes = testNode.getAttributes();
streetAttr = (Attr) attributes.getNamedItem("class");
state = streetAttr.getSpecified();
diff --git a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_namednodemapinuseattributeerr.java b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_namednodemapinuseattributeerr.java
index e8d3268..36dc3f8 100644
--- a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_namednodemapinuseattributeerr.java
+++ b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_namednodemapinuseattributeerr.java
@@ -75,7 +75,7 @@
elementList = doc.getElementsByTagName("acronym");
firstNode = (Element) elementList.item(0);
domesticAttr = doc.createAttribute("title");
- domesticAttr.setValue("Yα");
+ domesticAttr.setValue("Y\u03b1"); // android-changed: GREEK LOWER CASE ALPHA
setAttr = firstNode.setAttributeNode(domesticAttr);
elementList = doc.getElementsByTagName("acronym");
testNode = elementList.item(2);
diff --git a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_textparseintolistofelements.java b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_textparseintolistofelements.java
index 5694a4a..2a10501 100644
--- a/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_textparseintolistofelements.java
+++ b/libcore/dom/src/test/java/org/w3c/domts/level1/core/hc_textparseintolistofelements.java
@@ -72,13 +72,13 @@
java.util.List result = new java.util.ArrayList();
java.util.List expectedNormal = new java.util.ArrayList();
- expectedNormal.add("β");
+ expectedNormal.add("\u03b2"); // android-changed: GREEK LOWER CASE BETA
expectedNormal.add(" Dallas, ");
- expectedNormal.add("γ");
+ expectedNormal.add("\u03b3"); // android-changed: GREEK LOWER CASE GAMMA
expectedNormal.add("\n 98554");
java.util.List expectedExpanded = new java.util.ArrayList();
- expectedExpanded.add("β Dallas, γ\n 98554");
+ expectedExpanded.add("\u03b2 Dallas, \u03b3\n 98554"); // android-changed: GREEK LOWER CASE BETA, GREEK LOWER CASE GAMMA
doc = (Document) load("hc_staff", false);
elementList = doc.getElementsByTagName("acronym");
diff --git a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
index b92e37b..7a615d5 100644
--- a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
+++ b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
@@ -776,17 +776,17 @@
// Values based on Java 1.5 RI DecimalFormatSymbols for Locale.FRANCE
/*
* currency = [EUR]
- * currencySymbol = [€][U+20ac]
+ * currencySymbol = [U+20ac] // EURO SIGN
* decimalSeparator = [,][U+002c]
* digit = [#][U+0023]
- * groupingSeparator = [ ][U+00a0]
- * infinity = [∞][U+221e]
+ * groupingSeparator = [U+00a0] // NON-BREAKING SPACE
+ * infinity = [U+221e] // INFINITY
* internationalCurrencySymbol = [EUR]
* minusSign = [-][U+002d]
* monetaryDecimalSeparator = [,][U+002c]
- * naN = [�][U+fffd]
+ * naN = [U+fffd] // REPLACEMENT CHARACTER
* patternSeparator = [;][U+003b]
- * perMill = [‰][U+2030]
+ * perMill = [U+2030] // PER MILLE
* percent = [%][U+0025]
* zeroDigit = [0][U+0030]
*/
@@ -800,6 +800,8 @@
assertEquals('-', dfs.getMinusSign());
assertEquals(',', dfs.getMonetaryDecimalSeparator());
// RI's default NaN is U+FFFD, Harmony's is based on ICU
+ // This suggests an RI bug, assuming that non-UTF8 bytes are UTF8 and
+ // getting a conversion failure.
assertEquals("\uFFFD", dfs.getNaN());
assertEquals('\u003b', dfs.getPatternSeparator());
assertEquals('\u2030', dfs.getPerMill());
