Author: richard.opalka(a)jboss.com Date: 2007-09-14 06:05:45 -0400 (Fri, 14 Sep 2007) New Revision: 4563 Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java Log: reparing test to use repaired generics Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java =================================================================== --- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java 2007-09-14 10:04:23 UTC (rev 4562) +++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java 2007-09-14 10:05:45 UTC (rev 4563) @@ -32,8 +32,9 @@ import org.apache.ws.policy.XorCompositeAssertion; import org.jboss.ws.WSException; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; +import org.jboss.ws.extensions.policy.deployer.domainAssertion.AssertionDeployer; import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer; -import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy; +import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicyException; import org.jboss.wsf.test.JBossWSTest; /** @@ -46,7 +47,7 @@ public void testDeployEmptyPolicy() throws Exception { - Map<String,Class> map = new HashMap<String,Class>(); + Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>(); map.put("http://www.jboss.com/test/policy";, NopAssertionDeployer.class); PolicyDeployer deployer = PolicyDeployer.newInstance(map); try @@ -64,7 +65,7 @@ public void testDeploySingleAssertion() throws Exception { - Map<String,Class> map = new HashMap<String,Class>(); + Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>(); map.put("http://www.jboss.com/test/policy";, NopAssertionDeployer.class); PolicyDeployer deployer = PolicyDeployer.newInstance(map); Policy policy = new Policy("myID"); @@ -79,7 +80,7 @@ deployer.deployServerside(policy, null); fail("deployServerSide shouldn't be able to deploy this policy!"); } - catch (UnsupportedPolicy up) + catch (UnsupportedPolicyException up) { //OK } @@ -87,7 +88,7 @@ public void testDeployMultipleAssertion() throws Exception { - Map<String,Class> map = new HashMap<String,Class>(); + Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>(); map.put("http://www.jboss.com/test/policy";, NopAssertionDeployer.class); map.put("http://www.jboss.com/test/policy2";, NopAssertionDeployer.class); map.put("http://www.jboss.com/test/policy3";, NopAssertionDeployer.class); @@ -103,7 +104,7 @@ deployer.deployServerside(policy, null); fail("deployServerSide shouldn't be able to deploy this policy!"); } - catch (UnsupportedPolicy up) + catch (UnsupportedPolicyException up) { //OK } @@ -111,7 +112,7 @@ public void testDeployMultipleAlternative() throws Exception { - Map<String,Class> map = new HashMap<String,Class>(); + Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>(); map.put("http://www.jboss.com/test/policy";, NopAssertionDeployer.class); map.put("http://www.jboss.com/test/policy2";, NopAssertionDeployer.class); PolicyDeployer deployer = PolicyDeployer.newInstance(map); @@ -135,7 +136,7 @@ deployer.deployServerside(policy, null); fail("deployServerSide shouldn't be able to deploy this policy (no alternative supported)!"); } - catch (UnsupportedPolicy up) + catch (UnsupportedPolicyException up) { //OK } @@ -143,7 +144,7 @@ public void testDeployMultipleComplexAlternative() throws Exception { - Map<String,Class> map = new HashMap<String,Class>(); + Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>(); map.put("http://www.jboss.com/test/policy";, NopAssertionDeployer.class); map.put("http://www.jboss.com/test/policy2";, NopAssertionDeployer.class); map.put("http://www.jboss.com/test/policy3";, NopAssertionDeployer.class); @@ -171,7 +172,7 @@ deployer.deployServerside(policy, null); fail("deployServerSide shouldn't be able to deploy this policy (no alternative supported)!"); } - catch (UnsupportedPolicy up) + catch (UnsupportedPolicyException up) { //OK } Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java =================================================================== --- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-09-14 10:04:23 UTC (rev 4562) +++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-09-14 10:05:45 UTC (rev 4563) @@ -33,6 +33,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.extensions.policy.PolicyScopeLevel; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; +import org.jboss.ws.extensions.policy.deployer.domainAssertion.AssertionDeployer; import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; @@ -65,7 +66,7 @@ QName portTypeName = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointInterface"); EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData, null, portName, portTypeName, Type.JAXWS); - Map<String, Class> map = new HashMap<String, Class>(); + Map<String, Class<? extends AssertionDeployer>> map = new HashMap<String, Class<? extends AssertionDeployer>>(); map.put("http://schemas.xmlsoap.org/ws/2005/02/rm/policy";, NopAssertionDeployer.class); map.put("http://www.fabrikam123.example.com/stock";, NopAssertionDeployer.class); map.put("http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";, NopAssertionDeployer.class); @@ -102,7 +103,7 @@ public void testAnnotationEndpointScopePolicies() throws Exception { - Map<String, Class> map = new HashMap<String, Class>(); + Map<String, Class<? extends AssertionDeployer>> map = new HashMap<String, Class<? extends AssertionDeployer>>(); map.put("http://www.fabrikam123.example.com/stock";, NopAssertionDeployer.class); PolicyDeployer deployer = PolicyDeployer.newInstance(map); PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer);