Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 82167 invoked from network); 22 Mar 2007 03:16:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Mar 2007 03:16:19 -0000 Received: (qmail 71340 invoked by uid 500); 22 Mar 2007 03:16:27 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 71226 invoked by uid 500); 22 Mar 2007 03:16:26 -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 71217 invoked by uid 99); 22 Mar 2007 03:16:26 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 20:16:26 -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; Wed, 21 Mar 2007 20:16:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 142511A983A; Wed, 21 Mar 2007 20:15:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r521105 - in /incubator/cxf/trunk/tools/javato: Hello.wsdl src/test/java/org/apache/cxf/tools/common/ToolTestBase.java src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java Date: Thu, 22 Mar 2007 03:15:57 -0000 To: cxf-commits@incubator.apache.org From: mmao@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070322031558.142511A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmao Date: Wed Mar 21 20:15:57 2007 New Revision: 521105 URL: http://svn.apache.org/viewvc?view=rev&rev=521105 Log: * Remove the wsdl checked in by accident * Move the generated wsdl/schemas into target dir Removed: incubator/cxf/trunk/tools/javato/Hello.wsdl Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java?view=diff&rev=521105&r1=521104&r2=521105 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java Wed Mar 21 20:15:57 2007 @@ -20,11 +20,16 @@ package org.apache.cxf.tools.common; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.PrintStream; +import java.net.URISyntaxException; +import java.net.URISyntaxException; import java.net.URL; import junit.framework.TestCase; +import org.apache.cxf.helpers.FileUtils; + public abstract class ToolTestBase extends TestCase { protected PrintStream oldStdErr; @@ -58,5 +63,15 @@ return new String(errOut.toByteArray()); } + protected String getLocation(String wsdlFile) throws URISyntaxException { + File output = new File(getClass().getResource(".").toURI()); + output = new File(output, "resources"); + + if (!output.exists()) { + FileUtils.mkDir(output); + } + + return new File(output, wsdlFile).toString(); + } } Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java?view=diff&rev=521105&r1=521104&r2=521105 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java Wed Mar 21 20:15:57 2007 @@ -23,6 +23,10 @@ public class JavaToWSDLTest extends ToolTestBase { + public void tearDown() { + super.tearDown(); + } + public void testVersionOutput() throws Exception { String[] args = new String[] {"-v"}; JavaToWSDL.main(args); @@ -35,8 +39,9 @@ assertNotNull(getStdOut()); } - public void testNormalArgs() { - String[] args = new String[] {"-o", "./test.wsdl", "org.apache.hello_world_soap_http.Greeter"}; + public void testNormalArgs() throws Exception { + System.err.println(getLocation("test.wsdl")); + String[] args = new String[] {"-o", getLocation("normal.wsdl"), "org.apache.hello_world_soap_http.Greeter"}; JavaToWSDL.main(args); assertNotNull(getStdOut()); } @@ -55,8 +60,8 @@ } - public void testNoOutPutFile() { - String[] args = new String[] {"org.apache.hello_world_soap_http.Greeter"}; + public void testNoOutPutFile() throws Exception { + String[] args = new String[] {"-o", getLocation("nooutput.wsdl"), "org.apache.hello_world_soap_http.Greeter"}; JavaToWSDL.main(args); assertNotNull(getStdOut()); }