Author: fanningpj
Date: Wed Jul 15 21:50:07 2026
New Revision: 1936176
Log:
update test code
Modified:
xmlbeans/trunk/src/test/java/misc/checkin/RichParserTests.java
xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
Modified: xmlbeans/trunk/src/test/java/misc/checkin/RichParserTests.java
==============================================================================
--- xmlbeans/trunk/src/test/java/misc/checkin/RichParserTests.java Wed Jul
15 21:46:22 2026 (r1936175)
+++ xmlbeans/trunk/src/test/java/misc/checkin/RichParserTests.java Wed Jul
15 21:50:07 2026 (r1936176)
@@ -28,11 +28,11 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.events.XMLEvent;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.nio.file.Files;
import java.util.Calendar;
import java.util.Date;
@@ -47,8 +47,8 @@ import static org.junit.jupiter.api.Asse
public class RichParserTests {
@Test
void testPrimitiveTypes() throws Exception {
- XMLStreamReader xsr = XmlObject.Factory.parse(new FileInputStream(
-
JarUtil.getResourceFromJarasFile("xbean/misc/primitiveTypes.xml"))).
+ XMLStreamReader xsr = XmlObject.Factory.parse(Files.newInputStream(
+
JarUtil.getResourceFromJarasFile("xbean/misc/primitiveTypes.xml").toPath())).
newXMLStreamReader();
XMLStreamReaderExt xsrext = new XMLStreamReaderExtImpl(xsr);
@@ -283,21 +283,18 @@ public class RichParserTests {
public static String readIS(InputStream is)
throws IOException {
- String res = "";
+ StringBuilder res = new StringBuilder();
byte[] buf = new byte[20];
- while (true) {
- int l = is.read(buf);
- if (l < 0) {
- break;
- }
- res += new String(buf, 0, l);
+ int l;
+ while ((l = is.read(buf)) != -1) {
+ res.append(new String(buf, 0, l));
}
- return res;
+ return res.toString();
}
public static void main(String[] args) throws IOException,
XMLStreamException {
XMLInputFactory factory = XMLInputFactory.newInstance();
- XMLStreamReader xsr = factory.createXMLStreamReader(new
FileInputStream(new File(args[0])));
+ XMLStreamReader xsr =
factory.createXMLStreamReader(Files.newInputStream(new File(args[0]).toPath()));
XMLStreamReaderExt xsrext = new XMLStreamReaderExtImpl(xsr);
while (xsrext.hasNext()) {
Modified: xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
==============================================================================
--- xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
Wed Jul 15 21:46:22 2026 (r1936175)
+++ xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
Wed Jul 15 21:50:07 2026 (r1936176)
@@ -21,6 +21,7 @@ import org.apache.xmlbeans.impl.schema.S
import java.io.*;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.*;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -251,8 +252,8 @@ public class Diff {
public static void filesAsXsb(File file1, File file2, List<XmlError>
diffs) {
assert file1.exists() : "File \"" + file1.getAbsolutePath() + "\" does
not exist.";
assert file2.exists() : "File \"" + file2.getAbsolutePath() + "\" does
not exist.";
- try (InputStream stream1 = new FileInputStream(file1);
- InputStream stream2 = new FileInputStream(file2)) {
+ try (InputStream stream1 = Files.newInputStream(file1.toPath());
+ InputStream stream2 = Files.newInputStream(file2.toPath())) {
streamsAsXsb(stream1, file1.getName(), stream2, file2.getName(),
diffs);
} catch (IOException ignored) {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]