Author: fanningpj
Date: Thu Apr 14 14:05:16 2022
New Revision: 1899854
URL: http://svn.apache.org/viewvc?rev=1899854&view=rev
Log:
[XMLBEANS-604] enable workaround an test
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
xmlbeans/trunk/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java
xmlbeans/trunk/src/test/java/xmlobject/checkin/SaverTest.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java?rev=1899854&r1=1899853&r2=1899854&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java Thu
Apr 14 14:05:16 2022
@@ -1705,6 +1705,10 @@ abstract class Saver {
assert _out == 0;
assert _in >= _out : "_in:" + _in + " < _out:" + _out;
+ if ((_buf.length - _in) != _free) {
+ //https://issues.apache.org/jira/browse/XMLBEANS-604
+ _in = _buf.length;
+ }
assert _free == _buf.length - _in;
try {
Modified:
xmlbeans/trunk/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java?rev=1899854&r1=1899853&r2=1899854&view=diff
==============================================================================
---
xmlbeans/trunk/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java
(original)
+++
xmlbeans/trunk/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java
Thu Apr 14 14:05:16 2022
@@ -42,7 +42,8 @@ public class TypesTest {
assertEquals(2000, d.get(Calendar.YEAR));
assertEquals(0, d.get(Calendar.MONTH));
assertEquals(1, d.get(Calendar.DAY_OF_MONTH));
- assertEquals((offsetSeconds * 1000), d.get(Calendar.ZONE_OFFSET));
+ //next assertion doesn't seem to take daylight savings into account
+ //assertEquals((offsetSeconds * 1000), d.get(Calendar.ZONE_OFFSET));
}
@Test
@@ -69,7 +70,8 @@ public class TypesTest {
@Test
void testDateTime() {
- int offsetSeconds = OffsetDateTime.now().getOffset().getTotalSeconds();
+ OffsetDateTime now = OffsetDateTime.now();
+ now.getOffset().getRules();
XmlObject[] res =
o.selectPath("xs:dateTime(\"2000-01-01T15:03:06.123\")");
assertEquals(1, res.length);
Calendar d = ((XmlDateTime) res[0]).getCalendarValue();
@@ -80,7 +82,8 @@ public class TypesTest {
assertEquals(3, d.get(Calendar.MINUTE));
assertEquals(6, d.get(Calendar.SECOND));
assertEquals(123, d.get(Calendar.MILLISECOND));
- assertEquals((offsetSeconds * 1000), d.get(Calendar.ZONE_OFFSET));
+ //next assertion doesn't seem to take daylight savings into account
+ //assertEquals((offsetSeconds * 1000), d.get(Calendar.ZONE_OFFSET));
}
@Test
Modified: xmlbeans/trunk/src/test/java/xmlobject/checkin/SaverTest.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlobject/checkin/SaverTest.java?rev=1899854&r1=1899853&r2=1899854&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlobject/checkin/SaverTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlobject/checkin/SaverTest.java Thu Apr 14
14:05:16 2022
@@ -17,15 +17,16 @@ package xmlobject.checkin;
import org.apache.commons.io.IOUtils;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class SaverTest {
- @Disabled("https://issues.apache.org/jira/browse/XMLBEANS-604";)
@Test
void testLengthAssertion() throws IOException, XmlException {
final String lineSeparator = System.getProperty("line.separator");
@@ -35,6 +36,11 @@ public class SaverTest {
XmlObject object = XmlObject.Factory.parse(xml);
try (InputStream is = object.newInputStream()) {
byte[] readBytes = IOUtils.toByteArray(is);
+ assertEquals(16391, readBytes.length);
+ try(ByteArrayInputStream bis = new
ByteArrayInputStream(readBytes)) {
+ XmlObject object2 = XmlObject.Factory.parse(bis);
+ assertEquals(xml, object2.toString());
+ }
}
} finally {
System.setProperty("line.separator", lineSeparator);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
