Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 83469 invoked from network); 15 Jun 2007 05:32:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Jun 2007 05:32:17 -0000 Received: (qmail 72598 invoked by uid 500); 15 Jun 2007 05:32:20 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 72537 invoked by uid 500); 15 Jun 2007 05:32:20 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 72528 invoked by uid 99); 15 Jun 2007 05:32:20 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jun 2007 22:32:20 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jun 2007 22:32:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BEB151A981D; Thu, 14 Jun 2007 22:31:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r547535 - in /incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws: ./ expected/ Date: Fri, 15 Jun 2007 05:31:54 -0000 To: cxf-commits@incubator.apache.org From: mmao@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070615053155.BEB151A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmao Date: Thu Jun 14 22:31:53 2007 New Revision: 547535 URL: http://svn.apache.org/viewvc?view=rev&rev=547535 Log: * Enable some ignored tests * Add @Ignore("Ignore reason") for some ignored tests Added: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java Thu Jun 14 22:31:53 2007 @@ -27,10 +27,8 @@ import org.apache.cxf.tools.common.ProcessorTestBase; import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class JaxwsServiceBuilderRPCTest extends ProcessorTestBase { JaxwsServiceBuilder builder = new JaxwsServiceBuilder(); WSDL11Generator generator = new WSDL11Generator(); Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java Thu Jun 14 22:31:53 2007 @@ -40,7 +40,6 @@ import org.junit.Ignore; import org.junit.Test; -@Ignore public class JaxwsServiceBuilderTest extends ProcessorTestBase { JaxwsServiceBuilder builder = new JaxwsServiceBuilder(); WSDL11Generator generator = new WSDL11Generator(); @@ -100,6 +99,7 @@ } + // REVISIT two fault elements in schema @Test public void testDocLitWrapped() throws Exception { builder.setServiceClass(org.apache.hello_world_doc_lit.Greeter.class); @@ -116,8 +116,6 @@ } @Test - //FIXME CXF-561: generated duplicate scheams because @RequestWrapper does not - //contain namespace public void testDocWrappedWithLocalName() throws Exception { builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.doc.Stock.class); ServiceInfo service = builder.createService(); @@ -134,8 +132,6 @@ } @Test - //FIXME CXF-561: generated duplicate scheams because @RequestWrapper does not - //contain namespace public void testDocWrappedNoWebParam() throws Exception { builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.doc.HelloWithNoWebParam.class); ServiceInfo service = builder.createService(); @@ -146,12 +142,13 @@ generator.generate(output); assertTrue(output.exists()); - //String expectedFile = this.getClass() - // .getResource("expected/expected_doc_lit_wrapped_no_webparam.wsdl").getFile(); - //assertFileEquals(expectedFile, output.getAbsolutePath()); + String expectedFile = this.getClass() + .getResource("expected/expected_doc_lit_wrapped_no_webparam.wsdl").getFile(); + assertFileEquals(expectedFile, output.getAbsolutePath()); } @Test + @Ignore("Duplicate header elements") //FIXME: CXF-564, generated wsdl is invalid - //"invalid XML schema: "header" must refer to an existing element" public void testHolder() throws Exception { @@ -196,12 +193,12 @@ generator.generate(file); assertTrue(output.exists()); - //String expectedFile = this.getClass().getResource("resources/expected_rpc_lit.wsdl").getFile(); - //compareTextFile(expectedFile, output.getAbsolutePath()); - + String expectedFile = this.getClass().getResource("expected/expected_rpc_lit.wsdl").getFile(); + assertFileEquals(expectedFile, file.getAbsolutePath()); } - // TODO: + + // TODO assertFileEquals @Test public void testDocWrapparBare() throws Exception { builder.setServiceClass(org.apache.hello_world_doc_wrapped_bare.Greeter.class); @@ -215,9 +212,8 @@ assertTrue(output.exists()); } - // TODO: + // TODO assertFileEquals @Test - @Ignore public void testRPCWithoutParentBindingAnnotation() throws Exception { builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.rpc.Hello.class); ServiceInfo service = builder.createService(); @@ -227,12 +223,11 @@ assertNotNull(output); generator.generate(file); assertTrue(output.exists()); - } - // TODO: + // TODO: SOAPBinding can not on method with RPC style @Test - @Ignore + @Ignore("RuntimeException: org.apache.cxf.interceptor.Fault: Method [sayHi] pro") public void testSOAPBindingRPCOnMethod() throws Exception { builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.rpc.HelloWrongAnnotation.class); ServiceInfo service = builder.createService(); @@ -242,7 +237,6 @@ assertNotNull(output); generator.generate(file); assertTrue(output.exists()); - } @Test @@ -261,9 +255,8 @@ assertFileEquals(new File(expectedFile), file); } - // TODO: + // TODO: assertFileEquals @Test - @Ignore public void testCXF188() throws Exception { Class clz = AnnotationUtil.loadClass("org.apache.cxf.tools.fortest.cxf188.Demo", getClass() .getClassLoader()); @@ -297,11 +290,9 @@ String s = IOUtils.toString(new FileInputStream(output)); assertTrue(s.indexOf("EchoPort") != -1); - /* String expectedFile = this.getClass() - .getResource("expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl").getFile(); + .getResource("expected/expected_rpclist_no_sei.wsdl").getFile(); assertFileEquals(expectedFile, output.getAbsolutePath()); - */ } @Test Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl Thu Jun 14 22:31:53 2007 @@ -19,7 +19,7 @@ - + Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl Thu Jun 14 22:31:53 2007 @@ -1,3 +1,4 @@ + - - + @@ -29,27 +29,27 @@ - - - + + + + + - + - - - + + - - + - + @@ -73,8 +73,8 @@ - + - + \ No newline at end of file Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl Thu Jun 14 22:31:53 2007 @@ -1,3 +1,4 @@ + - - + @@ -69,4 +69,4 @@ - + \ No newline at end of file Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl Thu Jun 14 22:31:53 2007 @@ -1,3 +1,4 @@ + - - + Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl Thu Jun 14 22:31:53 2007 @@ -19,7 +19,7 @@ --> - + @@ -65,6 +65,8 @@ + + Added: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl?view=auto&rev=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl (added) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl Thu Jun 14 22:31:53 2007 @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl?view=auto&rev=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl (added) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl Thu Jun 14 22:31:53 2007 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl Thu Jun 14 22:31:53 2007 @@ -19,7 +19,7 @@ --> - + Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl?view=diff&rev=547535&r1=547534&r2=547535 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl Thu Jun 14 22:31:53 2007 @@ -1,3 +1,4 @@ + - - +