[jboss-svn-commits] JBL Code SVN: r20829 - in labs/jbossesb/workspace/jimma/product/rosetta: tests/src/org/jboss/internal/soa/esb/webservice and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: jim.ma
Date: 2008-06-27 05:50:37 -0400 (Fri, 27 Jun 2008)
New Revision: 20829

Modified:
   labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
   labs/jbossesb/workspace/jimma/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGeneratorUnitTest.java
   labs/jbossesb/workspace/jimma/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/ServicePublisherUnitTest.java
Log:
Fixed unit test and mangle service name to class name

Modified: labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
===================================================================
--- labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java	2008-06-27 06:26:09 UTC (rev 20828)
+++ labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java	2008-06-27 09:50:37 UTC (rev 20829)
@@ -21,8 +21,12 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.xml.namespace.QName;
+
+import org.apache.xmlbeans.impl.common.NameUtil;
 import org.jboss.deployment.DeploymentInfo;
 
+
 public class ESBServiceEndpointInfo {
 	private ConcurrentHashMap<String, Object> properties = new ConcurrentHashMap<String, Object>();
 	private Class<?> epClass;
@@ -83,7 +87,7 @@
 	}
 	
 	public String getWSEndpointClassName() {
-		return "org.jboss.soa." + svcCat.toLowerCase() + "." + svcName;
+		return NameUtil.getClassNameFromQName(new QName(getTargetNamesapce(), svcName));
 	}
 	
 	public void setTargetNamespace(String value) {
@@ -134,4 +138,4 @@
 		return isOneway;
 	}
 
-}
+}
\ No newline at end of file

Modified: labs/jbossesb/workspace/jimma/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGeneratorUnitTest.java
===================================================================
--- labs/jbossesb/workspace/jimma/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGeneratorUnitTest.java	2008-06-27 06:26:09 UTC (rev 20828)
+++ labs/jbossesb/workspace/jimma/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGeneratorUnitTest.java	2008-06-27 09:50:37 UTC (rev 20829)
@@ -8,18 +8,14 @@
 import junit.framework.TestCase;
 
 public class JAXWSProviderClassGeneratorUnitTest extends TestCase {
-	public void testGenerator() {
+	public void testGenerator() throws Exception {
 		JAXWSProviderClassGenerator generator = new JAXWSProviderClassGenerator();
 		ESBServiceEndpointInfo epInfo = new ESBServiceEndpointInfo("test", "MyTest");
-		epInfo.setTargetNamespace("http://soa.jboss.org/");
 		String currentDir = getClass().getResource(".").getFile();
 		
-		try {
-			CtClass ctClass = generator.generate(epInfo);
-			ctClass.writeFile(currentDir);
-		} catch (Exception e) {
-		    e.printStackTrace();
-		}
+	    CtClass ctClass = generator.generate(epInfo);
+	    ctClass.writeFile(currentDir);
+		
 		File generatedClass = new File(currentDir + "/org/jboss/soa/test/MyTest.class");
 		assertTrue("the jaxws disptach provider class is not generated", generatedClass.exists());
 		
@@ -29,7 +25,8 @@
 		JAXWSProviderClassGenerator generator = new JAXWSProviderClassGenerator();
 		ESBServiceEndpointInfo epInfo = new ESBServiceEndpointInfo("test", "MyTest");
 		try {
-			assertTrue("The arrtibute in template is not repalced correctly", generator.getMethodBody(epInfo).indexOf("MyTest") > -1);
+			System.out.println(generator.getMethodBody(epInfo));
+			assertTrue("The arrtibute in template is not repalced correctly", generator.getMethodBody(epInfo).indexOf("deliverSync") > -1);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

Modified: labs/jbossesb/workspace/jimma/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/ServicePublisherUnitTest.java
===================================================================
--- labs/jbossesb/workspace/jimma/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/ServicePublisherUnitTest.java	2008-06-27 06:26:09 UTC (rev 20828)
+++ labs/jbossesb/workspace/jimma/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/ServicePublisherUnitTest.java	2008-06-27 09:50:37 UTC (rev 20829)
@@ -5,13 +5,8 @@
 
 import junit.framework.TestCase;
 
-import org.jboss.internal.soa.esb.publish.ServiceContractPublisher;
 import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
-import org.jboss.soa.esb.services.registry.Registry;
-import org.jboss.soa.esb.services.registry.RegistryFactory;
-import org.jboss.soa.esb.testutils.ESBConfigUtil;
 
 /**
  * @author
@@ -53,34 +48,4 @@
         assertEquals("D4", publishers.get(1).getCategory() + publishers.get(1).getServiceName());
         assertTrue(publishers.get(1).getContractPublisher() instanceof MockContractPublisher);
     }
-
-	public void testEsbServicePublisher() throws ConfigurationException,
-			IOException {
-
-		try {
-			
-			ESBConfigUtil configUtil = new ESBConfigUtil(getClass()
-					.getResourceAsStream("jbossesb_config_06.xml"));
-			configUtil.setInstallMockRegistry(true);
-			configUtil.startController();
-			List<ServicePublisher> publishers = ServicePublisher
-					.getServicePublishers();
-			
-			assertTrue(
-					"ServiceContractPublisher should be added to service publishers",
-					(publishers.get(2).getContractPublisher() instanceof ServiceContractPublisher));
-			Registry registry;
-
-			registry = RegistryFactory.getRegistry();
-			EPR epr = registry.findEPR(publishers.get(2).getCategory(),
-					publishers.get(2).getServiceName());
-			assertNotNull(publishers.get(2).getContractPublisher().getContractInfo(epr).getData());
-			configUtil.stopController();
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
 }