[jbossws-commits] JBossWS SVN: r4704 - in stack/native/trunk/src/test/java/org/jboss/test/ws: tools/jaxws and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2007-10-09 07:11:11 -0400 (Tue, 09 Oct 2007)
New Revision: 4704

Added:
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java
Modified:
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
Log:
[JBWS-1799] fixing tests

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java	2007-10-09 11:09:28 UTC (rev 4703)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java	2007-10-09 11:11:11 UTC (rev 4704)
@@ -38,7 +38,7 @@
 {
    public boolean authenticate
    (
-         @WebParam(name="username") String username, 
+         @WebParam(name="username") String username,
          @WebParam(name="password") String password
    );
 }

Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java	                        (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java	2007-10-09 11:11:11 UTC (rev 4704)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws1799;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1799] Two ejb3s exposed as 2 different web services in the same ear file.
+ * Can't have same methods with different parameters in two separate EJBs.
+ *
+ * @author richard.opalka at jboss.com
+ *
+ * @since Oct 8, 2007
+ */
+public class JBWS1799TestCase extends JBossWSTest
+{
+   public static Test suite()
+   {
+      return new JBossWSTestSetup(JBWS1799TestCase.class, "jaxws-jbws1799.jar");
+   }
+
+   public void testFirstService() throws Exception
+   {
+      QName serviceName = new QName("namespace1", "UserAccountService1.0");
+      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/svc-useracctv1.0/UserAccountService1.0?wsdl");
+
+      Service service = Service.create(wsdlURL, serviceName);
+      IUserAccountService proxy = (IUserAccountService)service.getPort(IUserAccountService.class);
+
+      assertTrue(proxy.authenticate("authorized"));
+      assertFalse(proxy.authenticate("unauthorized"));
+   }
+
+   public void testSecondService() throws Exception
+   {
+      QName serviceName = new QName("namespaceExt", "UserAccountServiceExt1.0");
+      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/svc-useracctv1.0/UserAccountServiceExt1.0?wsdl");
+
+      Service service = Service.create(wsdlURL, serviceName);
+      IUserAccountServiceExt proxy = (IUserAccountServiceExt)service.getPort(IUserAccountServiceExt.class);
+
+      assertTrue(proxy.authenticate("authorized", "password"));
+      assertFalse(proxy.authenticate("unauthorized", "password"));
+   }
+}


Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java	2007-10-09 11:09:28 UTC (rev 4703)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java	2007-10-09 11:11:11 UTC (rev 4704)
@@ -60,8 +60,8 @@
 
    private void checkWrapperSource(File outputDir, boolean shouldExist)
    {
-      File file1 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPO.java");
-      File file2 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPOResponse.java");
+      File file1 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/generated_978001231/SubmitPO.java");
+      File file2 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/generated_978001231/SubmitPOResponse.java");
       assertEquals(shouldExist, file1.exists());
       assertEquals(shouldExist, file2.exists());
    }
@@ -72,12 +72,12 @@
       URLClassLoader classLoader = new URLClassLoader(new URL[]{outputDir.toURL()}, Thread.currentThread().getContextClassLoader());
       
       // Check request wrapper
-      Class wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.SubmitPO", classLoader);      
+      Class wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.generated_978001231.SubmitPO", classLoader);      
       wrapper.getMethod("setPurchaseOrder", PurchaseOrder.class);
       assertEquals(PurchaseOrder.class.getName(), wrapper.getMethod("getPurchaseOrder").getReturnType().getName());
       
       // Check response wrapper
-      wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.SubmitPOResponse", classLoader);
+      wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.generated_978001231.SubmitPOResponse", classLoader);
       wrapper.getMethod("setPurchaseOrderAck", PurchaseOrderAck.class);
       assertEquals(PurchaseOrderAck.class.getName(), wrapper.getMethod("getPurchaseOrderAck").getReturnType().getName());
    }