Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3DC01879B for ; Fri, 6 Nov 2015 15:50:58 +0000 (UTC) Received: (qmail 14841 invoked by uid 500); 6 Nov 2015 15:50:58 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 14784 invoked by uid 500); 6 Nov 2015 15:50:58 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 14774 invoked by uid 99); 6 Nov 2015 15:50:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Nov 2015 15:50:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4FFF1DFDD0; Fri, 6 Nov 2015 15:50:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <53c5dfb732414f44b96c27bcb1d54911@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6668] Updating the test Date: Fri, 6 Nov 2015 15:50:58 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 59b861505 -> 406ebe4cc [CXF-6668] Updating the test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/406ebe4c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/406ebe4c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/406ebe4c Branch: refs/heads/master Commit: 406ebe4cc4a30bdfa83a6854809b764ab00ba76d Parents: 59b8615 Author: Sergey Beryozkin Authored: Fri Nov 6 15:50:38 2015 +0000 Committer: Sergey Beryozkin Committed: Fri Nov 6 15:50:38 2015 +0000 ---------------------------------------------------------------------- .../tools/wadlto/jaxrs/JAXRSContainerTest.java | 66 ++++++++++++++++++++ 1 file changed, 66 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/406ebe4c/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java ---------------------------------------------------------------------- diff --git a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java index e4ad62d..5c0ab34 100644 --- a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java +++ b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java @@ -20,10 +20,19 @@ package org.apache.cxf.tools.wadlto.jaxrs; import java.io.File; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLClassLoader; import java.util.List; +import javax.ws.rs.Consumes; +import javax.ws.rs.PUT; +import javax.ws.rs.QueryParam; + import org.apache.cxf.helpers.FileUtils; +import org.apache.cxf.jaxrs.ext.multipart.Multipart; import org.apache.cxf.tools.common.ProcessorTestBase; import org.apache.cxf.tools.common.ToolContext; import org.apache.cxf.tools.wadlto.WadlToolConstants; @@ -333,6 +342,63 @@ public class JAXRSContainerTest extends ProcessorTestBase { assertEquals(2, files.size()); assertTrue(checkContains(files, "application.Test1.class")); assertTrue(checkContains(files, "application.Test2.class")); + + @SuppressWarnings("resource") + ClassLoader loader = new URLClassLoader(new URL[] {output.toURI().toURL() }); + + Class test1 = loader.loadClass("application.Test1"); + Method[] test1Methods = test1.getDeclaredMethods(); + assertEquals(1, test1Methods.length); + + assertEquals(2, test1Methods[0].getAnnotations().length); + assertNotNull(test1Methods[0].getAnnotation(PUT.class)); + Consumes consumes1 = test1Methods[0].getAnnotation(Consumes.class); + assertNotNull(consumes1); + assertEquals(1, consumes1.value().length); + assertEquals("multipart/mixed", consumes1.value()[0]); + + assertEquals("put", test1Methods[0].getName()); + Class[] paramTypes = test1Methods[0].getParameterTypes(); + assertEquals(3, paramTypes.length); + Annotation[][] paramAnns = test1Methods[0].getParameterAnnotations(); + assertEquals(Boolean.class, paramTypes[0]); + assertEquals(1, paramAnns[0].length); + QueryParam test1QueryParam1 = (QueryParam)paramAnns[0][0]; + assertEquals("standalone", test1QueryParam1.value()); + assertEquals(String.class, paramTypes[1]); + assertEquals(1, paramAnns[1].length); + Multipart test1MultipartParam1 = (Multipart)paramAnns[1][0]; + assertEquals("action", test1MultipartParam1.value()); + assertTrue(test1MultipartParam1.required()); + assertEquals(String.class, paramTypes[2]); + assertEquals(1, paramAnns[2].length); + Multipart test1MultipartParam2 = (Multipart)paramAnns[2][0]; + assertEquals("sources", test1MultipartParam2.value()); + assertFalse(test1MultipartParam2.required()); + + Class test2 = loader.loadClass("application.Test2"); + Method[] test2Methods = test2.getDeclaredMethods(); + assertEquals(1, test2Methods.length); + + assertEquals(2, test2Methods[0].getAnnotations().length); + assertNotNull(test2Methods[0].getAnnotation(PUT.class)); + Consumes consumes2 = test2Methods[0].getAnnotation(Consumes.class); + assertNotNull(consumes2); + assertEquals(1, consumes2.value().length); + assertEquals("application/json", consumes2.value()[0]); + + assertEquals("put", test2Methods[0].getName()); + Class[] paramTypes2 = test2Methods[0].getParameterTypes(); + assertEquals(2, paramTypes2.length); + Annotation[][] paramAnns2 = test2Methods[0].getParameterAnnotations(); + assertEquals(boolean.class, paramTypes2[0]); + assertEquals(1, paramAnns2[0].length); + QueryParam test2QueryParam1 = (QueryParam)paramAnns2[0][0]; + assertEquals("snapshot", test2QueryParam1.value()); + assertEquals(String.class, paramTypes2[1]); + assertEquals(0, paramAnns2[1].length); + + } catch (Exception e) { e.printStackTrace(); fail();