Skip to content

Commit c6e78d2

Browse files
committed
Fix UTF-8 test on JDK6
In particular, on a Mac the file.encoding is MacRoman scala> sys.props.get("file.encoding") res0: Option[String] = Some(MacRoman)
1 parent 19db0e1 commit c6e78d2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

jvm/src/test/scala/scala/xml/XMLTest.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -309,16 +309,16 @@ class XMLTestJVM {
309309
// com.sun.org.apache.xerces.internal.impl.io.MalformedByteSequenceException:
310310
// Invalid byte 1 of 1-byte UTF-8 sequence.
311311
// scala.xml.XML.save("foo.xml", xml)
312-
// scala.xml.XML.loadFile("foo.xml").toString)
312+
// scala.xml.XML.loadFile("foo.xml").toString
313313

314314
val outputStream = new java.io.ByteArrayOutputStream
315-
val streamWriter = new java.io.OutputStreamWriter(outputStream, XML.encoding)
315+
val streamWriter = new java.io.OutputStreamWriter(outputStream, "UTF-8")
316316

317317
XML.write(streamWriter, xml, XML.encoding, false, null)
318318
streamWriter.flush
319319

320320
val inputStream = new java.io.ByteArrayInputStream(outputStream.toByteArray)
321-
val streamReader = new java.io.InputStreamReader(inputStream)
321+
val streamReader = new java.io.InputStreamReader(inputStream, XML.encoding)
322322

323323
assertEquals(xml.toString, XML.load(streamReader).toString)
324324
}

0 commit comments

Comments
 (0)