This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 59a74cf maven-surefire-plugin: replace deprecated forkMode with
forkCount
59a74cf is described below
commit 59a74cf86b42143a71b23c6e67a494a57dc645e7
Author: amarkevich <amarkev...@talend.com>
AuthorDate: Fri Dec 21 17:06:40 2018 +0300
maven-surefire-plugin: replace deprecated forkMode with forkCount
---
parent/pom.xml | 4 +-
.../cxf/transport/https/CertConstraintsTest.java | 14 +-
.../cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 1263 +++++++++-----------
.../cxf/tools/wadlto/jaxrs/WADLToJavaTest.java | 184 ++-
4 files changed, 644 insertions(+), 821 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 004deb4..541ca5c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<properties>
<cxf.protect-xmlschema-collections>false</cxf.protect-xmlschema-collections>
- <cxf.surefire.fork.mode>once</cxf.surefire.fork.mode>
+ <cxf.surefire.fork.count>1</cxf.surefire.fork.count>
<cxf.surefire.format>brief</cxf.surefire.format>
<cxf.surefire.usefile>false</cxf.surefire.usefile>
<org.apache.cxf.transport.websocket.atmosphere.disabled>false</org.apache.cxf.transport.websocket.atmosphere.disabled>
@@ -465,7 +465,7 @@
<runOrder>alphabetical</runOrder>
<reportFormat>${cxf.surefire.format}</reportFormat>
<useFile>${cxf.surefire.usefile}</useFile>
- <forkMode>${cxf.surefire.fork.mode}</forkMode>
+ <forkCount>${cxf.surefire.fork.count}</forkCount>
<childDelegation>false</childDelegation>
<argLine>${cxf.surefire.fork.vmargs}
-D${cxf.jaxb.context.class.property}=${cxf.jaxb.context.class}</argLine>
<enableAssertions>${cxf.surefire.enable.assertions}</enableAssertions>
diff --git
a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
index 87e12b6..968be74 100644
---
a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
+++
b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
@@ -20,10 +20,7 @@
package org.apache.cxf.transport.https;
-import java.io.ByteArrayInputStream;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import java.io.InputStream;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
@@ -117,12 +114,9 @@ public class CertConstraintsTest extends org.junit.Assert {
final String id
) throws Exception {
final KeyStore store = KeyStore.getInstance(keystoreType);
- Path path =
-
FileSystems.getDefault().getPath("src/test/java/org/apache/cxf/transport/https/resources/",
- keystoreFilename);
- byte[] bytes = Files.readAllBytes(path);
- try (ByteArrayInputStream bin = new ByteArrayInputStream(bytes)) {
- store.load(bin, keystorePassword.toCharArray());
+ try (InputStream is = CertConstraintsTest.class
+
.getResourceAsStream("/org/apache/cxf/transport/https/resources/" +
keystoreFilename)) {
+ store.load(is, keystorePassword.toCharArray());
for (java.util.Enumeration<String> aliases = store.aliases();
aliases.hasMoreElements();) {
final String alias = aliases.nextElement();
if (id.equals(alias)) {
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 566f3dc..85fb7cc 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
@@ -52,88 +52,71 @@ import org.junit.Test;
public class JAXRSContainerTest extends ProcessorTestBase {
@Test
- public void testNoTargetNamespace() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourceSchemaNoTargetNamespace.xml"));
- context.put(WadlToolConstants.CFG_SCHEMA_PACKAGENAME, "=custom");
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
- List<File> files = FileUtils.getFilesRecurse(output, ".+\\.class"
+ "$");
- assertEquals(3, files.size());
- assertTrue(checkContains(files, "application" +
".Resource.class"));
- assertTrue(checkContains(files, "custom" +
".TestCompositeObject.class"));
- assertTrue(checkContains(files, "custom" +
".ObjectFactory.class"));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testNoTargetNamespace() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourceSchemaNoTargetNamespace.xml"));
+ context.put(WadlToolConstants.CFG_SCHEMA_PACKAGENAME, "=custom");
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+ List<File> files = FileUtils.getFilesRecurse(output, ".+\\.class" +
"$");
+ assertEquals(3, files.size());
+ assertTrue(checkContains(files, "application" + ".Resource.class"));
+ assertTrue(checkContains(files, "custom" +
".TestCompositeObject.class"));
+ assertTrue(checkContains(files, "custom" + ".ObjectFactory.class"));
}
@Test
- public void testCodeGenInterfaces() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_MEDIA_TYPE_MAP,
- "application/xml=javax.xml.transform.Source");
- context.put(WadlToolConstants.CFG_MEDIA_TYPE_MAP,
-
"multipart/form-data=org.apache.cxf.jaxrs.ext.multipart.MultipartBody");
- context.put(WadlToolConstants.CFG_NO_VOID_FOR_EMPTY_RESPONSES,
"true");
-
context.put(WadlToolConstants.CFG_GENERATE_RESPONSE_IF_HEADERS_SET, "true");
- context.put(WadlToolConstants.CFG_GENERATE_RESPONSE_FOR_METHODS,
"getName");
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- verifyFiles("java", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
- verifyFiles("class", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
-
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testCodeGenInterfaces() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_MEDIA_TYPE_MAP,
+ "application/xml=javax.xml.transform.Source");
+ context.put(WadlToolConstants.CFG_MEDIA_TYPE_MAP,
+
"multipart/form-data=org.apache.cxf.jaxrs.ext.multipart.MultipartBody");
+ context.put(WadlToolConstants.CFG_NO_VOID_FOR_EMPTY_RESPONSES, "true");
+ context.put(WadlToolConstants.CFG_GENERATE_RESPONSE_IF_HEADERS_SET,
"true");
+ context.put(WadlToolConstants.CFG_GENERATE_RESPONSE_FOR_METHODS,
"getName");
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ verifyFiles("java", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
+ verifyFiles("class", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
}
@Test
- public void testInheritParameters() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/test.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
- context.put(WadlToolConstants.CFG_SCHEMA_TYPE_MAP,
- "{http://www.w3.org/2001/XMLSchema}anyType=";
- + "java.io.InputStream");
- context.put(WadlToolConstants.CFG_INHERIT_PARAMS, "last");
- context.put(WadlToolConstants.CFG_CREATE_JAVA_DOCS, "true");
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> files = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
- assertEquals(1, files.size());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testInheritParameters() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/test.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+ context.put(WadlToolConstants.CFG_SCHEMA_TYPE_MAP,
+ "{http://www.w3.org/2001/XMLSchema}anyType=";
+ + "java.io.InputStream");
+ context.put(WadlToolConstants.CFG_INHERIT_PARAMS, "last");
+ context.put(WadlToolConstants.CFG_CREATE_JAVA_DOCS, "true");
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ List<File> files = FileUtils.getFilesRecurse(output, ".+\\." + "class"
+ "$");
+ assertEquals(1, files.size());
}
@Test
@@ -211,350 +194,293 @@ public class JAXRSContainerTest extends
ProcessorTestBase {
}
@Test
- public void testCodeGenInterfacesMultipleInXmlReps() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
- context.put(WadlToolConstants.CFG_MULTIPLE_XML_REPS, "true");
+ public void testCodeGenInterfacesMultipleInXmlReps() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- container.setContext(context);
- container.execute();
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+ context.put(WadlToolConstants.CFG_MULTIPLE_XML_REPS, "true");
- assertNotNull(output.list());
+ container.setContext(context);
+ container.execute();
- verifyFiles("java", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
- verifyFiles("class", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
+ assertNotNull(output.list());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ verifyFiles("java", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
+ verifyFiles("class", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
}
@Test
- public void testCodeGenInterfacesWithBinding() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_BINDING,
getLocation("/wadl/jaxbBinding.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
+ public void testCodeGenInterfacesWithBinding() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- container.setContext(context);
- container.execute();
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_BINDING,
getLocation("/wadl/jaxbBinding.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
- assertNotNull(output.list());
+ container.setContext(context);
+ container.execute();
- verifyFiles("java", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
- verifyFiles("class", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
+ assertNotNull(output.list());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ verifyFiles("java", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
+ verifyFiles("class", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
}
-
+
@Test
- public void testCodeGenInterfacesWithJaxbClassNameSuffix() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_JAXB_CLASS_NAME_SUFFIX, "DTO");
- context.put(WadlToolConstants.CFG_BINDING,
getLocation("/wadl/jaxbSchemaBindings.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
- List<File> schemafiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "java" + "$");
- assertEquals(10, schemafiles.size());
- doVerifyTypesWithSuffix(schemafiles, "superbooks", "java");
-
- List<File> classfiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "class" + "$");
- assertEquals(10, classfiles.size());
- doVerifyTypesWithSuffix(classfiles, "superbooks", "class");
-
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testCodeGenInterfacesWithJaxbClassNameSuffix() throws
Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_JAXB_CLASS_NAME_SUFFIX, "DTO");
+ context.put(WadlToolConstants.CFG_BINDING,
getLocation("/wadl/jaxbSchemaBindings.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+ List<File> schemafiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
+ assertEquals(10, schemafiles.size());
+ doVerifyTypesWithSuffix(schemafiles, "superbooks", "java");
+
+ List<File> classfiles = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
+ assertEquals(10, classfiles.size());
+ doVerifyTypesWithSuffix(classfiles, "superbooks", "class");
}
@Test
- public void testCodeGenWithImportedSchema() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstoreImport.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
+ public void testCodeGenWithImportedSchema() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- container.setContext(context);
- container.execute();
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstoreImport.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
- assertNotNull(output.list());
+ container.setContext(context);
+ container.execute();
- verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
- verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ assertNotNull(output.list());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
}
@Test
- public void testCodeGenWithImportedSchemaWithParentRefs() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/sub/bookstoreImport.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
+ public void testCodeGenWithImportedSchemaWithParentRefs() throws Exception
{
+ JAXRSContainer container = new JAXRSContainer(null);
- container.setContext(context);
- container.execute();
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/sub/bookstoreImport.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
- assertNotNull(output.list());
+ container.setContext(context);
+ container.execute();
- verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
- verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ assertNotNull(output.list());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
}
@Test
- public void testCodeGenWithMultipleInlinedSchemas() {
+ public void testCodeGenWithMultipleInlinedSchemas() throws Exception {
doTestInlinedSchemasWithImport("/wadl/bookstoreMultipleSchemas.xml");
}
@Test
- public void testCodeGenWithInlinedSchemaAndImport() {
+ public void testCodeGenWithInlinedSchemaAndImport() throws Exception {
doTestInlinedSchemasWithImport("/wadl/bookstoreInlinedSchemaWithImport.xml");
}
- private void doTestInlinedSchemasWithImport(String loc) {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL, getLocation(loc));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> files = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
- assertEquals(8, files.size());
- assertTrue(checkContains(files, "org.apache.cxf.jaxrs.model.wadl"
+ ".BookStore.class"));
- assertTrue(checkContains(files, "org.apache.cxf.jaxrs.model.wadl"
+ ".PATCH.class"));
- assertTrue(checkContains(files, "superbooks" + ".Book.class"));
- assertTrue(checkContains(files, "superbooks" +
".ObjectFactory.class"));
- assertTrue(checkContains(files, "superbooks" +
".package-info.class"));
- assertTrue(checkContains(files, "superchapters" +
".Chapter.class"));
- assertTrue(checkContains(files, "superchapters" +
".ObjectFactory.class"));
- assertTrue(checkContains(files, "superchapters" +
".package-info.class"));
-
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ private void doTestInlinedSchemasWithImport(String loc) throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL, getLocation(loc));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ List<File> files = FileUtils.getFilesRecurse(output, ".+\\." + "class"
+ "$");
+ assertEquals(8, files.size());
+ assertTrue(checkContains(files, "org.apache.cxf.jaxrs.model.wadl" +
".BookStore.class"));
+ assertTrue(checkContains(files, "org.apache.cxf.jaxrs.model.wadl" +
".PATCH.class"));
+ assertTrue(checkContains(files, "superbooks" + ".Book.class"));
+ assertTrue(checkContains(files, "superbooks" +
".ObjectFactory.class"));
+ assertTrue(checkContains(files, "superbooks" + ".package-info.class"));
+ assertTrue(checkContains(files, "superchapters" + ".Chapter.class"));
+ assertTrue(checkContains(files, "superchapters" +
".ObjectFactory.class"));
+ assertTrue(checkContains(files, "superchapters" +
".package-info.class"));
}
+
@Test
- public void testResourceWithEPR() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourceWithEPR.xml"));
- context.put(WadlToolConstants.CFG_SCHEMA_TYPE_MAP,
-
"{http://www.w3.org/2001/XMLSchema}date=javax.xml.datatype.XMLGregorianCalendar";);
- 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" +
".BookstoreResource.class"));
- assertTrue(checkContains(files, "superbooks" + ".Book.class"));
- assertTrue(checkContains(files, "superbooks" +
".ObjectFactory.class"));
- assertTrue(checkContains(files, "superbooks" +
".package-info.class"));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testResourceWithEPR() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourceWithEPR.xml"));
+ context.put(WadlToolConstants.CFG_SCHEMA_TYPE_MAP,
+
"{http://www.w3.org/2001/XMLSchema}date=javax.xml.datatype.XMLGregorianCalendar";);
+ 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" +
".BookstoreResource.class"));
+ assertTrue(checkContains(files, "superbooks" + ".Book.class"));
+ assertTrue(checkContains(files, "superbooks" +
".ObjectFactory.class"));
+ assertTrue(checkContains(files, "superbooks" + ".package-info.class"));
}
@Test
- public void testResourceWithEPRNoSchemaGen() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourceWithEPR.xml"));
- context.put(WadlToolConstants.CFG_SCHEMA_TYPE_MAP,
- "{http://www.w3.org/2005/08/addressing}EndpointReferenceType=";
- + "javax.xml.ws.wsaddressing.W3CEndpointReference");
- context.put(WadlToolConstants.CFG_NO_ADDRESS_BINDING, "true");
- context.put(WadlToolConstants.CFG_NO_TYPES, "true");
-
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> files = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
- assertEquals(1, files.size());
- assertTrue(checkContains(files, "application" +
".BookstoreResource.class"));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testResourceWithEPRNoSchemaGen() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourceWithEPR.xml"));
+ context.put(WadlToolConstants.CFG_SCHEMA_TYPE_MAP,
+ "{http://www.w3.org/2005/08/addressing}EndpointReferenceType=";
+ + "javax.xml.ws.wsaddressing.W3CEndpointReference");
+ context.put(WadlToolConstants.CFG_NO_ADDRESS_BINDING, "true");
+ context.put(WadlToolConstants.CFG_NO_TYPES, "true");
+
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ List<File> files = FileUtils.getFilesRecurse(output, ".+\\." + "class"
+ "$");
+ assertEquals(1, files.size());
+ assertTrue(checkContains(files, "application" +
".BookstoreResource.class"));
}
@Test
- public void testQueryMultipartParam() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/testQueryMultipartParam.wadl"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> files = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
- 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();
- }
+ public void testQueryMultipartParam() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/testQueryMultipartParam.wadl"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ List<File> files = FileUtils.getFilesRecurse(output, ".+\\." + "class"
+ "$");
+ 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);
}
@Test
- public void testComplexPath() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/testComplexPath.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> files = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
- assertEquals(1, 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(2, test1Methods.length);
- assertEquals(2, test1Methods[0].getAnnotations().length);
- if ("getGetaddmethod2".equals(test1Methods[0].getName())) {
- Method tmp = test1Methods[0];
- test1Methods[0] = test1Methods[1];
- test1Methods[1] = tmp;
- }
- checkComplexPathMethod(test1Methods[0], "");
- checkComplexPathMethod(test1Methods[1], "2");
- } catch (Exception e) {
- e.printStackTrace();
- fail();
+ public void testComplexPath() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/testComplexPath.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ List<File> files = FileUtils.getFilesRecurse(output, ".+\\." + "class"
+ "$");
+ assertEquals(1, 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(2, test1Methods.length);
+ assertEquals(2, test1Methods[0].getAnnotations().length);
+ if ("getGetaddmethod2".equals(test1Methods[0].getName())) {
+ Method tmp = test1Methods[0];
+ test1Methods[0] = test1Methods[1];
+ test1Methods[1] = tmp;
}
+ checkComplexPathMethod(test1Methods[0], "");
+ checkComplexPathMethod(test1Methods[1], "2");
}
private void checkComplexPathMethod(Method m, String suffix) {
@@ -573,401 +499,325 @@ public class JAXRSContainerTest extends
ProcessorTestBase {
}
@Test
- public void testBeanValidation() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- 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");
-
- 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();
- }
- }
+ public void testBeanValidation() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- @Test
- public void testCodeGenWithImportedSchemaAndResourceSet() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
+ ToolContext context = new ToolContext();
+ 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");
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstoreResourceRef.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
+ container.setContext(context);
+ container.execute();
- container.setContext(context);
- container.execute();
+ assertNotNull(output.list());
- 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));
- verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
- verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ 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());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ assertEquals(1, paramAnns[1].length);
+ assertTrue(paramAnns[1][0] instanceof Valid);
}
@Test
- public void testCodeGenWithImportedSchemaAndBinding() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstoreImport.xml"));
- context.put(WadlToolConstants.CFG_BINDING,
getLocation("/wadl/jaxbBindingWithSchemaLoc.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
+ public void testCodeGenWithImportedSchemaAndResourceSet() throws Exception
{
+ JAXRSContainer container = new JAXRSContainer(null);
- container.setContext(context);
- container.execute();
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstoreResourceRef.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
- assertNotNull(output.list());
+ container.setContext(context);
+ container.execute();
- verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
- verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ assertNotNull(output.list());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
}
@Test
- public void testCodeGenWithImportedSchemaAndCatalog() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstoreImportCatalog.xml"));
- context.put(WadlToolConstants.CFG_CATALOG,
getLocation("/wadl/jax-rs-catalog.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
+ public void testCodeGenWithImportedSchemaAndBinding() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- container.setContext(context);
- container.execute();
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstoreImport.xml"));
+ context.put(WadlToolConstants.CFG_BINDING,
getLocation("/wadl/jaxbBindingWithSchemaLoc.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
- assertNotNull(output.list());
+ container.setContext(context);
+ container.execute();
- verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
- verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ assertNotNull(output.list());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
}
@Test
- public void testCodeGenNoIds() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- 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);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
- assertEquals(2, javaFiles.size());
- assertTrue(checkContains(javaFiles,
"application.CustomResource.java"));
- assertTrue(checkContains(javaFiles, "application.Theid.java"));
-
- List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "class" + "$");
- assertEquals(2, classFiles.size());
- assertTrue(checkContains(classFiles,
"application.CustomResource.class"));
- assertTrue(checkContains(classFiles, "application.Theid.class"));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testCodeGenWithImportedSchemaAndCatalog() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstoreImportCatalog.xml"));
+ context.put(WadlToolConstants.CFG_CATALOG,
getLocation("/wadl/jax-rs-catalog.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ verifyFiles("java", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
+ verifyFiles("class", false, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 9);
}
@Test
- public void testCodeGenNoIds2() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/multipleResources.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
- assertEquals(2, javaFiles.size());
- assertTrue(checkContains(javaFiles,
"application.BookstoreResource.java"));
- assertTrue(checkContains(javaFiles,
"application.BooksResource.java"));
- List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "class" + "$");
- assertEquals(2, classFiles.size());
- assertTrue(checkContains(classFiles,
"application.BookstoreResource.class"));
- assertTrue(checkContains(classFiles,
"application.BooksResource.class"));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testCodeGenNoIds() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ 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);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
+ assertEquals(2, javaFiles.size());
+ assertTrue(checkContains(javaFiles,
"application.CustomResource.java"));
+ assertTrue(checkContains(javaFiles, "application.Theid.java"));
+
+ List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
+ assertEquals(2, classFiles.size());
+ assertTrue(checkContains(classFiles,
"application.CustomResource.class"));
+ assertTrue(checkContains(classFiles, "application.Theid.class"));
}
@Test
- public void testCodeGenNoIds3() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourcesNoId.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
- context.put(WadlToolConstants.CFG_INHERIT_PARAMS, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
- assertEquals(1, javaFiles.size());
- assertTrue(checkContains(javaFiles,
"application.TestRsResource.java"));
- List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "class" + "$");
- assertEquals(1, classFiles.size());
- assertTrue(checkContains(classFiles,
"application.TestRsResource.class"));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testCodeGenNoIds2() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/multipleResources.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
+ assertEquals(2, javaFiles.size());
+ assertTrue(checkContains(javaFiles,
"application.BookstoreResource.java"));
+ assertTrue(checkContains(javaFiles, "application.BooksResource.java"));
+ List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
+ assertEquals(2, classFiles.size());
+ assertTrue(checkContains(classFiles,
"application.BookstoreResource.class"));
+ assertTrue(checkContains(classFiles,
"application.BooksResource.class"));
}
@Test
- public void testCodeTwoSchemasSameTargetNs() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourceSameTargetNsSchemas.xml"));
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
- assertEquals(4, javaFiles.size());
- assertTrue(checkContains(javaFiles, "application.Resource.java"));
- assertTrue(checkContains(javaFiles,
"com.example.test.ObjectFactory.java"));
- assertTrue(checkContains(javaFiles,
"com.example.test.package-info.java"));
- assertTrue(checkContains(javaFiles,
"com.example.test.TestCompositeObject.java"));
- List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "class" + "$");
- assertEquals(4, classFiles.size());
- assertTrue(checkContains(classFiles,
"application.Resource.class"));
- assertTrue(checkContains(classFiles,
"com.example.test.ObjectFactory.class"));
- assertTrue(checkContains(classFiles,
"com.example.test.package-info.class"));
- assertTrue(checkContains(classFiles,
"com.example.test.TestCompositeObject.class"));
-
-
- assertNotNull(output.list());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testCodeGenNoIds3() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourcesNoId.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+ context.put(WadlToolConstants.CFG_INHERIT_PARAMS, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
+ assertEquals(1, javaFiles.size());
+ assertTrue(checkContains(javaFiles,
"application.TestRsResource.java"));
+ List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
+ assertEquals(1, classFiles.size());
+ assertTrue(checkContains(classFiles,
"application.TestRsResource.class"));
}
+
@Test
- public void testCodeGenWithResourceSet() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/singleResourceWithRefs.xml"));
- context.put(WadlToolConstants.CFG_RESOURCENAME, "CustomResource");
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
- assertEquals(1, javaFiles.size());
- assertTrue(checkContains(javaFiles,
"application.CustomResource.java"));
-
- List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "class" + "$");
- assertEquals(1, classFiles.size());
- assertTrue(checkContains(classFiles,
"application.CustomResource.class"));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testCodeTwoSchemasSameTargetNs() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/resourceSameTargetNsSchemas.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
+ assertEquals(4, javaFiles.size());
+ assertTrue(checkContains(javaFiles, "application.Resource.java"));
+ assertTrue(checkContains(javaFiles,
"com.example.test.ObjectFactory.java"));
+ assertTrue(checkContains(javaFiles,
"com.example.test.package-info.java"));
+ assertTrue(checkContains(javaFiles,
"com.example.test.TestCompositeObject.java"));
+ List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
+ assertEquals(4, classFiles.size());
+ assertTrue(checkContains(classFiles, "application.Resource.class"));
+ assertTrue(checkContains(classFiles,
"com.example.test.ObjectFactory.class"));
+ assertTrue(checkContains(classFiles,
"com.example.test.package-info.class"));
+ assertTrue(checkContains(classFiles,
"com.example.test.TestCompositeObject.class"));
+
+
+ assertNotNull(output.list());
}
@Test
- public void testCodeGenInterfacesCustomPackage() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
+ public void testCodeGenWithResourceSet() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_PACKAGENAME, "custom.books");
- context.put(WadlToolConstants.CFG_COMPILE, "true");
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/singleResourceWithRefs.xml"));
+ context.put(WadlToolConstants.CFG_RESOURCENAME, "CustomResource");
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
- container.setContext(context);
- container.execute();
+ container.setContext(context);
+ container.execute();
- assertNotNull(output.list());
+ assertNotNull(output.list());
- verifyFiles("java", true, false, "superbooks", "custom.books", 11,
true);
- verifyFiles("class", true, false, "superbooks", "custom.books",
11, true);
+ List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"java" + "$");
+ assertEquals(1, javaFiles.size());
+ assertTrue(checkContains(javaFiles,
"application.CustomResource.java"));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\." +
"class" + "$");
+ assertEquals(1, classFiles.size());
+ assertTrue(checkContains(classFiles,
"application.CustomResource.class"));
}
@Test
- public void testCodeGenInterfacesCustomPackageForResourcesAndSchemas() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_PACKAGENAME,
"custom.books.service");
- context.put(WadlToolConstants.CFG_SCHEMA_PACKAGENAME,
"http://superbooks=custom.books.schema";);
- context.put(WadlToolConstants.CFG_COMPILE, "true");
+ public void testCodeGenInterfacesCustomPackage() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- container.setContext(context);
- container.execute();
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_PACKAGENAME, "custom.books");
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
- assertNotNull(output.list());
+ container.setContext(context);
+ container.execute();
- verifyFiles("java", true, false, "custom.books.schema",
"custom.books.service", 11, true);
- verifyFiles("class", true, false, "custom.books.schema",
"custom.books.service", 11, true);
+ assertNotNull(output.list());
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ verifyFiles("java", true, false, "superbooks", "custom.books", 11,
true);
+ verifyFiles("class", true, false, "superbooks", "custom.books", 11,
true);
}
@Test
- public void testCodeGenImpl() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_IMPL, "true");
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- verifyFiles("java", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
- verifyFiles("class", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
- } catch (Exception e) {
- fail();
- e.printStackTrace();
- }
+ public void testCodeGenInterfacesCustomPackageForResourcesAndSchemas()
throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_PACKAGENAME, "custom.books.service");
+ context.put(WadlToolConstants.CFG_SCHEMA_PACKAGENAME,
"http://superbooks=custom.books.schema";);
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ verifyFiles("java", true, false, "custom.books.schema",
"custom.books.service", 11, true);
+ verifyFiles("class", true, false, "custom.books.schema",
"custom.books.service", 11, true);
}
@Test
- public void testCodeGenInterfaceAndImpl() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
-
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_INTERFACE, "true");
- context.put(WadlToolConstants.CFG_IMPL, "true");
- context.put(WadlToolConstants.CFG_COMPILE, "true");
-
- container.setContext(context);
- container.execute();
-
- assertNotNull(output.list());
-
- verifyFiles("java", true, true, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 14, true);
- verifyFiles("class", true, true, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 14, true);
- } catch (Exception e) {
- fail();
- e.printStackTrace();
- }
+ public void testCodeGenImpl() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_IMPL, "true");
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ verifyFiles("java", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
+ verifyFiles("class", true, false, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 11, true);
}
@Test
- public void testCodeGenTypesOnly() {
- try {
- JAXRSContainer container = new JAXRSContainer(null);
+ public void testCodeGenInterfaceAndImpl() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- ToolContext context = new ToolContext();
- context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
- context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
- context.put(WadlToolConstants.CFG_TYPES, "true");
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_INTERFACE, "true");
+ context.put(WadlToolConstants.CFG_IMPL, "true");
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
- container.setContext(context);
- container.execute();
+ assertNotNull(output.list());
- assertNotNull(output.list());
+ verifyFiles("java", true, true, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 14, true);
+ verifyFiles("class", true, true, "superbooks",
"org.apache.cxf.jaxrs.model.wadl", 14, true);
+ }
- verifyTypes("superbooks", "java", true);
+ @Test
+ public void testCodeGenTypesOnly() throws Exception {
+ JAXRSContainer container = new JAXRSContainer(null);
- } catch (Exception e) {
- fail();
- e.printStackTrace();
- }
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_TYPES, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+
+ verifyTypes("superbooks", "java", true);
}
private void verifyFiles(String ext, boolean subresourceExpected, boolean
interfacesAndImpl,
@@ -1007,14 +857,15 @@ public class JAXRSContainerTest extends
ProcessorTestBase {
doVerifyTypes(files, schemaPackage, ext);
}
- private void doVerifyTypes(List<File> files, String schemaPackage, String
ext) {
+ private static void doVerifyTypes(List<File> files, String schemaPackage,
String ext) {
assertTrue(checkContains(files, schemaPackage + ".Book." + ext));
assertTrue(checkContains(files, schemaPackage + ".TheBook2." + ext));
assertTrue(checkContains(files, schemaPackage + ".Chapter." + ext));
assertTrue(checkContains(files, schemaPackage + ".ObjectFactory." +
ext));
assertTrue(checkContains(files, schemaPackage + ".package-info." +
ext));
}
- private void doVerifyTypesWithSuffix(List<File> files, String
schemaPackage, String ext) {
+
+ private static void doVerifyTypesWithSuffix(List<File> files, String
schemaPackage, String ext) {
assertTrue(checkContains(files, schemaPackage + ".BookDTO." + ext));
assertTrue(checkContains(files, schemaPackage + ".TheBook2DTO." +
ext));
assertTrue(checkContains(files, schemaPackage + ".ChapterDTO." + ext));
@@ -1022,7 +873,7 @@ public class JAXRSContainerTest extends ProcessorTestBase {
assertTrue(checkContains(files, schemaPackage + ".package-info." +
ext));
}
- private boolean checkContains(List<File> clsFiles, String name) {
+ private static boolean checkContains(List<File> clsFiles, String name) {
for (File f : clsFiles) {
if (f.getAbsolutePath().replace(File.separatorChar,
'.').endsWith(name)) {
return true;
diff --git
a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java
b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java
index fd9ee8b..db44625 100644
---
a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java
+++
b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java
@@ -23,7 +23,7 @@ import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.cxf.helpers.FileUtils;
@@ -36,121 +36,99 @@ import org.junit.Test;
public class WADLToJavaTest extends ProcessorTestBase {
@Test
- public void testCodeGenInterfaces() {
- try {
- String[] args = new String[] {
- "-d",
- output.getCanonicalPath(),
- "-p",
- "custom.service",
- "-tMap",
-
"{http://www.w3.org/2001/XMLSchema}date=java.util.List..String";,
- "-async getName,delete",
- "-inheritResourceParams first",
- "-compile",
- getLocation("/wadl/bookstore.xml"),
- };
- WADLToJava tool = new WADLToJava(args);
- tool.run(new ToolContext());
- assertNotNull(output.list());
-
- verifyFiles("java", true, false, "superbooks", "custom.service");
- verifyFiles("class", true, false, "superbooks", "custom.service");
-
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
+ public void testCodeGenInterfaces() throws Exception {
+ String[] args = new String[] {
+ "-d",
+ output.getCanonicalPath(),
+ "-p",
+ "custom.service",
+ "-tMap",
+ "{http://www.w3.org/2001/XMLSchema}date=java.util.List..String";,
+ "-async getName,delete",
+ "-inheritResourceParams first",
+ "-compile",
+ getLocation("/wadl/bookstore.xml"),
+ };
+ WADLToJava tool = new WADLToJava(args);
+ tool.run(new ToolContext());
+ assertNotNull(output.list());
+
+ verifyFiles("java", true, false, "superbooks", "custom.service");
+ verifyFiles("class", true, false, "superbooks", "custom.service");
}
@Test
public void testGenerateJAXBToString() throws Exception {
-
- try {
- String[] args = new String[] {
- "-d",
- output.getCanonicalPath(),
- "-p",
- "custom.service",
- "-async getName,delete",
- "-compile",
- "-xjc-episode " + output.getAbsolutePath() + "/test.episode",
- "-xjc-XtoString",
- getLocation("/wadl/bookstore.xml"),
- };
-
- WADLToJava tool = new WADLToJava(args);
- tool.run(new ToolContext());
- assertNotNull(output.list());
-
- verifyFiles("java", true, false, "superbooks", "custom.service");
- verifyFiles("class", true, false, "superbooks", "custom.service");
- assertTrue(new File(output.getAbsolutePath() +
"/test.episode").exists());
-
- List<Class<?>> schemaClassFiles = getSchemaClassFiles();
- assertEquals(4, schemaClassFiles.size());
- for (Class<?> c : schemaClassFiles) {
- c.getMethod("toString");
- }
- } catch (Exception e) {
- e.printStackTrace();
- fail();
+ String[] args = new String[] {
+ "-d",
+ output.getCanonicalPath(),
+ "-p",
+ "custom.service",
+ "-async getName,delete",
+ "-compile",
+ "-xjc-episode " + output.getAbsolutePath() + "/test.episode",
+ "-xjc-XtoString",
+ getLocation("/wadl/bookstore.xml"),
+ };
+
+ WADLToJava tool = new WADLToJava(args);
+ tool.run(new ToolContext());
+ assertNotNull(output.list());
+
+ verifyFiles("java", true, false, "superbooks", "custom.service");
+ verifyFiles("class", true, false, "superbooks", "custom.service");
+ assertTrue(new File(output.getAbsolutePath() +
"/test.episode").exists());
+
+ List<Class<?>> schemaClassFiles = getSchemaClassFiles();
+ assertEquals(4, schemaClassFiles.size());
+ for (Class<?> c : schemaClassFiles) {
+ c.getMethod("toString");
}
}
private List<Class<?>> getSchemaClassFiles() throws Exception {
- URLClassLoader cl = new URLClassLoader(new URL[]
{output.toURI().toURL()},
-
Thread.currentThread().getContextClassLoader());
-
- List<Class<?>> files = new ArrayList<>(4);
- files.add(cl.loadClass("superbooks.EnumType"));
- files.add(cl.loadClass("superbooks.Book"));
- files.add(cl.loadClass("superbooks.TheBook2"));
- files.add(cl.loadClass("superbooks.Chapter"));
- cl.close();
- return files;
+ try (URLClassLoader cl = new URLClassLoader(new URL[]
{output.toURI().toURL()},
+
Thread.currentThread().getContextClassLoader())) {
+ return Arrays.asList(
+ cl.loadClass("superbooks.EnumType"),
+ cl.loadClass("superbooks.Book"),
+ cl.loadClass("superbooks.TheBook2"),
+ cl.loadClass("superbooks.Chapter"));
+ }
}
@Test
public void testGenerateJAXBToStringAndEqualsAndHashCode() throws
Exception {
-
- try {
- String[] args = new String[] {
- "-d",
- output.getCanonicalPath(),
- "-p",
- "custom.service",
- "-async getName,delete",
- "-compile",
- "-xjc-XtoString",
- "-xjc-Xequals",
- "-xjc-XhashCode",
- getLocation("/wadl/bookstore.xml"),
- };
-
- WADLToJava tool = new WADLToJava(args);
- tool.run(new ToolContext());
- assertNotNull(output.list());
-
- verifyFiles("java", true, false, "superbooks", "custom.service");
- verifyFiles("class", true, false, "superbooks", "custom.service");
-
- List<Class<?>> schemaClassFiles = getSchemaClassFiles();
- assertEquals(4, schemaClassFiles.size());
- for (Class<?> c : schemaClassFiles) {
- c.getMethod("toString");
- c.getMethod("hashCode");
- c.getMethod("equals", Object.class);
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- fail();
+ String[] args = new String[] {
+ "-d",
+ output.getCanonicalPath(),
+ "-p",
+ "custom.service",
+ "-async getName,delete",
+ "-compile",
+ "-xjc-XtoString",
+ "-xjc-Xequals",
+ "-xjc-XhashCode",
+ getLocation("/wadl/bookstore.xml"),
+ };
+
+ WADLToJava tool = new WADLToJava(args);
+ tool.run(new ToolContext());
+ assertNotNull(output.list());
+
+ verifyFiles("java", true, false, "superbooks", "custom.service");
+ verifyFiles("class", true, false, "superbooks", "custom.service");
+
+ List<Class<?>> schemaClassFiles = getSchemaClassFiles();
+ assertEquals(4, schemaClassFiles.size());
+ for (Class<?> c : schemaClassFiles) {
+ c.getMethod("toString");
+ c.getMethod("hashCode");
+ c.getMethod("equals", Object.class);
}
}
-
private void verifyFiles(String ext, boolean subresourceExpected, boolean
interfacesAndImpl,
String schemaPackage, String resourcePackage) {
List<File> files = FileUtils.getFilesRecurse(output, ".+\\." + ext +
"$");
@@ -172,7 +150,7 @@ public class WADLToJavaTest extends ProcessorTestBase {
}
}
- private void doVerifyTypes(List<File> files, String schemaPackage, String
ext) {
+ private static void doVerifyTypes(List<File> files, String schemaPackage,
String ext) {
assertTrue(checkContains(files, schemaPackage + ".EnumType." + ext));
assertTrue(checkContains(files, schemaPackage + ".Book." + ext));
assertTrue(checkContains(files, schemaPackage + ".TheBook2." + ext));
@@ -181,7 +159,7 @@ public class WADLToJavaTest extends ProcessorTestBase {
assertTrue(checkContains(files, schemaPackage + ".package-info." +
ext));
}
- private boolean checkContains(List<File> clsFiles, String name) {
+ private static boolean checkContains(List<File> clsFiles, String name) {
for (File f : clsFiles) {
if (checkFileContains(f, name)) {
return true;
@@ -190,7 +168,7 @@ public class WADLToJavaTest extends ProcessorTestBase {
return false;
}
- private boolean checkFileContains(File f, String name) {
+ private static boolean checkFileContains(File f, String name) {
return f.getAbsolutePath().replace(File.separatorChar,
'.').endsWith(name);
}
