svn commit: r1053878 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java

[sergeyb]

Author: sergeyb
Date: Thu Dec 30 12:42:48 2010
New Revision: 1053878

URL: http://svn.apache.org/viewvc?rev=1053878&view=rev
Log:
Merged revisions 1053870 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1053870 | sergeyb | 2010-12-30 12:26:32 +0000 (Thu, 30 Dec 2010) | 1 line
  
  [JAX-RS] Adding the tests to do with the update to AbstractJAXBProvider 
dropped during the previous commit
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
    
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 30 12:42:48 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052990,1052993-1052994,1052996-1052997,1053114,1053119,1053123,1053239,1053290,1053402,1053654,1053858,1053868
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052990,1052993-1052994,1052996-1052997,1053114,1053119,1053123,1053239,1053290,1053402,1053654,1053858,1053868,1053870

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java?rev=1053878&r1=1053877&r2=1053878&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
 Thu Dec 30 12:42:48 2010
@@ -880,8 +880,19 @@ public class JAXBElementProviderTest ext
     }
     
     @Test 
-    public void testPackageContext() {
+    public void testIsReadableWithJaxbIndex() {
         JAXBElementProvider p = new JAXBElementProvider();
+        assertTrue(p.isReadable(TestBean.class, 
+                                TestBean.class, 
+                                new Annotation[]{}, 
MediaType.APPLICATION_XML_TYPE));
+    }
+    
+    @Test 
+    public void testPackageContextObjectFactory() {
+        JAXBElementProvider p = new JAXBElementProvider();
+        assertTrue(p.isReadable(org.apache.cxf.jaxrs.fortest.jaxb.Book.class, 
+                                org.apache.cxf.jaxrs.fortest.jaxb.Book.class, 
+                                new Annotation[]{}, 
MediaType.APPLICATION_XML_TYPE));
         try {
             JAXBContext context = 
p.getPackageContext(org.apache.cxf.jaxrs.fortest.jaxb.Book.class);
             JAXBContext context2 = 
p.getPackageContext(org.apache.cxf.jaxrs.fortest.jaxb.Book.class);

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java?rev=1053878&r1=1053877&r2=1053878&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
 Thu Dec 30 12:42:48 2010
@@ -306,10 +306,10 @@ public class ProviderFactoryTest extends
         
         MediaType mType = MediaType.valueOf(mediaType);
         
-        MessageBodyReader reader = pf.createMessageBodyReader(type, null, 
null, mType, new MessageImpl());
+        MessageBodyReader reader = pf.createMessageBodyReader(type, type, 
null, mType, new MessageImpl());
         assertSame("Unexpected provider found", provider, reader.getClass());
     
-        MessageBodyWriter writer = pf.createMessageBodyWriter(type, null, 
null, mType, new MessageImpl());
+        MessageBodyWriter writer = pf.createMessageBodyWriter(type, type, 
null, mType, new MessageImpl());
         assertTrue("Unexpected provider found", provider == writer.getClass());
     }