You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/08/30 12:07:03 UTC
cxf git commit: [CXF-7032] Adding a test
Repository: cxf
Updated Branches:
refs/heads/master 33b3c2978 -> 8e753ad9d
[CXF-7032] Adding a test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8e753ad9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8e753ad9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8e753ad9
Branch: refs/heads/master
Commit: 8e753ad9da27e389937c5231b8d809b29dcddce5
Parents: 33b3c29
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Aug 30 10:29:47 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Aug 30 10:29:47 2016 +0100
----------------------------------------------------------------------
tools/wadlto/jaxrs/pom.xml | 5 +++
.../tools/wadlto/jaxrs/JAXRSContainerTest.java | 32 +++++++++++++++++++-
2 files changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e753ad9/tools/wadlto/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index 4bf98e0..0fc4a58 100644
--- a/tools/wadlto/jaxrs/pom.xml
+++ b/tools/wadlto/jaxrs/pom.xml
@@ -61,5 +61,10 @@
<version>0.6.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e753ad9/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 e4c9c15..37e1130 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
@@ -27,11 +27,13 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.List;
+import javax.validation.Valid;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import org.apache.cxf.helpers.FileUtils;
@@ -465,13 +467,41 @@ public class JAXRSContainerTest extends ProcessorTestBase {
context.put(WadlToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
context.put(WadlToolConstants.CFG_WADLURL, getLocation("/wadl/resourceSameTargetNsSchemas.xml"));
context.put(WadlToolConstants.CFG_BEAN_VALIDATION, "true");
- //context.put(WadlToolConstants.CFG_COMPILE, "true");
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
container.setContext(context);
container.execute();
assertNotNull(output.list());
+ List<File> files = FileUtils.getFilesRecurse(output, ".+\\." + "class" + "$");
+ assertEquals(4, files.size());
+ assertTrue(checkContains(files, "application.Resource.class"));
+ @SuppressWarnings("resource")
+ ClassLoader loader = new URLClassLoader(new URL[] {output.toURI().toURL() });
+
+ Class<?> test1 = loader.loadClass("application.Resource");
+ Method[] test1Methods = test1.getDeclaredMethods();
+ assertEquals(1, test1Methods.length);
+ Method m = test1Methods[0];
+ assertEquals(5, m.getAnnotations().length);
+ assertNotNull(m.getAnnotation(Valid.class));
+ assertNotNull(m.getAnnotation(Path.class));
+ assertNotNull(m.getAnnotation(Consumes.class));
+ assertNotNull(m.getAnnotation(Produces.class));
+ assertNotNull(m.getAnnotation(PUT.class));
+
+ Class<?>[] paramTypes = m.getParameterTypes();
+ assertEquals(2, paramTypes.length);
+ Annotation[][] paramAnns = m.getParameterAnnotations();
+ assertEquals(String.class, paramTypes[0]);
+ assertEquals(1, paramAnns[0].length);
+ PathParam methodPathParam1 = (PathParam)paramAnns[0][0];
+ assertEquals("id", methodPathParam1.value());
+
+ assertEquals(1, paramAnns[1].length);
+ assertTrue(paramAnns[1][0] instanceof Valid);
+
} catch (Exception e) {
e.printStackTrace();
fail();