Author: sergeyb
Date: Sun Apr 22 17:02:25 2012
New Revision: 1328902
URL: http://svn.apache.org/viewvc?rev=1328902&view=rev
Log:
Merged revisions 1328502 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1328502 | sergeyb | 2012-04-20 22:10:33 +0100 (Fri, 20 Apr 2012) | 1 line
[CXF-4256] Adding a simple test
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/singleResource.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1328502
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java?rev=1328902&r1=1328901&r2=1328902&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
(original)
+++
cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
Sun Apr 22 17:02:25 2012
@@ -279,6 +279,7 @@ public class JAXRSContainerTest extends
context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/singleResource.xml"));
context.put(WadlToolConstants.CFG_RESOURCENAME, "CustomResource");
+ context.put(WadlToolConstants.CFG_GENERATE_ENUMS, "true");
context.put(WadlToolConstants.CFG_COMPILE, "true");
container.setContext(context);
@@ -287,12 +288,14 @@ public class JAXRSContainerTest extends
assertNotNull(output.list());
List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
- assertEquals(1, javaFiles.size());
+ assertEquals(2, javaFiles.size());
assertTrue(checkContains(javaFiles,
"application.CustomResource.java"));
+ assertTrue(checkContains(javaFiles, "application.Theid.java"));
List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "class" + "$");
- assertEquals(1, classFiles.size());
+ assertEquals(2, classFiles.size());
assertTrue(checkContains(classFiles,
"application.CustomResource.class"));
+ assertTrue(checkContains(classFiles, "application.Theid.class"));
} catch (Exception e) {
e.printStackTrace();
fail();
Modified:
cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/singleResource.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/singleResource.xml?rev=1328902&r1=1328901&r2=1328902&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/singleResource.xml
(original)
+++
cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/singleResource.xml
Sun Apr 22 17:02:25 2012
@@ -21,7 +21,10 @@
<resources base="http://localhost:8080/baz";>
<resource path="/bookstore/{id}">
- <param name="id" style="template" type="xs:long"/>
+ <param name="theid" style="template" type="xs:string">
+ <option value="one"/>
+ <option value="two"/>
+ </param>
<method name="GET">
<request/>
<response>
