Test to verify servelt deployment, double slash request and provider …

…initialization

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/boot/servlet/EchoResource.java

@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2016, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jaxrs.boot.servlet;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+/**
+ * 
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ */
+
+@Produces("text/plain")
+@Path("echo/{id}")
+public class EchoResource {
+	@GET
+	public String echo(@PathParam("id") int id) {
+		return "echo:" + id;
+	}
+}

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/boot/servlet/ServletDeploymentTestCase.java

@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2016, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jaxrs.boot.servlet;
+
+import java.net.URL;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.jaxrs.boot.servlet.sub.AnotherApplication;
+import org.jboss.test.jaxrs.boot.servlet.sub.AnotherEchoResource;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+/**
+ * 
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ */
+@RunWith(Arquillian.class)
+@RunAsClient
+public class ServletDeploymentTestCase {
+
+    @ArquillianResource
+    private URL url;
+
+    @Deployment(testable = false)
+	public static WebArchive createDeployments() {
+		WebArchive archive = ShrinkWrap.create(WebArchive.class,
+				"jaxrs-servlet.war");
+	    archive.setManifest(new StringAsset("Manifest-Version: 1.0\n"
+                + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-server services\n"))
+				.addClasses(EchoResource.class, TestApplication.class,
+						AnotherApplication.class, AnotherEchoResource.class, SetPropertyProvider.class)
+				.setWebXML(JBossWSTestHelper.getWebXml(
+										"<servlet>\n"
+										+"  <servlet-name>JAXRS</servlet-name>\n"
+									    +"  <servlet-class>org.jboss.wsf.stack.cxf.JAXRSServletExt</servlet-class>\n"
+									    +"  <init-param>\n"
+										+"     <param-name>javax.ws.rs.Application</param-name>\n"
+							            +"     <param-value>org.jboss.test.jaxrs.boot.servlet.TestApplication</param-value>\n"
+							            +"  </init-param>\n"
+									    +"</servlet>\n"
+										+"<servlet-mapping>\n"
+										+"  <servlet-name>JAXRS</servlet-name>\n"
+										+"   <url-pattern>/*</url-pattern>\n"
+										+"</servlet-mapping>\n"));
+		return archive;
+	}
+
+    @Test
+    public void testRequest() throws Exception {
+
+    	Client client = ClientBuilder.newClient();
+		WebTarget target = client.target(url + "myjaxrs/echo/5");
+		Invocation.Builder builder = target.request();
+		Response response = builder.buildGet().invoke();
+
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("echo:5", response.readEntity(String.class));
+    }
+
+
+    @Test
+    public void testDoubleSlashRequest() throws Exception {
+
+    	Client client = ClientBuilder.newClient();
+		WebTarget target = client.target(url + "/myjaxrs/echo/5");
+		Invocation.Builder builder = target.request();
+		Response response = builder.buildGet().invoke();
+        Assert.assertEquals("echo:5", response.readEntity(String.class));
+    }
+
+
+
+    @Test
+    public void testRequestWithProvider() throws Exception {
+
+    	Client client = ClientBuilder.newClient();
+    	client.register(new SetPropertyProvider(new AtomicInteger(0)));
+		WebTarget target = client.target(url + "/myjaxrs/echo/5");
+		Invocation.Builder builder = target.request();
+		Response response = builder.buildGet().invoke();
+        Assert.assertEquals("echo:5", response.readEntity(String.class));
+        response = builder.buildGet().invoke();
+        Assert.assertEquals("Value is set from client provider", response.readEntity(String.class));
+    }
+
+}
+

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/boot/servlet/SetPropertyProvider.java

@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2016, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jaxrs.boot.servlet;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+/**
+ * 
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ */
+@Provider
+public class SetPropertyProvider implements ClientRequestFilter {
+	private AtomicInteger counter;
+
+	public SetPropertyProvider(AtomicInteger counter) {
+		super();
+		this.counter = counter;
+	}
+
+	public void filter(ClientRequestContext context) throws IOException {
+		if (counter.incrementAndGet() == 2) {
+			Response response = Response.ok("Value is set from client provider").build();
+			context.abortWith(response);
+		} 
+	}
+
+}
+

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/boot/servlet/TestApplication.java

@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2016, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jaxrs.boot.servlet;
+/**
+ * 
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ */
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/myjaxrs")
+public class TestApplication extends Application
+{
+	public java.util.Set<java.lang.Class<?>> getClasses() {
+		Set<Class<?>> resources = new HashSet<Class<?>>();
+		resources.add(EchoResource.class);
+		return resources;
+	}
+}

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/boot/servlet/sub/AnotherApplication.java

@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2016, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jaxrs.boot.servlet.sub;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+/**
+ * 
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ */
+@ApplicationPath("/anotherjaxrs")
+public class AnotherApplication extends Application
+{
+	public java.util.Set<java.lang.Class<?>> getClasses() {
+		Set<Class<?>> resources = new HashSet<Class<?>>();
+		resources.add(AnotherEchoResource.class);
+		return resources;
+	}
+}
+

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/boot/servlet/sub/AnotherEchoResource.java

@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2016, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jaxrs.boot.servlet.sub;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+/**
+ * 
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ */
+@Produces("text/plain")
+@Path("echo/{id}")
+public class AnotherEchoResource {
+
+	@GET
+	public String echo(@PathParam("id") int id) {
+		return new MyEcho().getEchoMessage();
+	}
+}

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/boot/servlet/sub/MyEcho.java

@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2016, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jaxrs.boot.servlet.sub;
+/**
+ * 
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ */
+public class MyEcho {
+	private String echoMsg;
+	public MyEcho() {
+		this("default");
+	}
+	public MyEcho(String input) {
+		this.echoMsg = input;
+	}
+	public String getEchoMessage() {
+		return this.echoMsg;
+	}
+
+}