From f9237c1573528d241f776944011784687012b4bb Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 10 Feb 2012 18:04:05 +0000 Subject: Fixing processing wireFormat and operationSelectors from rest-binding as the element QName was conflicting with binding-http and the DefaultBeanModelProcessor was producing http models for rest binding. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1242872 13f79535-47bb-0310-9956-ffa450edef68 --- .../jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java | 4 ++-- .../tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-rest/src/test') diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java b/sca-java-2.x/trunk/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java index e808daff6d..66807554f2 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java @@ -97,8 +97,8 @@ public class JAXRSOperationSelectorProcessorTestCase { staxProcessor.write(binding, bos, context); // used for debug comparison - // System.out.println(BINDING_WITH_OPERATION_SELECTOR); - // System.out.println(bos.toString()); + System.out.println(BINDING_WITH_OPERATION_SELECTOR); + System.out.println(bos.toString()); Assert.assertEquals(BINDING_WITH_OPERATION_SELECTOR, bos.toString()); diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java b/sca-java-2.x/trunk/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java index d2bc2e0e76..bdad2d5146 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java @@ -86,9 +86,12 @@ public class RESTBindingProcessorTestCase { RESTBinding binding = (RESTBinding) composite.getComponents().get(0).getServices().get(0).getBindings().get(0); Assert.assertNotNull(binding); + Assert.assertNotNull(binding.getRequestWireFormat()); + Assert.assertNotNull(binding.getOperationSelector()); Assert.assertEquals(30000, binding.getReadTimeout()); Assert.assertEquals(2, binding.getHttpHeaders().size()); Assert.assertEquals("Cache-Control", binding.getHttpHeaders().get(0).getName()); Assert.assertEquals("no-cache", binding.getHttpHeaders().get(0).getValue()); + } } -- cgit v1.2.3