Add Bean Validation testcase (@ValidateOnExecution support still not …

…working)

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/beanvalidation/AnotherValidatorResource.java

@@ -0,0 +1,46 @@
+/*
+ * 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.beanvalidation;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+@Path("another-validate/{id}")
+@Produces("application/xml")
+public class AnotherValidatorResource
+{
+
+   @PathParam("id")
+   @Min(value = 4)
+   private int id;
+
+   @Valid
+   @GET
+   public ValidatorModel getValidatorModel()
+   {
+      return new ValidatorModel(id);
+   }
+}

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/beanvalidation/BeanValidationIntegrationTestCase.java

@@ -0,0 +1,123 @@
+/*
+ * 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.beanvalidation;
+
+import java.net.URL;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+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.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test for the integration of JAX-RS and Bean Validation.
+ *
+ * @author Stuart Douglas
+ * @author Gunnar Morling
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ */
+@RunWith(Arquillian.class)
+@RunAsClient
+public class BeanValidationIntegrationTestCase {
+
+    @ArquillianResource
+    private URL url;
+
+    @Deployment(testable = false)
+    public static WebArchive createDeployments()
+    {
+       WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs-beanvalidation.war");
+       archive.addManifest()
+          .addClasses(TestApplication.class, ValidatorModel.class, ValidatorResource.class,
+                AnotherValidatorResource.class, YetAnotherValidatorResource.class);
+       return archive;
+    }
+
+    @Test
+    public void testValidRequest() throws Exception {
+        DefaultHttpClient client = new DefaultHttpClient(new PoolingClientConnectionManager());
+
+        HttpGet get = new HttpGet(url + "myjaxrs/validate/5");
+        HttpResponse result = client.execute(get);
+
+        Assert.assertEquals(200, result.getStatusLine().getStatusCode());
+        Assert.assertTrue(EntityUtils.toString(result.getEntity()).contains("<validator id=\"5\"/>"));
+    }
+
+    @Test
+    public void testInvalidRequest() throws Exception {
+        DefaultHttpClient client = new DefaultHttpClient(new PoolingClientConnectionManager());
+
+        HttpGet get = new HttpGet(url + "myjaxrs/validate/3");
+        HttpResponse result = client.execute(get);
+
+        Assert.assertEquals("Parameter constraint violated", 400, result.getStatusLine().getStatusCode());
+    }
+
+    @Test
+    public void testInvalidRequestCausingPropertyConstraintViolation() throws Exception {
+        DefaultHttpClient client = new DefaultHttpClient(new PoolingClientConnectionManager());
+
+        HttpGet get = new HttpGet(url + "myjaxrs/another-validate/3");
+        HttpResponse result = client.execute(get);
+
+        Assert.assertEquals("Property constraint violated", 400, result.getStatusLine().getStatusCode());
+    }
+
+    @Test
+    @Ignore("Clarify if we need CDI integration to make this work...")
+    public void testInvalidRequestsAreAcceptedDependingOnValidationConfiguration() throws Exception {
+        DefaultHttpClient client = new DefaultHttpClient(new PoolingClientConnectionManager());
+
+        HttpGet get = new HttpGet(url + "myjaxrs/yet-another-validate/3/disabled");
+        HttpResponse result = client.execute(get);
+
+        Assert.assertEquals("No constraint violated", 200, result.getStatusLine().getStatusCode());
+        EntityUtils.consume(result.getEntity());
+
+        get = new HttpGet(url + "myjaxrs/yet-another-validate/3/enabled");
+        result = client.execute(get);
+
+        Assert.assertEquals("Parameter constraint violated", 400, result.getStatusLine().getStatusCode());
+    }
+
+    @Test
+    public void testInvalidResponse() throws Exception {
+        DefaultHttpClient client = new DefaultHttpClient(new PoolingClientConnectionManager());
+
+        HttpGet get = new HttpGet(url + "myjaxrs/validate/11");
+        HttpResponse result = client.execute(get);
+
+        Assert.assertEquals("Return value constraint violated", 500, result.getStatusLine().getStatusCode());
+    }
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.beanvalidation;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/myjaxrs")
+public class TestApplication extends Application
+{
+}

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/beanvalidation/ValidatorModel.java

@@ -0,0 +1,60 @@
+/*
+ * 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.beanvalidation;
+
+import javax.validation.constraints.Max;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author Stuart Douglas
+ */
+@XmlRootElement(name = "validator")
+public class ValidatorModel {
+
+    @Max(10)
+    private int id;
+
+    public ValidatorModel() {
+
+    }
+
+    public ValidatorModel(final int id) {
+        this.id = id;
+    }
+
+    @XmlAttribute
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return "ValidatorModel{" +
+                "id=" + id +
+                '}';
+    }
+}

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/beanvalidation/ValidatorResource.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.beanvalidation;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+@Path("validate/{id}")
+@Produces("application/xml")
+public class ValidatorResource
+{
+
+   @Valid
+   @GET
+   public ValidatorModel get(@PathParam("id") @Min(value = 4) int id)
+   {
+      return new ValidatorModel(id);
+   }
+}

modules/testsuite/shared-rest-tests/src/test/java/org/jboss/test/jaxrs/beanvalidation/YetAnotherValidatorResource.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.beanvalidation;
+
+import javax.validation.constraints.Min;
+import javax.validation.executable.ExecutableType;
+import javax.validation.executable.ValidateOnExecution;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+@Path("yet-another-validate/{id}")
+@Produces("application/xml")
+public class YetAnotherValidatorResource
+{
+
+   @GET
+   @Path("disabled")
+   @ValidateOnExecution(type = ExecutableType.NONE)
+   public ValidatorModel getWithoutValidation(@PathParam("id") @Min(value = 4) int id)
+   {
+      return new ValidatorModel(id);
+   }
+
+   @GET
+   @Path("enabled")
+   @ValidateOnExecution(type = ExecutableType.NON_GETTER_METHODS)
+   public ValidatorModel getWithValidation(@PathParam("id") @Min(value = 4) int id)
+   {
+      return new ValidatorModel(id);
+   }
+}