[jbossws-commits] JBossWS SVN: r3385 - trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-01 17:46:59 -0400 (Fri, 01 Jun 2007)
New Revision: 3385

Modified:
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
Log:
Add reference to UMDM

Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java	2007-06-01 21:29:33 UTC (rev 3384)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java	2007-06-01 21:46:59 UTC (rev 3385)
@@ -54,22 +54,13 @@
  */
 public class PolicyMetaDataBuilderTestCase extends JBossWSTest
 {
-
-   private WSDLDefinitions readWsdl(String filename) throws Exception
-   {
-      File wsdlFile = new File(filename);
-      assertTrue(wsdlFile.exists());
-      WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
-      WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL());
-      assertNotNull(wsdlDefinitions);
-      return wsdlDefinitions;
-   }
-
    public void testEndpointScopePolicies() throws Exception
    {
-      WSDLDefinitions wsdlDefinitions = readWsdl("resources/jaxws/wspolicy/TestService.wsdl");
+      UnifiedVirtualFile vfRoot = new URLLoaderAdapter(new File("resources/jaxws/wspolicy").toURL());
+      UnifiedMetaData umd = new UnifiedMetaData(vfRoot);
+      
       QName serviceName = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService");
-      ServiceMetaData serviceMetaData = new ServiceMetaData(null, serviceName);
+      ServiceMetaData serviceMetaData = new ServiceMetaData(umd, serviceName);
       QName portName = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointInterfacePort");
       QName portTypeName = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointInterface");
       EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData, portName, portTypeName, Type.JAXWS);
@@ -81,6 +72,7 @@
       PolicyDeployer deployer = PolicyDeployer.newInstance(map);
       PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer);
 
+      WSDLDefinitions wsdlDefinitions = readWsdl("resources/jaxws/wspolicy/TestService.wsdl");
       builder.processPolicyExtensions(epMetaData, wsdlDefinitions);
 
       PolicyMetaExtension policyExt = (PolicyMetaExtension)epMetaData.getExtension(Constants.URI_WS_POLICY);
@@ -155,4 +147,13 @@
             || ("uselessBindingPolicy".equalsIgnoreCase(id6) && "uselessBindingPolicy2".equalsIgnoreCase(id5)));
    }
 
+   private WSDLDefinitions readWsdl(String filename) throws Exception
+   {
+      File wsdlFile = new File(filename);
+      assertTrue(wsdlFile.exists());
+      WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+      WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL());
+      assertNotNull(wsdlDefinitions);
+      return wsdlDefinitions;
+   }
 }