Author: dkulp Date: Thu Aug 27 19:37:13 2009 New Revision: 808576 URL: http://svn.apache.org/viewvc?rev=808576&view=rev Log: Merged revisions 806612 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r806612 | dkulp | 2009-08-21 11:51:51 -0400 (Fri, 21 Aug 2009) | 11 lines Merged revisions 806021 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r806021 | dkulp | 2009-08-19 22:08:28 -0400 (Wed, 19 Aug 2009) | 3 lines Call setEventHandler(null); on the jaxb unmarshaller which actually results in a decent EventHandler being setup. This exposed some bugs in some of the test cases and in the CORBA binding. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java cxf/branches/2.1.x-fixes/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/PeopleService.java cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHiResponse.xml cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 27 19:37:13 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020-806021 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java Thu Aug 27 19:37:13 2009 @@ -32,6 +32,11 @@ iterator = handler.members.iterator(); serviceInfo = service; orb = orbRef; + if (handler.members.isEmpty() + && handler.getSimpleName().equals(handler.getIdlType().getLocalPart() + "_f")) { + state = states.length; + } + } public int next() { @@ -49,11 +54,22 @@ && (!CorbaHandlerUtils.isOctets(obj.getType()))) { currentEventProducer = new CorbaPrimitiveSequenceEventProducer(obj, serviceInfo, orb); + } else if (obj.getSimpleName().equals(obj.getIdlType().getLocalPart() + "_f")) { + //some "special cases" we need to make sure are mapped correctly + + currentEventProducer = + CorbaHandlerUtils.getTypeEventProducer(obj, serviceInfo, orb); + } else { currentEventProducer = CorbaHandlerUtils.getTypeEventProducer(obj, serviceInfo, orb); } - event = currentEventProducer.next(); + if (currentEventProducer.hasNext()) { + event = currentEventProducer.next(); + } else { + currentEventProducer = null; + return next(); + } } else { // all done with content, move past state 0 event = states[++state]; Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java Thu Aug 27 19:37:13 2009 @@ -58,6 +58,8 @@ list.add(contents); iterator = list.iterator(); } + } else if (handler.getSimpleName().equals(handler.getIdlType().getLocalPart() + "_f")) { + state = states.length; } } } Modified: cxf/branches/2.1.x-fixes/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/PeopleService.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/PeopleService.java?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/PeopleService.java (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/PeopleService.java Thu Aug 27 19:37:13 2009 @@ -18,16 +18,24 @@ */ package org.apache.cxf.binding.http.mtom; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import org.apache.cxf.person.People; import org.apache.cxf.person.Person; -...@webservice +...@webservice(targetNamespace = "http://cxf.apache.org/person/";) public interface PeopleService { + @WebResult(name = "Person", + targetNamespace = "http://cxf.apache.org/person/";) People getPeople(); - void addPerson(Person p); - - Person getPerson(String name); + void addPerson(@WebParam(name = "Person", + targetNamespace = "http://cxf.apache.org/person/";) + Person p); + + @WebResult(name = "Person", + targetNamespace = "http://cxf.apache.org/person/";) + Person getPerson(@WebParam(name = "name") String name); } Modified: cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java (original) +++ cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java Thu Aug 27 19:37:13 2009 @@ -60,6 +60,8 @@ } if (databinding.getValidationEventHandler() != null) { um.setEventHandler(databinding.getValidationEventHandler()); + } else { + um.setEventHandler(null); } if (databinding.getUnmarshallerProperties() != null) { for (Map.Entry<String, Object> propEntry Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHiResponse.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHiResponse.xml?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHiResponse.xml (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHiResponse.xml Thu Aug 27 19:37:13 2009 @@ -19,7 +19,7 @@ <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";> <soap:Body> <sayHiResponse xmlns="http://apache.org/hello_world_soap_http/types";> - <text>hi</text> + <responseType>hi</responseType> </sayHiResponse> </soap:Body> Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java Thu Aug 27 19:37:13 2009 @@ -323,7 +323,11 @@ assertEquals("Hello", echoMsg); } private void runDocLitTest(DocLitWrappedCodeFirstService port) throws Exception { + Foo foo = new Foo(); + foo.setName("blah"); + assertEquals("blah", port.modifyFoo(foo).getName()); + assertEquals("hello", port.outOnly(new Holder<String>(), new Holder<String>())); long start = System.currentTimeMillis(); @@ -459,7 +463,26 @@ fail("Expected exception not found"); } catch (ComplexException ex) { assertEquals("Throw user fault -3", ex.getMessage()); - } + } + + try { + Foo foo = new Foo(); + foo.setNameIgnore("DoNoName"); + port.modifyFoo(foo); + fail("Expected exception not found"); + } catch (SOAPFaultException ex) { + assertTrue(ex.getMessage().contains("NoName is not a valid name")); + } + try { + Foo foo = new Foo(); + foo.setNameIgnore("NoName"); + port.modifyFoo(foo); + fail("Expected exception not found"); + } catch (SOAPFaultException ex) { + assertTrue(ex.getMessage().contains("NoName is not a valid name")); + } + + } Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java Thu Aug 27 19:37:13 2009 @@ -136,6 +136,12 @@ } public void setName(String n) { + if ("NoName".equals(n)) { + throw new IllegalArgumentException(n + " is not a valid name"); + } + name = n; + } + public void setNameIgnore(String n) { name = n; } public String getName() { @@ -145,6 +151,8 @@ Set<Foo> getFooSet(); + Foo modifyFoo(Foo foo); + @RequestWrapper(className = "org.apache.cxf.systest.jaxws.DocLitWrappedCodeFirstService$DoFooListRequest") @WebMethod(operationName = "doFooList") String doFooList(@WebParam(name = "dbRef") List<Foo> fooList); Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java Thu Aug 27 19:37:13 2009 @@ -219,5 +219,12 @@ out2.value = "out2"; return "hello"; } + + public Foo modifyFoo(Foo f) { + if ("DoNoName".equals(f.getName())) { + f.setNameIgnore("NoName"); + } + return f; + } } Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java?rev=808576&r1=808575&r2=808576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java Thu Aug 27 19:37:13 2009 @@ -46,119 +46,119 @@ static { String notWorking[] = new String[] { - "DerivedChoiceBaseChoice", - "UnionWithAnonEnum", - "SimpleAll", - "OccuringChoiceWithAnyAttribute", + "AnonEnumList", + "AnonymousType", + "AnyURIRestriction", + "Base64BinaryRestriction", "ChoiceArray", + "ChoiceOfChoice", "ChoiceOfSeq", - "DerivedStructBaseStruct", - "OccuringChoice2", - "OccuringStructWithAnyAttribute", - "OccuringStruct", - "OccuringStruct2", - "InheritanceUnboundedArrayDerivedChoice", - "ComplexTypeWithAttributes", - "OccuringChoice1", - "StructWithSubstitutionGroup", - "StructWithNillableStruct", - "SimpleContent2", - "OccuringAll", - "Document", "ChoiceWithAnyAttribute", - "RecursiveUnionData", - "ExtBase64Binary", - "RecursiveStructArray", - "StructWithAnyArray", - "UnsignedByte", - "SimpleStruct", - "RecOuterType", - "UnionWithStringListRestriction", - "RecElType", - "AnonEnumList", - "DerivedNoContent", - "StructWithMultipleSubstitutionGroups", - "StructWithNillableChoice", - "RestrictedAllBaseAll", - "NestedStruct", - "StructWithOccuringStruct", - "SequenceWithGroups", - "RecursiveUnion", - "ExtendsSimpleType", - "InheritanceEmptyAllDerivedEmpty", - "HexBinaryRestriction", - "DerivedStructBaseChoice", - "UnionSimpleContent", + "ChoiceWithGroupChoice", + "ChoiceWithGroups", + "ChoiceWithGroupSeq", "ChoiceWithSubstitutionGroup", - "UnionWithAnonList", + "ChoiceWithSubstitutionGroupAbstract", + "ChoiceWithSubstitutionGroupNil", "ComplexRestriction", - "NMTOKENS", - "SequenceWithGroupSeq", - "IDTypeAttribute", - "SimpleContent3", - "SimpleUnionList", - "OccuringChoice", - "SimpleRestriction2", - "SimpleContent1", - "StructWithAnyXsi", - "InheritanceNestedStruct", - "StructWithInvalidAny", - "SimpleRestriction6", + "ComplexRestriction2", + "ComplexRestriction3", + "ComplexRestriction4", "ComplexRestriction5", - "ExtendsSimpleContent", + "ComplexTypeWithAttributeGroup", + "ComplexTypeWithAttributeGroup1", + "ComplexTypeWithAttributes", "DateTime", - "DerivedChoiceBaseStruct", - "StringI18N", - "ChoiceOfChoice", - "ComplexRestriction3", - "Base64BinaryRestriction", - "StructWithList", - "QNameList", - "InheritanceSimpleStructDerivedStruct", - "SimpleRestriction5", - "ChoiceWithSubstitutionGroupAbstract", - "ChoiceWithSubstitutionGroupNil", - "ChoiceWithGroups", - "SequenceWithGroupChoice", "DerivedChoiceBaseArray", - "UnionWithStringList", - "SimpleRestriction3", - "ComplexRestriction2", - "SimpleListRestriction2", + "DerivedChoiceBaseChoice", + "DerivedChoiceBaseStruct", + "DerivedNoContent", + "DerivedStructBaseChoice", "DerivedStructBaseEmpty", - "RestrictedChoiceBaseChoice", - "ChoiceWithGroupSeq", + "DerivedStructBaseStruct", + "Document", "EmptyStruct", - "RestrictedStructBaseStruct", + "ExtBase64Binary", + "ExtColourEnum", + "ExtendsSimpleContent", + "ExtendsSimpleType", + "GroupDirectlyInComplexType", + "HexBinaryRestriction", + "IDTypeAttribute", + "InheritanceEmptyAllDerivedEmpty", + "InheritanceNestedStruct", "InheritanceSimpleChoiceDerivedStruct", - "RecursiveStruct", + "InheritanceSimpleStructDerivedStruct", + "InheritanceUnboundedArrayDerivedChoice", "MRecSeqA", - "StructWithUnion", - "StructWithOptionals", + "MRecSeqC", + "NestedStruct", + "NMTOKENS", + "NumberList", + "Occuri ngStruct2", + "OccuringAll", + "OccuringChoice", + "OccuringChoice1", + "OccuringChoice2", + "OccuringChoiceWithAnyAttribute", + "OccuringStruct", "OccuringStruct1", - "ExtColourEnum", + "OccuringStruct2", + "OccuringStructWithAnyAttribute", + "QName", + "QNameList", + "RecElType", + "RecOuterType", "RecSeqB6918", - "StructWithSubstitutionGroupNil", + "RecursiveStruct", + "RecursiveStructArray", + "RecursiveUnion", + "RecursiveUnionData", + "RestrictedAllBaseAll", + "RestrictedChoiceBaseChoice", + "RestrictedStructBaseStruct", + "SequenceWithGroupChoice", + "SequenceWithGroups", + "SequenceWithGroupSeq", + "SequenceWithOccuringGroup", + "SimpleAll", + "SimpleContent1", + "SimpleContent2", + "SimpleContent3", "SimpleContentExtWithAnyAttribute", - "StructWithAnyAttribute", + "SimpleListRestriction2", + "SimpleRestriction2", + "SimpleRestriction3", + "SimpleRestriction5", + "SimpleRestriction6", + "SimpleStruct", + "SimpleUnionList", + "StringI18N", "StringList", - "StructWithOccuringChoice", "StructWithAny", - "SequenceWithOccuringGroup", - "ComplexTypeWithAttributeGroup1", - "QName", - "StructWithOccuringStruct2", - "Occuri ngStruct2", - "ChoiceWithGroupChoice", + "StructWithAnyArray", + "StructWithAnyAttribute", + "StructWithAnyXsi", + "StructWithInvalidAny", "StructWithInvalidAnyArray", - "MRecSeqC", - "AnonymousType", - "AnyURIRestriction", - "NumberList", + "StructWithList", + "StructWithMultipleSubstitutionGroups", + "StructWithNillableChoice", + "StructWithNillableStruct", + "StructWithOccuringChoice", + "StructWithOccuringStruct", + "StructWithOccuringStruct2", + "StructWithOptionals", + "StructWithSubstitutionGroup", "StructWithSubstitutionGroupAbstract", - "GroupDirectlyInComplexType", - "ComplexTypeWithAttributeGroup", - "ComplexRestriction4", + "StructWithSubstitutionGroupNil", + "StructWithUnion", + "UnionSimpleContent", + "UnionWithAnonEnum", + "UnionWithAnonList", + "UnionWithStringList", + "UnionWithStringListRestriction", + "UnsignedByte", }; NOT_WORKING_TESTS.addAll(Arrays.asList(notWorking)); @@ -201,6 +201,7 @@ } @AfterClass public static void deleteRefFile() throws Exception { + //System.out.println(NOT_WORKING_TESTS.size()); File file = new File("./TypeTest.ref"); file.delete(); //for (String s : RUN_TESTS) { @@ -209,7 +210,7 @@ //System.out.println(RUN_TESTS.size()); } - public boolean shouldRunTest(String name) { + public boolean shouldRunTest(String name) { if (!NOT_WORKING_TESTS.contains(name)) { boolean b = super.shouldRunTest(name); if (b) { @@ -217,6 +218,7 @@ } return b; } + //return true; return false; }
