[jbossws-commits] JBossWS SVN: r9702 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws2591 and 3 other directories.

Wed Apr 1 13:02:07 EDT 2009

Author: alessio.soldano at jboss.com
Date: 2009-04-01 13:02:07 -0400 (Wed, 01 Apr 2009)
New Revision: 9702

Added:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2591/
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java
   framework/trunk/testsuite/test/resources/jaxws/jbws2591/
   framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/
   framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591Schema.xsd
   framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl
Log:
[JBWS-2591] Adding testcase


Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java
===================================================================

--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java	                        (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java	2009-04-01 17:02:07 UTC (rev 9702)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2591;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
+ * 
+ * http://jira.jboss.org/jira/browse/JBWS-2591
+ * 
+ * @author alessio.soldano at jboss.com
+ * @since 01-Apr-2009
+ */
+public class JBWS2591TestCase extends JBossWSTest
+{
+   private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+   private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
+   private static final String EXT = ":".equals(PS) ? ".sh" : ".bat";
+
+   private String WSDL_LOCATION = "jaxws" + FS + "jbws2591" + FS + "wsdl" + FS + "JBWS2591TestService.wsdl";
+
+   private String JBOSS_HOME;
+   private String TEST_DIR;
+
+   private String origJavaHome;
+
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+
+      JBOSS_HOME = System.getProperty("jboss.home");
+      TEST_DIR = createResourceFile("..").getAbsolutePath();
+      origJavaHome = System.getProperty("java.home");
+
+      // the script requires the system JAVA_HOME, which points to the JDK not the JRE            
+      if (origJavaHome.indexOf(FS + "jre") != -1)
+      {
+         String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre"));
+         System.setProperty("java.home", JDK_HOME);
+      }
+   }
+
+   protected void tearDown() throws Exception
+   {
+      // reset surefire's JAVA_HOME
+      System.setProperty("java.home", origJavaHome);
+   }
+
+   public void testWSConsumeFromCommandLine() throws Exception
+   {
+      // use absolute path for the output to be re-usable
+      String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath();
+      String absOutput = new File(TEST_DIR, "wsconsume" + FS + "java").getAbsolutePath();
+      String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -v -k -o " + absOutput + " " + absWsdlLoc;
+      executeCommand(command, "wsconsume");
+      File javaSource = new File(TEST_DIR, "wsconsume" + FS + "java" + FS + "org" + FS + "marshalltestservice" + FS + "newschemadefs" + FS + "NewSchemaTest.java");
+      assertTrue("Service endpoint interface not generated", javaSource.exists());
+      String contents = readFile(javaSource);
+      assertTrue("@XmlList not found", contents.contains("@XmlList"));
+   }
+
+   private String readFile(File file) throws Exception
+   {
+      BufferedReader input = new BufferedReader(new FileReader(file));
+      StringBuilder sb = new StringBuilder();
+      try
+      {
+         String line = null;
+         while ((line = input.readLine()) != null)
+         {
+            sb.append(line);
+            sb.append(System.getProperty("line.separator"));
+         }
+      }
+      finally
+      {
+         input.close();
+      }
+      return sb.toString();
+   }
+
+}


Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591Schema.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591Schema.xsd	                        (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591Schema.xsd	2009-04-01 17:02:07 UTC (rev 9702)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:foo="http://marshalltestservice.org/types2"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://marshalltestservice.org/types2"
+	elementFormDefault="qualified"
+>
+  <element name="FooByteListType" type="foo:FooByteListType" />
+  <simpleType name="FooByteListType">
+    <list itemType="byte" />
+  </simpleType>
+</schema>
+


Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591Schema.xsd
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl	                        (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl	2009-04-01 17:02:07 UTC (rev 9702)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://marshalltestservice.org/NewSchemaDefs.wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://marshalltestservice.org/types2" name="NewSchemaDefs" targetNamespace="http://marshalltestservice.org/NewSchemaDefs.wsdl">
+  <types>
+    <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified">
+      <xsd:import namespace="http://marshalltestservice.org/types2" schemaLocation="JBWS2591Schema.xsd" />
+    </xsd:schema>
+  </types>
+  <message name="FooByteListTypeRequest">
+    <part name="fooByteListTypeRequest" element="ns2:FooByteListType" />
+  </message>
+  <message name="FooByteListTypeResponse">
+    <part name="fooByteListTypeResponse" element="ns2:FooByteListType" />
+  </message>
+  <portType name="NewSchemaTest">
+    <operation name="echoByteListTypeTest">
+      <input message="tns:FooByteListTypeRequest" />
+      <output message="tns:FooByteListTypeResponse" />
+    </operation>
+  </portType>
+  <binding name="NewSchemaTestSoapBinding" type="tns:NewSchemaTest">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+    <operation name="echoByteListTypeTest">
+      <soap:operation soapAction="" />
+      <input>
+        <soap:body use="literal" />
+      </input>
+      <output>
+        <soap:body use="literal" />
+      </output>
+    </operation>
+  </binding>
+  <service name="MarshallTestService">
+    <port name="MarshallTestPort2" binding="tns:NewSchemaTestSoapBinding">
+      <soap:address location="http://localhost:8080/W2JDLMarshallTest/jaxws/NewSchemaTest" />
+    </port>
+  </service>
+</definitions>
+


Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF


