Modified: xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/systemId01.java URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/systemId01.java?rev=1896538&r1=1896537&r2=1896538&view=diff ============================================================================== --- xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/systemId01.java (original) +++ xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/systemId01.java Thu Dec 30 20:16:06 2021 @@ -26,7 +26,9 @@ import org.junit.Ignore; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import org.w3c.domts.DOMTestCase; + +import static org.w3c.domts.DOMTest.assertURIEquals; +import static org.w3c.domts.DOMTest.load; /** @@ -39,7 +41,7 @@ import org.w3c.domts.DOMTestCase; * * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId</a> */ -public class systemId01 extends DOMTestCase { +public class systemId01 { @Test @Ignore public void testRun() throws Throwable { @@ -50,7 +52,7 @@ public class systemId01 extends DOMTestC doc = load("staffNS", false); docType = doc.getDoctype(); systemId = docType.getSystemId(); - assertURIEquals("systemId", null, null, null, "staffNS.dtd", null, null, null, null, systemId); + assertURIEquals("systemId", "staffNS.dtd", systemId); }
Modified: xmlbeans/branches/gradle-build/src/test/java/random/common/Random.java URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/random/common/Random.java?rev=1896538&r1=1896537&r2=1896538&view=diff ============================================================================== --- xmlbeans/branches/gradle-build/src/test/java/random/common/Random.java (original) +++ xmlbeans/branches/gradle-build/src/test/java/random/common/Random.java Thu Dec 30 20:16:06 2021 @@ -30,6 +30,8 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; import java.util.Calendar; +import java.util.Locale; +import java.util.TimeZone; public class Random implements Runnable { @@ -483,7 +485,7 @@ public class Random implements Runnable if (x instanceof PurchaseOrder) { PurchaseOrder o = (PurchaseOrder) x; - o.setDate(Calendar.getInstance()); + o.setDate(Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ROOT)); } else if (x instanceof XmlCustomerBean) { XmlCustomerBean o = (XmlCustomerBean) x; o.setName("Bob"); Modified: xmlbeans/branches/gradle-build/src/test/java/scomp/simple/SimplePersonTest.java URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/scomp/simple/SimplePersonTest.java?rev=1896538&r1=1896537&r2=1896538&view=diff ============================================================================== --- xmlbeans/branches/gradle-build/src/test/java/scomp/simple/SimplePersonTest.java (original) +++ xmlbeans/branches/gradle-build/src/test/java/scomp/simple/SimplePersonTest.java Thu Dec 30 20:16:06 2021 @@ -21,9 +21,8 @@ import org.openuri.mytest.CustomerDocume import org.openuri.mytest.Person; import java.util.Calendar; -import java.util.Date; -import java.util.TimeZone; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; public class SimplePersonTest { @@ -54,23 +53,20 @@ public class SimplePersonTest { Person.Gender.Enum g = person.getGender(); assertEquals(Person.Gender.MALE, g); - assertEquals("EGIQTWYZJ", new String(person.getHex())); - assertEquals("This string is base64Binary encoded!", - new String(person.getBase64())); - - assertEquals("GGIQTWYGG", new String(person.getHexAtt())); - assertEquals("This string is base64Binary encoded!", - new String(person.getBase64Att())); + assertEquals("EGIQTWYZJ", new String(person.getHex(), UTF_8)); + assertEquals("This string is base64Binary encoded!", new String(person.getBase64(), UTF_8)); + + assertEquals("GGIQTWYGG", new String(person.getHexAtt(), UTF_8)); + assertEquals("This string is base64Binary encoded!", new String(person.getBase64Att(), UTF_8)); person.setFirstname("George"); assertEquals("George", person.getFirstname()); person.setHex("hex encoding".getBytes()); - assertEquals("hex encoding", new String(person.getHex())); + assertEquals("hex encoding", new String(person.getHex(), UTF_8)); person.setBase64("base64 encoded".getBytes()); - assertEquals("base64 encoded", - new String(person.getBase64())); + assertEquals("base64 encoded", new String(person.getBase64(), UTF_8)); //person.setHexAtt("hex encoding in attributes".getBytes()); //Assert.assertEquals("hex encoding in attributes", Modified: xmlbeans/branches/gradle-build/src/test/java/xmlobject/schematypes/checkin/SchemaTypesTests.java URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/xmlobject/schematypes/checkin/SchemaTypesTests.java?rev=1896538&r1=1896537&r2=1896538&view=diff ============================================================================== --- xmlbeans/branches/gradle-build/src/test/java/xmlobject/schematypes/checkin/SchemaTypesTests.java (original) +++ xmlbeans/branches/gradle-build/src/test/java/xmlobject/schematypes/checkin/SchemaTypesTests.java Thu Dec 30 20:16:06 2021 @@ -28,6 +28,7 @@ import javax.xml.namespace.QName; import java.io.IOException; import java.io.InputStream; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -81,13 +82,11 @@ public class SchemaTypesTests { Person.Gender.Enum g = person.getGender(); assertEquals(Person.Gender.MALE, g); - assertEquals("EGIQTWYZJ", new String(person.getHex())); - assertEquals("This string is base64Binary encoded!", - new String(person.getBase64())); - - assertEquals("GGIQTWYGG", new String(person.getHexAtt())); - assertEquals("This string is base64Binary encoded!", - new String(person.getBase64Att())); + assertEquals("EGIQTWYZJ", new String(person.getHex(), UTF_8)); + assertEquals("This string is base64Binary encoded!", new String(person.getBase64(), UTF_8)); + + assertEquals("GGIQTWYGG", new String(person.getHexAtt(), UTF_8)); + assertEquals("This string is base64Binary encoded!", new String(person.getBase64Att(), UTF_8)); assertEquals("{some_uri}localname", person.getQnameAtt().toString()); assertEquals("{http://openuri.org/xstypes/test}openuri_org_localname";, person.getQname().toString()); @@ -109,20 +108,17 @@ public class SchemaTypesTests { person.setFirstname("George"); assertEquals("George", person.getFirstname()); - person.setHex("hex encoding".getBytes()); - assertEquals("hex encoding", new String(person.getHex())); + person.setHex("hex encoding".getBytes(UTF_8)); + assertEquals("hex encoding", new String(person.getHex(), UTF_8)); + + person.setBase64("base64 encoded".getBytes(UTF_8)); + assertEquals("base64 encoded", new String(person.getBase64(), UTF_8)); + + person.setHexAtt("hex encoding in attributes".getBytes(UTF_8)); + assertEquals("hex encoding in attributes", new String(person.getHexAtt(), UTF_8)); - person.setBase64("base64 encoded".getBytes()); - assertEquals("base64 encoded", - new String(person.getBase64())); - - person.setHexAtt("hex encoding in attributes".getBytes()); - assertEquals("hex encoding in attributes", - new String(person.getHexAtt())); - - person.setBase64Att("This string is base64Binary encoded!".getBytes()); - assertEquals("This string is base64Binary encoded!", - new String(person.getBase64Att())); + person.setBase64Att("This string is base64Binary encoded!".getBytes(UTF_8)); + assertEquals("This string is base64Binary encoded!", new String(person.getBase64Att(), UTF_8)); person.setAnyuri("a.c:7001"); assertEquals("a.c:7001", person.getAnyuri()); Modified: xmlbeans/branches/gradle-build/src/test/java/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java?rev=1896538&r1=1896537&r2=1896538&view=diff ============================================================================== --- xmlbeans/branches/gradle-build/src/test/java/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java (original) +++ xmlbeans/branches/gradle-build/src/test/java/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java Thu Dec 30 20:16:06 2021 @@ -25,6 +25,7 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; import static org.junit.Assert.assertEquals; @@ -56,7 +57,7 @@ public class XmlStreamBeanReader { " </cc:customer>\n" + " </cc:credit-card-data>"; - XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(creditCardXmlwPrefix.getBytes())); + XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(creditCardXmlwPrefix.getBytes(StandardCharsets.UTF_8))); CreditCardDataDocument ccdoc = (CreditCardDataDocument) XmlObject.Factory.parse(reader, new XmlOptions().setDocumentType(CreditCardDataDocument.type)); assertEquals(1, ccdoc.getCreditCardData().getCustomerArray(0).getId()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
