Modified: xmlbeans/trunk/test/src/dom/detailed/w3c/ibmtests.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/detailed/w3c/ibmtests.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/dom/detailed/w3c/ibmtests.java (original) +++ xmlbeans/trunk/test/src/dom/detailed/w3c/ibmtests.java Fri Jan 18 23:08:44 2019 @@ -20,154 +20,146 @@ See W3C License http://www.w3.org/Consor //package org.w3c.domts.level2.core; package dom.detailed.w3c; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.w3c.domts.level2.core.*; - /** - * Test suite - * @author W3C DOM Test Working Group - **/ - public class ibmtests extends TestCase{ - - - - public static Test suite() { - TestSuite sink= new TestSuite(); - // sink.addTestSuite(attrgetownerelement01.class); - sink.addTestSuite(attrgetownerelement02.class); - sink.addTestSuite(attrgetownerelement03.class); - // sink.addTestSuite(attrgetownerelement04.class); - sink.addTestSuite(attrgetownerelement05.class); - sink.addTestSuite(documentcreateattributeNS01.class); - sink.addTestSuite(documentcreateattributeNS02.class); - sink.addTestSuite(documentcreateattributeNS03.class); - sink.addTestSuite(documentcreateattributeNS04.class); - sink.addTestSuite(documentcreateattributeNS05.class); - sink.addTestSuite(documentcreateattributeNS06.class); - sink.addTestSuite(documentcreateattributeNS07.class); - sink.addTestSuite(documentcreateelementNS01.class); - sink.addTestSuite(documentcreateelementNS02.class); - sink.addTestSuite(documentcreateelementNS05.class); - sink.addTestSuite(documentcreateelementNS06.class); - sink.addTestSuite(domimplementationcreatedocument03.class); - sink.addTestSuite(domimplementationcreatedocument04.class); - sink.addTestSuite(domimplementationcreatedocument05.class); - sink.addTestSuite(domimplementationcreatedocument07.class); - sink.addTestSuite(domimplementationcreatedocumenttype02.class); - sink.addTestSuite(domimplementationcreatedocumenttype04.class); - sink.addTestSuite(domimplementationhasfeature01.class); - sink.addTestSuite(domimplementationhasfeature02.class); - // sink.addTestSuite(documentgetelementbyid01.class); - sink.addTestSuite(documentgetelementsbytagnameNS01.class); - sink.addTestSuite(documentgetelementsbytagnameNS02.class); - sink.addTestSuite(documentgetelementsbytagnameNS03.class); - sink.addTestSuite(documentgetelementsbytagnameNS04.class); - sink.addTestSuite(documentgetelementsbytagnameNS05.class); - sink.addTestSuite(documentimportnode01.class); - // sink.addTestSuite(documentimportnode02.class); - sink.addTestSuite(documentimportnode03.class); - // sink.addTestSuite(documentimportnode04.class); - sink.addTestSuite(documentimportnode05.class); - sink.addTestSuite(documentimportnode06.class); - // sink.addTestSuite(documentimportnode07.class); - sink.addTestSuite(documentimportnode08.class); - sink.addTestSuite(documentimportnode09.class); - // sink.addTestSuite(documentimportnode10.class); - sink.addTestSuite(documentimportnode11.class); - sink.addTestSuite(documentimportnode12.class); - sink.addTestSuite(documentimportnode13.class); - sink.addTestSuite(documentimportnode14.class); - sink.addTestSuite(documentimportnode15.class); - sink.addTestSuite(documentimportnode17.class); - sink.addTestSuite(documentimportnode18.class); - // sink.addTestSuite(documentimportnode19.class); - // sink.addTestSuite(documentimportnode20.class); - // sink.addTestSuite(documentimportnode21.class); - // sink.addTestSuite(documentimportnode22.class); - // sink.addTestSuite(documenttypeinternalSubset01.class); - // sink.addTestSuite(documenttypepublicid01.class); - // sink.addTestSuite(documenttypesystemid01.class); - sink.addTestSuite(elementgetattributens02.class); - sink.addTestSuite(elementgetattributenodens01.class); - sink.addTestSuite(elementgetattributenodens02.class); - sink.addTestSuite(elementgetattributenodens03.class); - sink.addTestSuite(elementgetelementsbytagnamens02.class); - sink.addTestSuite(elementgetelementsbytagnamens04.class); - sink.addTestSuite(elementgetelementsbytagnamens05.class); - sink.addTestSuite(elementhasattribute01.class); - sink.addTestSuite(elementhasattribute02.class); - sink.addTestSuite(elementhasattribute03.class); - sink.addTestSuite(elementhasattribute04.class); - sink.addTestSuite(elementhasattributens01.class); - sink.addTestSuite(elementhasattributens02.class); - sink.addTestSuite(elementhasattributens03.class); - sink.addTestSuite(elementremoveattributens01.class); - sink.addTestSuite(elementsetattributens01.class); - sink.addTestSuite(elementsetattributens02.class); - sink.addTestSuite(elementsetattributens03.class); - sink.addTestSuite(elementsetattributens04.class); - sink.addTestSuite(elementsetattributens05.class); - sink.addTestSuite(elementsetattributens08.class); - sink.addTestSuite(elementsetattributenodens01.class); - sink.addTestSuite(elementsetattributenodens02.class); - sink.addTestSuite(elementsetattributenodens03.class); - sink.addTestSuite(elementsetattributenodens04.class); - sink.addTestSuite(elementsetattributenodens05.class); - sink.addTestSuite(elementsetattributenodens06.class); - sink.addTestSuite(namednodemapgetnameditemns01.class); - sink.addTestSuite(namednodemapgetnameditemns02.class); - sink.addTestSuite(namednodemapgetnameditemns03.class); - sink.addTestSuite(namednodemapgetnameditemns04.class); - sink.addTestSuite(namednodemapgetnameditemns05.class); - sink.addTestSuite(namednodemapgetnameditemns06.class); - sink.addTestSuite(namednodemapsetnameditemns01.class); - sink.addTestSuite(namednodemapsetnameditemns02.class); - sink.addTestSuite(namednodemapsetnameditemns03.class); - sink.addTestSuite(namednodemapsetnameditemns04.class); - sink.addTestSuite(namednodemapsetnameditemns05.class); - sink.addTestSuite(namednodemapsetnameditemns06.class); - sink.addTestSuite(namednodemapsetnameditemns07.class); - sink.addTestSuite(namednodemapsetnameditemns08.class); - sink.addTestSuite(namednodemapsetnameditemns09.class); - sink.addTestSuite(namednodemapsetnameditemns10.class); - sink.addTestSuite(namednodemapremovenameditemns01.class); - sink.addTestSuite(namednodemapremovenameditemns02.class); - sink.addTestSuite(namednodemapremovenameditemns03.class); - sink.addTestSuite(namednodemapremovenameditemns04.class); - sink.addTestSuite(namednodemapremovenameditemns05.class); - sink.addTestSuite(namednodemapremovenameditemns06.class); - sink.addTestSuite(namednodemapremovenameditemns07.class); - sink.addTestSuite(namednodemapremovenameditemns08.class); - sink.addTestSuite(namednodemapremovenameditemns09.class); - sink.addTestSuite(nodegetlocalname03.class); - sink.addTestSuite(nodegetnamespaceuri03.class); - sink.addTestSuite(nodegetownerdocument01.class); - sink.addTestSuite(nodegetownerdocument02.class); - sink.addTestSuite(nodegetprefix03.class); - sink.addTestSuite(nodesetprefix01.class); - sink.addTestSuite(nodesetprefix02.class); - sink.addTestSuite(nodesetprefix03.class); - sink.addTestSuite(nodesetprefix04.class); - sink.addTestSuite(nodesetprefix05.class); - sink.addTestSuite(nodesetprefix06.class); - sink.addTestSuite(nodesetprefix07.class); - sink.addTestSuite(nodesetprefix08.class); - sink.addTestSuite(nodesetprefix09.class); - sink.addTestSuite(nodehasattributes01.class); - sink.addTestSuite(nodehasattributes02.class); - sink.addTestSuite(nodehasattributes03.class); - sink.addTestSuite(nodehasattributes04.class); - sink.addTestSuite(nodeissupported01.class); - sink.addTestSuite(nodeissupported02.class); - sink.addTestSuite(nodeissupported03.class); - sink.addTestSuite(nodeissupported04.class); - sink.addTestSuite(nodeissupported05.class); - - return sink; - } - - +/** +* Test suite +* @author W3C DOM Test Working Group +**/ +@RunWith(Suite.class) [email protected]({ + // attrgetownerelement01.class, + attrgetownerelement02.class, + attrgetownerelement03.class, + // attrgetownerelement04.class, + attrgetownerelement05.class, + documentcreateattributeNS01.class, + documentcreateattributeNS02.class, + documentcreateattributeNS03.class, + documentcreateattributeNS04.class, + documentcreateattributeNS05.class, + documentcreateattributeNS06.class, + documentcreateattributeNS07.class, + documentcreateelementNS01.class, + documentcreateelementNS02.class, + documentcreateelementNS05.class, + documentcreateelementNS06.class, + domimplementationcreatedocument03.class, + domimplementationcreatedocument04.class, + domimplementationcreatedocument05.class, + domimplementationcreatedocument07.class, + domimplementationcreatedocumenttype02.class, + domimplementationcreatedocumenttype04.class, + domimplementationhasfeature01.class, + domimplementationhasfeature02.class, + // documentgetelementbyid01.class, + documentgetelementsbytagnameNS01.class, + documentgetelementsbytagnameNS02.class, + documentgetelementsbytagnameNS03.class, + documentgetelementsbytagnameNS04.class, + documentgetelementsbytagnameNS05.class, + documentimportnode01.class, + // documentimportnode02.class, + documentimportnode03.class, + // documentimportnode04.class, + documentimportnode05.class, + documentimportnode06.class, + // documentimportnode07.class, + documentimportnode08.class, + documentimportnode09.class, + // documentimportnode10.class, + documentimportnode11.class, + documentimportnode12.class, + documentimportnode13.class, + documentimportnode14.class, + documentimportnode15.class, + documentimportnode17.class, + documentimportnode18.class, + // documentimportnode19.class, + // documentimportnode20.class, + // documentimportnode21.class, + // documentimportnode22.class, + // documenttypeinternalSubset01.class, + // documenttypepublicid01.class, + // documenttypesystemid01.class, + elementgetattributens02.class, + elementgetattributenodens01.class, + elementgetattributenodens02.class, + elementgetattributenodens03.class, + elementgetelementsbytagnamens02.class, + elementgetelementsbytagnamens04.class, + elementgetelementsbytagnamens05.class, + elementhasattribute01.class, + elementhasattribute02.class, + elementhasattribute03.class, + elementhasattribute04.class, + elementhasattributens01.class, + elementhasattributens02.class, + elementhasattributens03.class, + elementremoveattributens01.class, + elementsetattributens01.class, + elementsetattributens02.class, + elementsetattributens03.class, + elementsetattributens04.class, + elementsetattributens05.class, + elementsetattributens08.class, + elementsetattributenodens01.class, + elementsetattributenodens02.class, + elementsetattributenodens03.class, + elementsetattributenodens04.class, + elementsetattributenodens05.class, + elementsetattributenodens06.class, + namednodemapgetnameditemns01.class, + namednodemapgetnameditemns02.class, + namednodemapgetnameditemns03.class, + namednodemapgetnameditemns04.class, + namednodemapgetnameditemns05.class, + namednodemapgetnameditemns06.class, + namednodemapsetnameditemns01.class, + namednodemapsetnameditemns02.class, + namednodemapsetnameditemns03.class, + namednodemapsetnameditemns04.class, + namednodemapsetnameditemns05.class, + namednodemapsetnameditemns06.class, + namednodemapsetnameditemns07.class, + namednodemapsetnameditemns08.class, + namednodemapsetnameditemns09.class, + namednodemapsetnameditemns10.class, + namednodemapremovenameditemns01.class, + namednodemapremovenameditemns02.class, + namednodemapremovenameditemns03.class, + namednodemapremovenameditemns04.class, + namednodemapremovenameditemns05.class, + namednodemapremovenameditemns06.class, + namednodemapremovenameditemns07.class, + namednodemapremovenameditemns08.class, + namednodemapremovenameditemns09.class, + nodegetlocalname03.class, + nodegetnamespaceuri03.class, + nodegetownerdocument01.class, + nodegetownerdocument02.class, + nodegetprefix03.class, + nodesetprefix01.class, + nodesetprefix02.class, + nodesetprefix03.class, + nodesetprefix04.class, + nodesetprefix05.class, + nodesetprefix06.class, + nodesetprefix07.class, + nodesetprefix08.class, + nodesetprefix09.class, + nodehasattributes01.class, + nodehasattributes02.class, + nodehasattributes03.class, + nodehasattributes04.class, + nodeissupported01.class, + nodeissupported02.class, + nodeissupported03.class, + nodeissupported04.class, + nodeissupported05.class +}) +public class ibmtests { }
Modified: xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java (original) +++ xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java Fri Jan 18 23:08:44 2019 @@ -1580,7 +1580,7 @@ public class MarshalTests extends TestCa } } - public void testByNameBeanUnmarshal()StreamInstanceValidator + public void testByNameBeanUnmarshal() throws Exception { BindingContext bindingContext = getBindingContext(getBindingConfigDocument()); Modified: xmlbeans/trunk/test/src/misc/checkin/CharUtilTests.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/checkin/CharUtilTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/checkin/CharUtilTests.java (original) +++ xmlbeans/trunk/test/src/misc/checkin/CharUtilTests.java Fri Jan 18 23:08:44 2019 @@ -15,31 +15,17 @@ package misc.checkin; +import org.apache.xmlbeans.impl.store.CharUtil; +import org.junit.Test; + import java.util.ArrayList; import java.util.Random; -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.apache.xmlbeans.impl.store.CharUtil; -import org.apache.xmlbeans.impl.store.CharUtil.CharJoin; +import static org.junit.Assert.assertEquals; -public class CharUtilTests extends TestCase +public class CharUtilTests { - public CharUtilTests ( String name ) - { - super( name ); - } - - public static Test suite ( ) - { - return new TestSuite( CharUtilTests.class ); - } - - private static class Triple - { + private static class Triple { Triple ( Object src, int off, int cch ) { @@ -177,6 +163,7 @@ public class CharUtilTests extends TestC ArrayList _strings = new ArrayList(); } + @Test public void testCharUtil ( ) throws Exception { RealCharUtil real = new RealCharUtil(); @@ -198,13 +185,13 @@ public class CharUtilTests extends TestC case 1 : { - Assert.assertTrue( real.numTexts() == fake.numTexts() ); + assertEquals(real.numTexts(), fake.numTexts()); if (real.numTexts() > 0) { int j = rnd( real.numTexts() ); - Assert.assertTrue( real.getText( j ).equals( fake.getText( j ) ) ); + assertEquals(real.getText(j), fake.getText(j)); } } @@ -218,9 +205,9 @@ public class CharUtilTests extends TestC real.insert( i, j, off ); fake.insert( i, j, off ); - - Assert.assertTrue( real.getText( i ).equals( fake.getText( i ) ) ); - Assert.assertTrue( real.getText( j ).equals( fake.getText( j ) ) ); + + assertEquals(real.getText(i), fake.getText(i)); + assertEquals(real.getText(j), fake.getText(j)); } } case 3 : @@ -232,8 +219,8 @@ public class CharUtilTests extends TestC real.remove( i, off, cch ); fake.remove( i, off, cch ); - - Assert.assertTrue( real.getText( i ).equals( fake.getText( i ) ) ); + + assertEquals(real.getText(i), fake.getText(i)); } } } Modified: xmlbeans/trunk/test/src/misc/checkin/ErrorCodeTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/checkin/ErrorCodeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/checkin/ErrorCodeTest.java (original) +++ xmlbeans/trunk/test/src/misc/checkin/ErrorCodeTest.java Fri Jan 18 23:08:44 2019 @@ -16,38 +16,17 @@ package misc.checkin; import org.apache.xmlbeans.XmlErrorCodes; - -import junit.framework.Assert; -import junit.framework.TestCase; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.junit.Test; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.Map; -import java.util.Set; +import java.util.Enumeration; import java.util.LinkedHashSet; import java.util.Properties; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.List; -import java.util.ArrayList; -import java.io.FileInputStream; -import java.io.InputStream; - -public class ErrorCodeTest extends TestCase -{ - - public ErrorCodeTest(String name) - { - super(name); - } - - public static Test suite() - { - return new TestSuite(ErrorCodeTest.class); - } +import java.util.Set; +public class ErrorCodeTest { + @Test public void testCodes() throws Exception { // throws Exception if a duplicate error code value is found. @@ -70,9 +49,8 @@ public class ErrorCodeTest extends TestC } // each error code value should have a message key - Iterator iter = codes.iterator(); - while (iter.hasNext()) { - String code = (String) iter.next(); + for (Object code1 : codes) { + String code = (String) code1; if (messages.get(code) == null) throw new Exception("missing message.properties key for error code: " + code); } Modified: xmlbeans/trunk/test/src/misc/checkin/RichParserTests.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/checkin/RichParserTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/checkin/RichParserTests.java (original) +++ xmlbeans/trunk/test/src/misc/checkin/RichParserTests.java Fri Jan 18 23:08:44 2019 @@ -15,19 +15,11 @@ package misc.checkin; -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import org.apache.xmlbeans.GDate; -import org.apache.xmlbeans.GDateBuilder; -import org.apache.xmlbeans.GDuration; -import org.apache.xmlbeans.GDurationBuilder; -import org.apache.xmlbeans.XmlCalendar; -import org.apache.xmlbeans.XmlObject; -import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.*; import org.apache.xmlbeans.impl.richParser.XMLStreamReaderExt; import org.apache.xmlbeans.impl.richParser.XMLStreamReaderExtImpl; +import org.junit.Test; +import tools.util.JarUtil; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; @@ -43,20 +35,15 @@ import java.math.BigInteger; import java.util.Calendar; import java.util.Date; - -import tools.util.*; - +import static org.junit.Assert.assertEquals; /** * Author: Cezar Andrei (cezar.andrei at bea.com) * Date: Nov 19, 2003 */ -public class RichParserTests extends TestCase -{ - public RichParserTests(String name) { super(name); } - public static Test suite() { return new TestSuite(RichParserTests.class); } - +public class RichParserTests { + @Test public void testPrimitiveTypes() throws Exception { XMLStreamReader xsr = XmlObject.Factory.parse(new FileInputStream( @@ -112,75 +99,73 @@ public class RichParserTests extends Tes if ("int".equals(ln)) { int v = attIndex>-1 ? xs.getAttributeIntValue(attIndex) : xs.getIntValue(); - Assert.assertTrue("int " + v, ints[intsIdx++]==v); + assertEquals("int " + v, ints[intsIdx++], v); } else if ("boolean".equals(ln)) { boolean v = attIndex>-1 ? xs.getAttributeBooleanValue(attIndex) : xs.getBooleanValue(); - Assert.assertTrue("boolean " + v, bools[boolsIdx++]==v); + assertEquals("boolean " + v, bools[boolsIdx++], v); } else if ("short".equals(ln)) { short v = attIndex>-1 ? xs.getAttributeShortValue(attIndex) : xs.getShortValue(); - Assert.assertTrue("short " + v, shorts[shortsIdx++]==v); + assertEquals("short " + v, shorts[shortsIdx++], v); } else if ("byte".equals(ln)) { byte v = attIndex>-1 ? xs.getAttributeByteValue(attIndex) : xs.getByteValue(); - Assert.assertTrue("byte " + v, bytes[bytesIdx++]==v); + assertEquals("byte " + v, bytes[bytesIdx++], v); } else if ("long".equals(ln)) { long v = attIndex>-1 ? xs.getAttributeLongValue(attIndex) : xs.getLongValue(); - Assert.assertTrue("long " + v, longs[longsIdx++]==v); + assertEquals("long " + v, longs[longsIdx++], v); } else if ("double".equals(ln)) { double v = attIndex>-1 ? xs.getAttributeDoubleValue(attIndex) : xs.getDoubleValue(); - Assert.assertTrue("double expected: " + doubles[doublesIdx] + " actual: " + v, - new Double(doubles[doublesIdx++]).equals(new Double(v))); + assertEquals("double expected: " + doubles[doublesIdx] + " actual: " + v, new Double(doubles[doublesIdx++]), new Double(v)); // makeing new Doubles because Double.NaN==Double.NaN is false; } else if ("float".equals(ln)) { float v = attIndex>-1 ? xs.getAttributeFloatValue(attIndex) : xs.getFloatValue(); - Assert.assertTrue("float expected: " + floats[floatsIdx] + " actual: " + v, - new Float(floats[floatsIdx++]).equals( new Float(v))); + assertEquals("float expected: " + floats[floatsIdx] + " actual: " + v, new Float(floats[floatsIdx++]), new Float(v)); // makeing new Floats because Float.NaN==Float.NaN is false; } else if ("decimal".equals(ln)) { BigDecimal v = attIndex>-1 ? xs.getAttributeBigDecimalValue(attIndex) : xs.getBigDecimalValue(); - Assert.assertTrue("BigDecimal " + v, new BigDecimal("1.001").equals(v)); + assertEquals("BigDecimal " + v, new BigDecimal("1.001"), v); } else if ("integer".equals(ln)) { BigInteger v = attIndex>-1 ? xs.getAttributeBigIntegerValue(attIndex) : xs.getBigIntegerValue(); - Assert.assertTrue("BigInteger " + v, new BigInteger("1000000000").equals(v)); + assertEquals("BigInteger " + v, new BigInteger("1000000000"), v); } else if ("base64Binary".equals(ln)) { InputStream v = attIndex>-1 ? xs.getAttributeBase64Value(attIndex) : xs.getBase64Value(); String a = readIS(v); - Assert.assertTrue("Base64Binary " + a, "base64Binary".equals(a)); + assertEquals("Base64Binary " + a, "base64Binary", a); } else if ("hexBinary".equals(ln)) { InputStream v = attIndex>-1 ? xs.getAttributeHexBinaryValue(attIndex) : xs.getHexBinaryValue(); String a = readIS(v); - Assert.assertTrue("HexBinary " + a, "hexBinary".equals(a)); + assertEquals("HexBinary " + a, "hexBinary", a); } else if ("date".equals(ln)) { Calendar v = attIndex>-1 ? xs.getAttributeCalendarValue(attIndex) : xs.getCalendarValue(); Calendar c = new XmlCalendar( "2001-11-26T21:32:52Z" ); - Assert.assertTrue("Calendar expected:" + c.getTimeInMillis() + " actual:" + v.getTimeInMillis(), c.getTimeInMillis()==v.getTimeInMillis()); + assertEquals("Calendar expected:" + c.getTimeInMillis() + " actual:" + v.getTimeInMillis(), c.getTimeInMillis(), v.getTimeInMillis()); } else if ("dateTime".equals(ln)) { Date v = attIndex>-1 ? xs.getAttributeDateValue(attIndex) : xs.getDateValue(); Date d = new XmlCalendar("2001-11-26T21:32:52").getTime(); - Assert.assertTrue("Date expected:" + d + " actual:" + v, d.equals(v)); + assertEquals("Date expected:" + d + " actual:" + v, d, v); } else if ("gYearMonth".equals(ln)) { @@ -188,7 +173,7 @@ public class RichParserTests extends Tes GDateBuilder gdb = new GDateBuilder(); gdb.setYear(2001); gdb.setMonth(11); - Assert.assertTrue("GDate expected:" + gdb + " actual:" + v, gdb.toGDate().equals(v)); + assertEquals("GDate expected:" + gdb + " actual:" + v, gdb.toGDate(), v); } else if ("duration".equals(ln)) { @@ -196,12 +181,12 @@ public class RichParserTests extends Tes GDurationBuilder gdb = new GDurationBuilder(); gdb.setSign(-1); gdb.setSecond(7); - Assert.assertTrue("GDuration expected:" + gdb + " actual:" + v, gdb.toGDuration().equals(v)); + assertEquals("GDuration expected:" + gdb + " actual:" + v, gdb.toGDuration(), v); } else if ("QName".equals(ln)) { QName v = attIndex>-1 ? xs.getAttributeQNameValue(attIndex) : xs.getQNameValue(); - Assert.assertTrue("QName expected:" + qnames[qnamesIdx] + " actual:" + v, qnames[qnamesIdx++].equals(v)); + assertEquals("QName expected:" + qnames[qnamesIdx] + " actual:" + v, qnames[qnamesIdx++], v); } else if ("string".equals(ln)) { @@ -209,7 +194,7 @@ public class RichParserTests extends Tes String s = strings[stringsIdx++]; - Assert.assertTrue("String expected:\n'" + s + "' actual:\n'" + v + "'", s.equals(v)); + assertEquals("String expected:\n'" + s + "' actual:\n'" + v + "'", s, v); } } Modified: xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java (original) +++ xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java Fri Jan 18 23:08:44 2019 @@ -15,36 +15,24 @@ package misc.checkin; +import org.apache.xmlbeans.SchemaTypeLoader; import org.apache.xmlbeans.XmlBeans; -import org.apache.xmlbeans.XmlOptions; -import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlCursor; -import org.apache.xmlbeans.SchemaTypeLoader; +import org.apache.xmlbeans.XmlObject; +import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema; +import org.junit.Assert; +import org.junit.Test; +import tools.util.JarUtil; import javax.xml.namespace.QName; - import java.io.File; -import junit.framework.Assert; -import junit.framework.TestCase; -import junit.framework.Test; -import junit.framework.TestSuite; +import static org.junit.Assert.assertEquals; -import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema; +public class RuntimeSchemaLoaderTest { -import tools.util.*; - - -public class RuntimeSchemaLoaderTest extends TestCase { - public RuntimeSchemaLoaderTest(String name) { - super(name); - } - - public static Test suite() { - return new TestSuite(RuntimeSchemaLoaderTest.class); - } - + @Test public void testDynamicLoad() throws Throwable { File inputfile1 = JarUtil .getResourceFromJarasFile("xbean/misc/dyntest.xsd"); @@ -53,16 +41,17 @@ public class RuntimeSchemaLoaderTest ext XmlObject result = loader.parse( JarUtil.getResourceFromJarasFile("xbean/misc/dyntest.xml"), null, null); - Assert.assertEquals( + assertEquals( "D=wrappedinstance@http://openuri.org/test/dyntest";, result.schemaType().toString()); - Assert.assertEquals( + assertEquals( loader.findDocumentType( new QName("http://openuri.org/test/dyntest";, "wrappedinstance")), result.schemaType()); } + @Test public void testDynamicLoad2() throws Throwable { File inputfile1 = JarUtil .getResourceFromJarasFile("xbean/misc/dyntest2.xsd"); @@ -71,10 +60,10 @@ public class RuntimeSchemaLoaderTest ext XmlObject result = loader.parse( JarUtil.getResourceFromJarasFile("xbean/misc/dyntest2.xml"), null, null); - Assert.assertEquals( + assertEquals( "D=wrappedwildcard@http://openuri.org/test/dyntest";, result.schemaType().toString()); - Assert.assertEquals( + assertEquals( loader.findDocumentType( new QName("http://openuri.org/test/dyntest";, "wrappedwildcard")), @@ -82,20 +71,20 @@ public class RuntimeSchemaLoaderTest ext XmlCursor cur = result.newCursor(); Assert.assertTrue("Should have a root element", cur.toFirstChild()); result = cur.getObject(); - Assert.assertEquals( + assertEquals( "E=wrappedwildcard|D=wrappedwildcard@http://openuri.org/test/dyntest";, result.schemaType().toString()); - Assert.assertEquals( + assertEquals( loader.findElement( new QName("http://openuri.org/test/dyntest";, "wrappedwildcard")) .getType(), result.schemaType()); Assert.assertTrue("Should have a first child", cur.toFirstChild()); - Assert.assertEquals( + assertEquals( new QName("http://www.w3.org/2001/XMLSchema";, "schema"), cur.getName()); XmlObject obj = cur.getObject(); - Assert.assertEquals(Schema.type, obj.schemaType()); + assertEquals(Schema.type, obj.schemaType()); } } Modified: xmlbeans/trunk/test/src/misc/checkin/ThreadingTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/checkin/ThreadingTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/checkin/ThreadingTest.java (original) +++ xmlbeans/trunk/test/src/misc/checkin/ThreadingTest.java Fri Jan 18 23:08:44 2019 @@ -15,29 +15,20 @@ package misc.checkin; -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.framework.TestCase; -import junit.framework.Assert; import org.apache.xmlbeans.SchemaTypeLoader; import org.apache.xmlbeans.XmlBeans; import org.apache.xmlbeans.XmlObject; -import org.apache.xmlbeans.XmlOptions; +import org.junit.Assert; +import org.junit.Test; +import tools.util.JarUtil; import javax.xml.namespace.QName; - -import tools.util.*; - import java.io.File; -public class ThreadingTest extends TestCase { - public ThreadingTest(String name) { - super(name); - } +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; - public static Test suite() { - return new TestSuite(ThreadingTest.class); - } +public class ThreadingTest { public static final int THREAD_COUNT = 4; public static final int ITERATION_COUNT = 1; @@ -78,6 +69,7 @@ public class ThreadingTest extends TestC } } + @Test public void testThreadedCompilation() throws Throwable { CompilationThread[] threads = new CompilationThread[THREAD_COUNT]; for (int i = 0; i < threads.length; i++) { @@ -93,8 +85,8 @@ public class ThreadingTest extends TestC } for (int i = 0; i < threads.length; i++) { - Assert.assertNull(threads[i].getException()); - Assert.assertTrue("Thread " + i + " didn't succeed", + assertNull(threads[i].getException()); + assertTrue("Thread " + i + " didn't succeed", threads[i].getResult()); } } Modified: xmlbeans/trunk/test/src/misc/checkin/VersionTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/checkin/VersionTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/checkin/VersionTest.java (original) +++ xmlbeans/trunk/test/src/misc/checkin/VersionTest.java Fri Jan 18 23:08:44 2019 @@ -15,53 +15,19 @@ package misc.checkin; -import org.apache.xmlbeans.XmlErrorCodes; import org.apache.xmlbeans.XmlBeans; +import org.junit.Test; -import junit.framework.Assert; -import junit.framework.TestCase; -import junit.framework.Test; -import junit.framework.TestSuite; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Map; -import java.util.Set; -import java.util.LinkedHashSet; -import java.util.Properties; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.List; -import java.util.ArrayList; -import java.io.FileInputStream; -import java.io.InputStream; - -public class VersionTest extends TestCase -{ - - public VersionTest(String name) - { - super(name); - } +import static org.junit.Assert.assertNotNull; + +public class VersionTest { - public static Test suite() - { - return new TestSuite(VersionTest.class); - } // Test the getVersion API - public void testXBeansVersion() - { - try - { - String version = XmlBeans.getVersion(); - System.out.println("XmlBeans version:" + version); - assertNotNull(version); - } - catch(NullPointerException npe) - { - fail("NPE thrown for XmlBeans.getVersion()"); - } + @Test + public void testXBeansVersion() { + String version = XmlBeans.getVersion(); + assertNotNull(version); } } Modified: xmlbeans/trunk/test/src/misc/checkin/XMLBEANS412Test.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/checkin/XMLBEANS412Test.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/checkin/XMLBEANS412Test.java (original) +++ xmlbeans/trunk/test/src/misc/checkin/XMLBEANS412Test.java Fri Jan 18 23:08:44 2019 @@ -1,16 +1,14 @@ package misc.checkin; -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.xmlbeans.impl.regex.ParseException; import org.apache.xmlbeans.impl.regex.RegularExpression; +import org.junit.Test; import java.util.StringTokenizer; -public class XMLBEANS412Test extends TestCase -{ +import static org.junit.Assert.fail; + +public class XMLBEANS412Test { static String PassedPosCharGroups = "-,\\-,--,\\--,---,\\---,--\\-,\\--\\-,-\\--,\\-\\--,-a,\\-a,a-,"+ "a\\-,a-b,a\\-b,a\\--,-a-z,\\-a-z,a-z-,a-z\\-,a-z\\-0-9,a\\-z-,a\\-z\\-,a\\-z\\-0-9,"+ "-0-9,0-9-,0-9aaa,0-9a-,a-z\\--/,A-F0-9.+-,-A-F0-9.+,A-F0-9.+\\-,\\-A-F0-9.+"; @@ -18,16 +16,7 @@ public class XMLBEANS412Test extends Tes static String FailedPosCharGroups = "[a--],[a-z-0-9],[a\\-z-0-9],[0-9--],[0-9a--],[0-9-a],[0-9-a-z]"; static String MiscPassedPatterns = "([\\.a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(([a-zA-Z0-9_-])*\\.([a-zA-Z0-9_-])+)+"; - public XMLBEANS412Test(String name) - { - super(name); - } - - public static Test suite() - { - return new TestSuite(XMLBEANS412Test.class); - } - + @Test public void testPassedPosCharGroupPatterns() { StringTokenizer tok = new StringTokenizer(PassedPosCharGroups,","); @@ -36,11 +25,12 @@ public class XMLBEANS412Test extends Tes try { new RegularExpression(pattern, "X"); } catch (ParseException e) { - Assert.fail("Pattern " + pattern + " failed due to " + e.getMessage()); + fail("Pattern " + pattern + " failed due to " + e.getMessage()); } } } + @Test public void testNegatedPassedPosCharGroupPatterns() { StringTokenizer tok = new StringTokenizer(PassedPosCharGroups,","); @@ -49,13 +39,12 @@ public class XMLBEANS412Test extends Tes try { new RegularExpression(pattern, "X"); } catch (ParseException e) { - Assert.fail("Pattern " + pattern + " failed due to " + e.getMessage()); + fail("Pattern " + pattern + " failed due to " + e.getMessage()); } } - - } + @Test public void testFailedPosCharGroupPatterns() { StringTokenizer tok = new StringTokenizer(FailedPosCharGroups,","); @@ -66,10 +55,11 @@ public class XMLBEANS412Test extends Tes } catch (ParseException e) { continue; } - Assert.fail("Pattern " + pattern + " did not fail."); + fail("Pattern " + pattern + " did not fail."); } } + @Test public void testNegatedFailedPosCharGroupPatterns() { StringTokenizer tok = new StringTokenizer(FailedPosCharGroups,","); @@ -80,10 +70,11 @@ public class XMLBEANS412Test extends Tes } catch (ParseException e) { continue; } - Assert.fail("Pattern " + pattern + " did not fail."); + fail("Pattern " + pattern + " did not fail."); } } + @Test public void testMiscPassedPatterns() { StringTokenizer tok = new StringTokenizer(MiscPassedPatterns,","); while (tok.hasMoreElements()) { @@ -91,9 +82,8 @@ public class XMLBEANS412Test extends Tes try { new RegularExpression(pattern, "X"); } catch (ParseException e) { - Assert.fail("Pattern " + pattern + " failed due to " + e.getMessage()); + fail("Pattern " + pattern + " failed due to " + e.getMessage()); } } - } } Modified: xmlbeans/trunk/test/src/misc/common/JiraTestBase.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/common/JiraTestBase.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/common/JiraTestBase.java (original) +++ xmlbeans/trunk/test/src/misc/common/JiraTestBase.java Fri Jan 18 23:08:44 2019 @@ -15,9 +15,10 @@ */ package misc.common; -import java.io.File; import common.Common; +import java.io.File; + /** * */ @@ -34,12 +35,9 @@ public class JiraTestBase extends Common public static File schemaCompSrcDir = null; public static File schemaCompClassesDir = null; - public static final int THREAD_COUNT = 150; public static final int ITERATION_COUNT = 2; - public JiraTestBase(String name){ - super(name); - + public JiraTestBase(){ // directories for the SchemaCompiler.Parameter class members if (schemaCompSrcDir == null) { schemaCompSrcDir = new File(schemaCompOutputDirPath + P + "src"); Modified: xmlbeans/trunk/test/src/misc/common/ParsersBase.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/common/ParsersBase.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/common/ParsersBase.java (original) +++ xmlbeans/trunk/test/src/misc/common/ParsersBase.java Fri Jan 18 23:08:44 2019 @@ -16,7 +16,6 @@ package misc.common; -import junit.framework.TestCase; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -30,8 +29,10 @@ import javax.xml.parsers.SAXParserFactor import java.io.IOException; import java.io.StringReader; +import static org.junit.Assert.fail; -public class ParsersBase extends TestCase { + +public class ParsersBase { private static final String outputEncoding = "UTF-8"; Modified: xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java Fri Jan 18 23:08:44 2019 @@ -17,18 +17,22 @@ package misc.detailed; import misc.common.ParsersBase; +import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; -import org.apache.xmlbeans.XmlException; +import org.junit.Test; -import java.util.List; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; + +import static org.junit.Assert.fail; public class CharEncodingTest extends ParsersBase { // Piccolo fails when trying to parse I18N chars in some QNames // String 2 fails with piccolo and hence with xbeans + @Test public void testCharEncodingI18N() { String I18N_test_string1 = "<i18n xmlns:\u00c1\u00c1\u00c1=\"\u00c1\u00c1\u00c1\" type=\"\u00c1\u00c1\u00c1:t\"/>"; String I18N_test_string2 = "<i18n xmlns:\u30af\u30af\u30af=\"\u30af\u30af\u30af\" type=\"\u30af\u30af\u30af:t\"/>"; @@ -48,6 +52,7 @@ public class CharEncodingTest extends Pa // Piccolo has an issue with handling external identifiers when the value is PUBLIC // refer : http://cafeconleche.org/SAXTest/results/com.bluecast.xml.Piccolo/xmltest/valid/not-sa/009.xml.html // results for the SAX conformance suite. This has been fixed in newer versions of Piccolo + @Test public void testExternalPublicIdentifier() { // repro using piccolo and other parsers via JAXP API String netPubEntity = "<!DOCTYPE doc PUBLIC \"whatever\" \"http://www.w3.org/2001/XMLSchema.dtd\"; [\n" + Modified: xmlbeans/trunk/test/src/misc/detailed/CharEscapeTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/CharEscapeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/CharEscapeTest.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/CharEscapeTest.java Fri Jan 18 23:08:44 2019 @@ -14,17 +14,18 @@ */ package misc.detailed; +import common.Common; +import jira.xmlbeans177.TestListDocument; +import jira.xmlbeans177A.TestListADocument; +import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.XmlOptionCharEscapeMap; +import org.apache.xmlbeans.XmlOptions; +import org.junit.Test; + import java.io.File; import java.util.HashMap; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.apache.xmlbeans.*; -import jira.xmlbeans177.*; -import jira.xmlbeans177A.*; -import common.Common; +import static org.junit.Assert.*; public class CharEscapeTest extends Common { @@ -41,11 +42,7 @@ public class CharEscapeTest extends Comm static final String start2 = "<jira:testListA xmlns:jira=\"http://jira/xmlbeans_177a\";>"; static final String end2 = "</jira:testListA>"; - public CharEscapeTest(String name) - { - super(name); - } - + @Test public void testAddMapping() throws Exception { XmlOptionCharEscapeMap charEsc = new XmlOptionCharEscapeMap(); @@ -96,6 +93,7 @@ public class CharEscapeTest extends Comm } } + @Test public void testAddMappings() throws Exception { XmlOptionCharEscapeMap charEsc = new XmlOptionCharEscapeMap(); @@ -140,6 +138,7 @@ public class CharEscapeTest extends Comm assertEquals("Z", charEsc.getEscapedString('Z')); } + @Test public void testEscape1() throws Exception { File f = new File(inputFile); @@ -198,6 +197,7 @@ public class CharEscapeTest extends Comm */ } + @Test public void testEscape2() throws Exception { TestListDocument doc = TestListDocument.Factory.newInstance(); @@ -227,6 +227,7 @@ public class CharEscapeTest extends Comm assertEquals(exp, doc.xmlText(opts)); } + @Test public void testEscapeAttribute() throws Exception { File f = new File(inputFile2); @@ -270,15 +271,4 @@ public class CharEscapeTest extends Comm end2; assertEquals(exp3, doc.xmlText(opts)); } - - public static Test suite() - { - TestSuite suite = new TestSuite(CharEscapeTest.class); - return suite; - } - - public static void main(String args[]) - { - junit.textui.TestRunner.run(suite()); - } } Modified: xmlbeans/trunk/test/src/misc/detailed/ClassLoadingTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/ClassLoadingTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/ClassLoadingTest.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/ClassLoadingTest.java Fri Jan 18 23:08:44 2019 @@ -15,10 +15,9 @@ package misc.detailed; -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.framework.TestCase; import org.apache.xmlbeans.*; +import org.junit.Ignore; +import org.junit.Test; import java.io.File; import java.util.ArrayList; @@ -27,18 +26,8 @@ import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; - -public class ClassLoadingTest extends TestCase -{ - public ClassLoadingTest(String name) - { - super(name); - } - - public static Test suite() - { - return new TestSuite(ClassLoadingTest.class); - } +@Ignore("needs to be updated to current jars") +public class ClassLoadingTest { public static class CompilationThread extends Thread { @@ -263,7 +252,8 @@ public class ClassLoadingTest extends Te /** * OOM Error happens around thread 97 with the params listed below */ - public static void testThreadedCompilation() throws Throwable + @Test + public void testThreadedCompilation() throws Throwable { Runtime r = Runtime.getRuntime(); CompilationThread[] threads = new CompilationThread[THREAD_COUNT]; @@ -288,24 +278,5 @@ public class ClassLoadingTest extends Te // threads[i].getResult()); //} } - - /** - * Call this with something like the following - * D:\xml\xml-xmlbeans\v2\build\test\lib> - * java - * -Xms8M -Xmx16M - * -cp .\testcases.jar;.\testtools.jar;.;..\..\lib\xbean.jar; - * ..\..\lib\jsr173.jar;..\..\lib\xmlpublic.jar; - * ..\..\lib\jsr173_api.jar;..\..\lib\jsr173_ri.jar; - * ..\..\..\external\lib\junit.jar; - * misc.detailed.ClassLoadingTest - * @param args - * @throws Throwable - */ - public static void main(String[] args) throws Throwable - { - testThreadedCompilation(); - throw new Exception("FOO"); - } } Modified: xmlbeans/trunk/test/src/misc/detailed/JiraRegression151_200Test.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/JiraRegression151_200Test.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/JiraRegression151_200Test.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/JiraRegression151_200Test.java Fri Jan 18 23:08:44 2019 @@ -16,33 +16,31 @@ package misc.detailed; import misc.common.JiraTestBase; -import org.apache.xmlbeans.XmlOptions; +import net.eads.space.scoexml.test.TestExponentDocument; import org.apache.xmlbeans.XmlObject; +import org.apache.xmlbeans.XmlOptions; import org.apache.xmlbeans.impl.tool.SchemaCompiler; +import org.junit.Test; +import java.io.File; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.io.File; -import net.eads.space.scoexml.test.TestExponentDocument; -import junit.framework.Assert; +import static org.junit.Assert.*; /** * */ public class JiraRegression151_200Test extends JiraTestBase { - public JiraRegression151_200Test(String name) - { - super(name); - } /** * [XMLBEANS-175] Validation of decimal in exponential representation fails * @throws Exception */ + @Test public void test_jira_xmlbeans175() throws Exception{ TestExponentDocument.TestExponent exponent = TestExponentDocument.TestExponent.Factory.newInstance(); @@ -71,6 +69,7 @@ public class JiraRegression151_200Test e /** * [XMLBEANS-179] Saving xml with '&' and '<' characters in attribute values throws an ArrayIndexOutOfBoundsException */ + @Test public void test_jira_xmlbeans179() throws Exception{ String xmlWithIssues = "<Net id=\"dbid:66754220\" name=\"3<.3V\" type=\"POWER\"/>"; @@ -86,8 +85,8 @@ public class JiraRegression151_200Test e /* * [XMLBEANS-184]: NPE when running scomp without nopvr option - * */ + @Test public void test_jira_xmlbeans184() throws Exception { List errors = new ArrayList(); @@ -107,7 +106,7 @@ public class JiraRegression151_200Test e } if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans184() : Errors found when executing scomp"); + fail("test_jira_xmlbeans184() : Errors found when executing scomp"); } // now compile without the pvr option and NPE is thrown @@ -120,7 +119,7 @@ public class JiraRegression151_200Test e } if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans184() : Errors found when executing scomp "); + fail("test_jira_xmlbeans184() : Errors found when executing scomp "); } } Modified: xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java Fri Jan 18 23:08:44 2019 @@ -15,33 +15,27 @@ package misc.detailed; import misc.common.JiraTestBase; - -import java.io.*; -import java.util.*; - import org.apache.xmlbeans.*; import org.apache.xmlbeans.impl.tool.SchemaCompiler; import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument; +import org.junit.Ignore; +import org.junit.Test; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -import junit.framework.Assert; +import xmlbeans48.FeedInfoType; import javax.xml.namespace.QName; +import java.io.*; +import java.util.*; -import xmlbeans48.FeedInfoType; +import static org.junit.Assert.*; -/** - * - */ public class JiraRegression1_50Test extends JiraTestBase { - public JiraRegression1_50Test(String name) { - super(name); - } - /* * [XMLBEANS-2] Problem with XmlError.forObject(String,int,XmlObject) */ + @Test public void test_jira_xmlbeans02() throws Exception { StringBuffer xmlstringbuf = new StringBuffer("<?xml version=\"1.0\" encoding=\"utf-8\"?>"); xmlstringbuf.append("<test>"); @@ -67,7 +61,7 @@ public class JiraRegression1_50Test exte } } catch (NullPointerException npe) { - Assert.fail("test_jira_xmlbeans02() : Null Pointer Exception thrown !"); + fail("test_jira_xmlbeans02() : Null Pointer Exception thrown !"); } printOptionErrMsgs(errors); @@ -75,8 +69,8 @@ public class JiraRegression1_50Test exte /* * [XMLBEANS-4] xs:decimal size greater than 18 results in uncompilable java code - * */ + @Test public void test_jira_xmlbeans04() { List errors = new ArrayList(); @@ -88,7 +82,7 @@ public class JiraRegression1_50Test exte SchemaCompiler.compile(params); if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans04() : Errors found when executing scomp"); + fail("test_jira_xmlbeans04() : Errors found when executing scomp"); } } @@ -96,8 +90,9 @@ public class JiraRegression1_50Test exte /* * [XMLBEANS-9] Null Pointer Exception when running validate from cmd line - * */ + @Test + @Ignore("no shell tests on junit") public void test_jira_xmlbeans09() throws Exception { // Exec validate script from cmd line - Refer xmlbeans_09.xsd, xmlbeans_09.xml @@ -108,7 +103,7 @@ public class JiraRegression1_50Test exte try { validator_proc = Runtime.getRuntime().exec(sb.toString()); } catch (NullPointerException npe) { - Assert.fail("test_jira_xmlbeans09() : Null Pointer Exception when running validate for schema"); + fail("test_jira_xmlbeans09() : Null Pointer Exception when running validate for schema"); } System.out.println("cmd:" + sb); @@ -131,6 +126,7 @@ public class JiraRegression1_50Test exte * [XMLBEANS-11]: Calling getUnionMemberTypes() on SchemaType for non-union types results in NullPointerException * status : fixed */ + @Test public void test_jira_xmlbeans11() throws Exception { StringBuffer xsdAsString = new StringBuffer("<?xml version=\"1.0\" encoding=\"utf-8\" ?>"); @@ -164,15 +160,15 @@ public class JiraRegression1_50Test exte System.out.println("IS UNION TYPE: " + (st[i].getUnionMemberTypes() != null)); } } catch (NullPointerException npe) { - Assert.fail("test_jira_xmlbeans11(): Null Pointer Exception thrown !"); + fail("test_jira_xmlbeans11(): Null Pointer Exception thrown !"); } } /* * [XMLBEANS-14]: newDomNode() throws NullPointerException - * */ + @Test public void test_jira_xmlbeans14() throws Exception { XmlObject xObj = XmlObject.Factory.parse("<Baz/>"); // add element @@ -189,7 +185,7 @@ public class JiraRegression1_50Test exte try { xObj.newDomNode(); } catch (NullPointerException npe) { - Assert.fail("test_jira_xmlbeans14() : Null Pointer Exception when create Dom Node"); + fail("test_jira_xmlbeans14() : Null Pointer Exception when create Dom Node"); } } @@ -200,6 +196,8 @@ public class JiraRegression1_50Test exte * attributes (rather than null) * status : fails with crimson and not with Xerces */ + @Test + @Ignore("still happens with current xerces 2.11") public void test_jira_xmlbeans16() throws Exception { StringBuffer sb = new StringBuffer(100); sb.append("<?xml version='1.0'?>\n"); @@ -231,8 +229,8 @@ public class JiraRegression1_50Test exte /* * [XMLBEANS-33]: insertions occur in improper order when subclassing schema types - * */ + @Test public void test_jira_xmlbeans33() throws Exception { xbeansJira33B.SubjectType subject = @@ -251,14 +249,14 @@ public class JiraRegression1_50Test exte for (int i = 0; i < list.size(); i++) { System.out.println("Validation Error : " + list.get(i)); } - Assert.assertTrue("Validation Failed, should pass", bResult); + assertTrue("Validation Failed, should pass", bResult); } /* * [XMLBEANS-34]: error compiling classes when using a schema with a redefined subelement - * */ + @Test public void test_jira_xmlbeans34() throws Exception { List errors = new ArrayList(); @@ -272,7 +270,7 @@ public class JiraRegression1_50Test exte SchemaCompiler.compile(params); if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans34() : Errors found when executing scomp"); + fail("test_jira_xmlbeans34() : Errors found when executing scomp"); } } @@ -363,13 +361,13 @@ public class JiraRegression1_50Test exte Class cls = Class.forName("xmlbeans45.PersonName"); //check for methods in class //getGeneration() - if (cls.getMethod("getGeneration", null) == null) + if (cls.getMethod("getGeneration") == null) throw new Exception("getGeneration() was not found in class"); //getTitle() - if (cls.getMethod("getTitle", null) == null) + if (cls.getMethod("getTitle") == null) throw new Exception("getTitle() was not found in class"); //getForenameArray() - if (cls.getMethod("getForenameArray", null) == null) + if (cls.getMethod("getForenameArray") == null) throw new Exception("getForenameArray() was not found in class"); } @@ -457,12 +455,12 @@ public class JiraRegression1_50Test exte } } - Assert.fail("test_jira_xmlbeans49() :Exception thrown with above errors!"); + fail("test_jira_xmlbeans49() :Exception thrown with above errors!"); } // view errors if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans49() : Errors found when executing scomp"); + fail("test_jira_xmlbeans49() : Errors found when executing scomp"); } } @@ -547,9 +545,4 @@ public class JiraRegression1_50Test exte return valid; } } - - - - - } Modified: xmlbeans/trunk/test/src/misc/detailed/JiraRegression201_250Test.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/JiraRegression201_250Test.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/JiraRegression201_250Test.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/JiraRegression201_250Test.java Fri Jan 18 23:08:44 2019 @@ -15,31 +15,23 @@ */ package misc.detailed; -import misc.common.JiraTestBase; -import misc.detailed.jira208.FrogBreathDocument; -import jira.xmlbeans228.substitution.PersonDocument; import jira.xmlbeans228.substitution.CommentType; import jira.xmlbeans228.substitution.FirstCommentType; +import jira.xmlbeans228.substitution.PersonDocument; +import misc.common.JiraTestBase; +import misc.detailed.jira208.FrogBreathDocument; +import org.apache.xmlbeans.XmlOptions; +import org.junit.Test; +import javax.xml.namespace.QName; import java.io.StringWriter; import java.util.ArrayList; -import java.util.List; import java.util.Iterator; +import java.util.List; -import javax.xml.namespace.QName; - -import org.apache.xmlbeans.XmlOptions; -import org.apache.xmlbeans.XmlError; +import static org.junit.Assert.*; -/** - * - */ -public class JiraRegression201_250Test extends JiraTestBase -{ - public JiraRegression201_250Test(String name) - { - super(name); - } +public class JiraRegression201_250Test extends JiraTestBase { /* * [XMLBEANS-206]: Wrong method finding in getMethod() of InterfaceExtensionImpl @@ -51,6 +43,7 @@ public class JiraRegression201_250Test e * [XMLBEANS-208]: validation of decimal with fractionDigits -- special case, additional zero digits * */ + @Test public void test_jira_xmlbeans208() throws Exception { XmlOptions options = new XmlOptions(); @@ -88,6 +81,7 @@ public class JiraRegression201_250Test e * [XMLBEANS-228]: * element order in sequence incorrect after calling substitute() */ + @Test public void test_jira_xmlbeans228() throws Exception { PersonDocument personDocument = PersonDocument.Factory.newInstance(); Modified: xmlbeans/trunk/test/src/misc/detailed/JiraRegression251_300Test.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/JiraRegression251_300Test.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/JiraRegression251_300Test.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/JiraRegression251_300Test.java Fri Jan 18 23:08:44 2019 @@ -15,20 +15,19 @@ */ package misc.detailed; +import com.easypo.XmlShipperBean; import misc.common.JiraTestBase; -import com.easypo.*; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; public class JiraRegression251_300Test extends JiraTestBase { - public JiraRegression251_300Test(String name) - { - super(name); - } - /* * [XMLBEANS-260]: SchemaType#isSkippedAnonymousType() throws an NPE * if _outerSchemaTypeRef is not set */ + @Test public void test_jira_xmlbeans260() { // construct an instance of a non-anonymous type Modified: xmlbeans/trunk/test/src/misc/detailed/JiraRegression50_100Test.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/JiraRegression50_100Test.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/JiraRegression50_100Test.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/JiraRegression50_100Test.java Fri Jan 18 23:08:44 2019 @@ -15,45 +15,43 @@ package misc.detailed; -import junit.framework.Assert; +import dufourrault.DummyDocument; +import dufourrault.Father; +import misc.common.JiraTestBase; +import net.orthogony.xml.sample.structure.ARootDocument; +import net.orthogony.xml.sample.structure.ChildType; +import org.apache.beehive.netui.tools.testrecorder.x2004.session.RecorderSessionDocument; import org.apache.xmlbeans.*; import org.apache.xmlbeans.impl.tool.SchemaCompiler; import org.apache.xmlbeans.impl.xb.xmlconfig.ConfigDocument; -import org.apache.beehive.netui.tools.testrecorder.x2004.session.RecorderSessionDocument; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Node; +import test.xbean.xmlcursor.purchaseOrder.PurchaseOrderDocument; +import testDateAttribute.TestDatewTZone; +import testDateAttribute.TestElementWithDateAttributeDocument; +import tools.util.JarUtil; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLInputFactory; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamReader; import java.io.File; import java.io.FileInputStream; -import java.util.*; import java.net.URL; +import java.util.*; -import tools.util.JarUtil; -import test.xbean.xmlcursor.purchaseOrder.PurchaseOrderDocument; -import testDateAttribute.TestElementWithDateAttributeDocument; -import testDateAttribute.TestDatewTZone; -import misc.common.JiraTestBase; -import dufourrault.DummyDocument; -import dufourrault.Father; -import net.orthogony.xml.sample.structure.ARootDocument; -import net.orthogony.xml.sample.structure.ChildType; +import static org.junit.Assert.*; public class JiraRegression50_100Test extends JiraTestBase { - public JiraRegression50_100Test(String name) - { - super(name); - } - ///** // * [XMLBEANS-##] <BUG TITLE> // */ @@ -68,6 +66,7 @@ public class JiraRegression50_100Test ex /** * [XMLBEANS-52] Validator loops when schema has certain conditions */ + @Test public void test_jira_XmlBeans52() throws Exception{ //reusing code from method test_jira_XmlBeans48() String correctXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" + @@ -86,8 +85,8 @@ public class JiraRegression50_100Test ex /* * [XMLBEANS-54]: problem with default value - * */ + @Test public void test_jira_xmlbeans54() throws Exception { List errors = new ArrayList(); @@ -111,15 +110,15 @@ public class JiraRegression50_100Test ex } if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans54() : Errors found when executing scomp"); + fail("test_jira_xmlbeans54() : Errors found when executing scomp"); } } /** * [XMLBEANS-56] samples issue with easypo schema and config file */ - public void test_jira_XmlBeans56() throws Exception - { + @Test + public void test_jira_XmlBeans56() throws Exception { String xsdConfig = "<xb:config " + " xmlns:xb=\"http://xml.apache.org/xmlbeans/2004/02/xbean/config\"\n"; + " xmlns:ep=\"http://openuri.org/easypo\";>\n" + @@ -156,8 +155,8 @@ public class JiraRegression50_100Test ex /** * [XMLBEANS-57] scomp failure for XSD namespace "DAV:" */ - public void test_jira_XmlBeans57() throws Exception - { + @Test + public void test_jira_XmlBeans57() throws Exception { String P = File.separator; String outputDir = OUTPUTROOT + P + "dav"; @@ -201,6 +200,8 @@ public class JiraRegression50_100Test ex * This is realted to xmlbeans36 - its the same case but the schemas seem to have been updated at the w3c site. * Hence adding a new testcase with the new schemas */ + @Test + @Ignore("the url doesn't exist anymore ...") public void test_jira_xmlbeans58() throws Exception { List errors = new ArrayList(); SchemaCompiler.Parameters params = new SchemaCompiler.Parameters(); @@ -216,7 +217,7 @@ public class JiraRegression50_100Test ex SchemaCompiler.compile(params); if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans55() : Errors found when executing scomp"); + fail("test_jira_xmlbeans55() : Errors found when executing scomp"); } } @@ -225,8 +226,8 @@ public class JiraRegression50_100Test ex /** * [XMLBEANS-62] Avoid class cast exception when compiling older schema namespace */ - public void test_jira_XmlBeans62() throws Exception - { + @Test + public void test_jira_XmlBeans62() throws Exception { String P = File.separator; String outputDir = System.getProperty("xbean.rootdir") + P + "build" + P + "test" + P + "output" + P + "x1999"; @@ -265,8 +266,8 @@ public class JiraRegression50_100Test ex /** * [XMLBEANS-64] ArrayIndexOutOfBoundsException during validation */ - public void test_jira_XmlBeans64() throws Exception - { + @Test + public void test_jira_XmlBeans64() throws Exception { // load the document File inst = new File(JIRA_CASES + "xmlbeans_64.xml"); XmlObject doc = RecorderSessionDocument.Factory.parse(inst); @@ -284,8 +285,8 @@ public class JiraRegression50_100Test ex /** * [XMLBEANS-66] NullPointerException when restricting a union with one of the union members */ - public void test_jira_XmlBeans66() throws Exception - { + @Test + public void test_jira_XmlBeans66() throws Exception { String reproXsd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" + "<xsd:schema targetNamespace=\"http://www.w3.org/2003/12/XQueryX\"; \n" + " xmlns=\"http://www.w3.org/2003/12/XQueryX\"; \n" + @@ -318,7 +319,7 @@ public class JiraRegression50_100Test ex SchemaTypeLoader stl = makeSchemaTypeLoader(new String[]{reproXsd}); QName reproQName = new QName("http://www.w3.org/2003/12/XQueryX";, "Kludge"); SchemaGlobalElement elVal = stl.findElement(reproQName); - Assert.assertTrue("Element is null or not found", (elVal != null)); + assertTrue("Element is null or not found", (elVal != null)); String reproInst = "<Kludge xmlns=\"http://www.w3.org/2003/12/XQueryX\";><value>12</value></Kludge>"; validateInstance(new String[]{reproXsd}, new String[]{reproInst}, null); @@ -327,8 +328,8 @@ public class JiraRegression50_100Test ex /** * [XMLBEANS-68] GDateBuilder outputs empty string when used without time or timezone */ - public void test_jira_XmlBeans68() throws Exception - { + @Test + public void test_jira_XmlBeans68() throws Exception { Calendar cal = Calendar.getInstance(); GDateBuilder gdateBuilder = new GDateBuilder(cal); gdateBuilder.clearTime(); @@ -356,8 +357,8 @@ public class JiraRegression50_100Test ex * This issue needed an elementFormDefault=qualified added to the schema * [XMLBEANS-71] when trying to retrieve data from a XMLBean with Input from a XML Document, we cannot get any data from the Bean. */ - public void test_jira_XmlBeans71() throws Exception - { + @Test + public void test_jira_XmlBeans71() throws Exception { //schema src lives in cases/xbean/xmlobject/xmlbeans_71.xsd abc.BazResponseDocument doc = abc.BazResponseDocument.Factory.parse(JarUtil.getResourceFromJarasFile("xbean/misc/jira/xmlbeans_71.xml"), xmOpts); xmOpts.setErrorListener(errorList); @@ -387,8 +388,9 @@ public class JiraRegression50_100Test ex /** * [XMLBEANS-72] Document properties are lost */ - public void test_jira_XmlBeans72() throws Exception - { + @Test + @Ignore + public void test_jira_XmlBeans72() throws Exception { String docTypeName = "struts-config"; String docTypePublicID = "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"; String docTypeSystemID = "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";; @@ -461,11 +463,9 @@ public class JiraRegression50_100Test ex /** * BUGBUG: XMLBEANS-78 - NPE when processing XMLStreamReader Midstream * XMLBEANS-78 - NPE when processing XMLStreamReader Midstream - * - * @throws Exception */ - public void test_jira_xmlbeans78() throws Exception - { + @Test + public void test_jira_xmlbeans78() throws Exception { XMLInputFactory factory = XMLInputFactory.newInstance(); FileInputStream fis = new FileInputStream(new File(JIRA_CASES+ "xmlbeans_78.xml")); XMLStreamReader reader = factory.createXMLStreamReader(fis); @@ -480,8 +480,7 @@ public class JiraRegression50_100Test ex * @throws javax.xml.stream.XMLStreamException * */ - private void skipToBody(XMLStreamReader reader) throws javax.xml.stream.XMLStreamException - { + private void skipToBody(XMLStreamReader reader) throws javax.xml.stream.XMLStreamException { while (true) { int event = reader.next(); switch (event) { @@ -502,8 +501,8 @@ public class JiraRegression50_100Test ex * Repro case for jira issue * XMLBEANS-80 problems in XPath selecting with namespaces and Predicates. */ - public void test_jira_xmlbeans80() throws Exception - { + @Test + public void test_jira_xmlbeans80() throws Exception { String xpathDoc = "<?xml version=\"1.0\"?> \n" + "<doc xmlns:ext=\"http://somebody.elses.extension\";> \n" + " <ext:a test=\"test\" /> \n" + @@ -522,7 +521,7 @@ public class JiraRegression50_100Test ex "ext='http://somebody.elses.extension'; .//ext:a[@test='test']"); - Assert.assertTrue(resSet.length == 1); + assertEquals(1, resSet.length); System.out.println("Result was: " + resSet[0].xmlText()); } @@ -530,8 +529,8 @@ public class JiraRegression50_100Test ex * Repro case for jira issue * XMLBEANS-81 Cursor selectPath() method not working with predicates */ - public void test_jira_xmlbeans81() throws Exception - { + @Test + public void test_jira_xmlbeans81() throws Exception { String xpathDoc = "<MatchedRecords>" + " <MatchedRecord>" + " <TableName>" + @@ -557,8 +556,8 @@ public class JiraRegression50_100Test ex /** * XMLBeans-84 Cannot run XmlObject.selectPath using Jaxen in multi threaded environment */ - public void test_jira_XmlBeans84() throws Exception - { + @Test + public void test_jira_XmlBeans84() throws Exception { XPathThread[] threads = new XPathThread[15]; for (int i = 0; i < threads.length; i++) { @@ -578,9 +577,9 @@ public class JiraRegression50_100Test ex /* * [XMLBEANS-88]:Cannot compile eBay schema - * */ - /* + @Ignore + @Test public void test_jira_xmlbeans88() throws Exception { List errors = new ArrayList(); SchemaCompiler.Parameters params = new SchemaCompiler.Parameters(); @@ -603,22 +602,22 @@ public class JiraRegression50_100Test ex System.out.println(ome.getCause()); System.out.println(ome.getMessage()); System.out.println(ome.getStackTrace()); - Assert.fail("test_jira_xmlbeans88(): Out Of Memory Error"); + fail("test_jira_xmlbeans88(): Out Of Memory Error"); } catch (Throwable t) { t.getMessage(); System.out.println("Ok Some Exception is caught here"); } if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans88() : Errors found when executing scomp"); + fail("test_jira_xmlbeans88() : Errors found when executing scomp"); } - } - */ /** * [XMLBEANS-96]:XmlDocumentProperties missing version and encoding */ + @Test + @Ignore public void test_jira_xmlbeans96() throws Exception { StringBuffer xmlstringbuf = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"); xmlstringbuf.append("<test>"); @@ -627,17 +626,17 @@ public class JiraRegression50_100Test ex XmlObject doc = XmlObject.Factory.parse(xmlstringbuf.toString()); XmlDocumentProperties props = doc.documentProperties(); - Assert.assertEquals("test_jira_xmlbeans96() : Xml Version is not picked up", props.getVersion(), "1.0"); - Assert.assertEquals("test_jira_xmlbeans96() : Xml Encoding is not picked up", props.getEncoding(), "UTF-8"); + assertEquals("test_jira_xmlbeans96() : Xml Version is not picked up", "1.0", props.getVersion()); + assertEquals("test_jira_xmlbeans96() : Xml Encoding is not picked up", "UTF-8", props.getEncoding()); } /** * [XMLBEANS-98] setSaveSuggestedPrefixes doesn't * work for QName attribute values - * - * @throws Exception */ + @Test + @Ignore public void test_jira_xmlbeans98() throws Exception { String outfn = outputroot + "xmlbeans_98.xml"; String structnamespace = "http://www.orthogony.net/xml/sample/structure";; @@ -696,9 +695,8 @@ public class JiraRegression50_100Test ex /** * [XMLBEANS-99] NPE/AssertionFailure in newDomNode() - * - * @throws Exception */ + @Test public void test_jira_xmlbeans99_a() throws Exception { //typed verification DummyDocument doc = DummyDocument.Factory.parse(new File(JIRA_CASES + "xmlbeans_99.xml")); @@ -715,6 +713,7 @@ public class JiraRegression50_100Test ex * [XMLBEANS-99]: NPE/AssertionFailure in newDomNode() * refer to [XMLBEANS-14] */ + @Test public void test_jira_xmlbeans99_b() throws Exception { StringBuffer xmlstringbuf = new StringBuffer("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?> \n"); xmlstringbuf.append(" <x:dummy xmlns:x=\"http://dufourrault\"; xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\"; xsi:SchemaLocation=\"dummy.xsd\">\n"); @@ -754,9 +753,9 @@ public class JiraRegression50_100Test ex System.out.println("New Father Type Node: "+ fatherTypeNode); } catch (NullPointerException npe) { - Assert.fail("test_jira_xmlbeans99() : Null Pointer Exception when create Dom Node"); + fail("test_jira_xmlbeans99() : Null Pointer Exception when create Dom Node"); } catch (Exception e) { - Assert.fail("test_jira_xmlbeans99() : Exception when create Dom Node"); + fail("test_jira_xmlbeans99() : Exception when create Dom Node"); } } @@ -845,10 +844,5 @@ public class JiraRegression50_100Test ex } } } - - - - - } Modified: xmlbeans/trunk/test/src/misc/detailed/JiraRegressionSchemaCompilerTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/JiraRegressionSchemaCompilerTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/JiraRegressionSchemaCompilerTest.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/JiraRegressionSchemaCompilerTest.java Fri Jan 18 23:08:44 2019 @@ -14,24 +14,21 @@ */ package misc.detailed; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.ArrayList; -import java.io.File; - +import misc.common.JiraTestBase; import org.apache.xmlbeans.XmlError; import org.apache.xmlbeans.impl.tool.SchemaCompiler; +import org.junit.Test; -import misc.common.JiraTestBase; +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; -public class JiraRegressionSchemaCompilerTest extends JiraTestBase -{ - public JiraRegressionSchemaCompilerTest(String name) - { - super(name); - } +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +public class JiraRegressionSchemaCompilerTest extends JiraTestBase { private List _testCompile(File[] xsdFiles, String outputDirName) { @@ -66,6 +63,7 @@ public class JiraRegressionSchemaCompile return errFound; } + @Test public void test_jira_xmlbeans236() { File[] xsdFiles = @@ -78,6 +76,7 @@ public class JiraRegressionSchemaCompile } } + @Test public void test_jira_xmlbeans239() { /* complexType with complexContent extending base type with @@ -107,6 +106,7 @@ public class JiraRegressionSchemaCompile assertTrue(findErrMsg(errors, msg)); } + @Test public void test_jira_xmlbeans251() { File[] xsdFiles = Modified: xmlbeans/trunk/test/src/misc/detailed/JiraRegressionTest101_150.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/JiraRegressionTest101_150.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/misc/detailed/JiraRegressionTest101_150.java (original) +++ xmlbeans/trunk/test/src/misc/detailed/JiraRegressionTest101_150.java Fri Jan 18 23:08:44 2019 @@ -1,30 +1,27 @@ package misc.detailed; -import junit.framework.Assert; +import misc.common.JiraTestBase; +import org.apache.xmlbeans.XmlError; +import org.apache.xmlbeans.XmlObject; +import org.apache.xmlbeans.impl.tool.SchemaCompiler; +import org.junit.Test; +import java.io.File; import java.util.ArrayList; import java.util.List; -import java.io.File; -import org.apache.xmlbeans.XmlObject; -import org.apache.xmlbeans.XmlError; -import org.apache.xmlbeans.impl.tool.SchemaCompiler; -import misc.common.JiraTestBase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; /** * */ public class JiraRegressionTest101_150 extends JiraTestBase { - public JiraRegressionTest101_150(String name) - { - super(name); - } - /** * [XMLBEANS-103] XMLBeans - QName thread cache, cause memory leaks - * @throws Exception */ + @Test public void test_jira_xmlbeans102a() throws Exception{ // set the parameters similar to those in the bug SchemaCompiler.Parameters params = new SchemaCompiler.Parameters(); @@ -45,8 +42,8 @@ public class JiraRegressionTest101_150 e /* * [XMLBEANS-102]: scomp - infinite loop during jar for specific xsd and params for netui_config.xsd - * */ + @Test public void test_jira_xmlbeans102b() { //Assert.fail("test_jira_xmlbeans102: Infinite loop after completion of parsing" ); @@ -62,7 +59,7 @@ public class JiraRegressionTest101_150 e SchemaCompiler.compile(params); if (printOptionErrMsgs(errors)) { - Assert.fail("test_jira_xmlbeans102() : Errors found when executing scomp"); + fail("test_jira_xmlbeans102() : Errors found when executing scomp"); } } @@ -70,9 +67,8 @@ public class JiraRegressionTest101_150 e /** * NPE while initializing a type system w/ a type that extends * an a complex type from a different type system - * - * @throws Exception */ + @Test public void test_jira_xmlbeans105() throws Exception { //run untyped parse XmlObject obj = XmlObject.Factory.parse(new File(JIRA_CASES + "xmlbeans_105.xml")); @@ -84,16 +80,8 @@ public class JiraRegressionTest101_150 e // / we know the instance is invalid // make sure the error message is what is expected rud.validate(xmOpts); - Assert.assertTrue("More Errors than expected", errorList.size() == 1); - Assert.assertTrue("Did not recieve the expected error code: " + ((XmlError) errorList.get(0)).getErrorCode(), - ((XmlError) errorList.get(0)).getErrorCode().compareToIgnoreCase("cvc-complex-type.2.4a") == 0); + assertEquals("More Errors than expected", 1, errorList.size()); + assertEquals("Did not recieve the expected error code: " + ((XmlError) errorList.get(0)).getErrorCode(), 0, ((XmlError) errorList.get(0)).getErrorCode().compareToIgnoreCase("cvc-complex-type.2.4a")); } - - - - - - - } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
