Fixed examples whose tests were failing on GF.

Change-Id: Ie8b41dee127320500b05e376f0663377098435f7
Signed-off-by: Michal Gajdos <[email protected]>

Author: Michal Gajdos

examples/bean-validation-webapp/src/main/java/org/glassfish/jersey/examples/beanvalidation/webapp/MyApplication.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -58,6 +58,9 @@
 import org.glassfish.jersey.server.validation.ValidationConfig;
 import org.glassfish.jersey.server.validation.internal.InjectingConstraintValidatorFactory;
 
+import org.eclipse.persistence.jaxb.BeanValidationMode;
+import org.eclipse.persistence.jaxb.MarshallerProperties;
+
 /**
  * ContactCard application configuration.
  *
@@ -74,7 +77,10 @@ public MyApplication() {
 
         // Providers - JSON.
         register(MoxyJsonFeature.class);
-        register(JsonConfiguration.class);
+        register(new MoxyJsonConfig().setFormattedOutput(true)
+                // Turn off BV otherwise the entities on server would be validated by MOXy as well.
+                .property(MarshallerProperties.BEAN_VALIDATION_MODE, BeanValidationMode.NONE)
+                .resolver());
     }
 
     /**
@@ -123,17 +129,4 @@ public List<String> getParameterNames(final Method method) {
             }
         }
     }
-
-    /**
-     * Configuration for {@link org.eclipse.persistence.jaxb.rs.MOXyJsonProvider} - outputs formatted JSON.
-     */
-    public static class JsonConfiguration implements ContextResolver<MoxyJsonConfig> {
-
-        @Override
-        public MoxyJsonConfig getContext(final Class<?> type) {
-            final MoxyJsonConfig config = new MoxyJsonConfig();
-            config.setFormattedOutput(true);
-            return config;
-        }
-    }
 }

examples/bean-validation-webapp/src/test/java/org/glassfish/jersey/examples/beanvalidation/webapp/ContactCardTest.java

@@ -93,9 +93,7 @@ protected Application configure() {
         enable(TestProperties.LOG_TRAFFIC);
         enable(TestProperties.DUMP_ENTITY);
 
-        final MyApplication application = new MyApplication();
-        application.property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true);
-        return application;
+        return new MyApplication().property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true);
     }
 
     @Override

examples/rx-client-java8-webapp/src/test/java/org/glassfish/jersey/examples/rx/RxClientsTest.java

@@ -47,9 +47,7 @@
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.ServletDeploymentContext;
 
-import org.junit.FixMethodOrder;
 import org.junit.Test;
-import org.junit.runners.MethodSorters;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -62,7 +60,8 @@ public class RxClientsTest extends JerseyTest {
 
     @Override
     protected DeploymentContext configureDeployment() {
-        return ServletDeploymentContext.builder(RxApplication.class).contextPath("rx").build();
+        return ServletDeploymentContext.builder(RxApplication.class)
+                .contextPath("rx-client-java8-webapp").contextPath("rx").build();
     }
 
     @Test

examples/rx-client-webapp/src/test/java/org/glassfish/jersey/examples/rx/RxClientsTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -63,7 +63,8 @@ public class RxClientsTest extends JerseyTest {
 
     @Override
     protected DeploymentContext configureDeployment() {
-        return ServletDeploymentContext.builder(RxApplication.class).contextPath("rx").build();
+        return ServletDeploymentContext.builder(RxApplication.class)
+                .contextPath("rx-client-webapp").servletPath("rx").build();
     }
 
     @Test

examples/shortener-webapp/src/test/java/org/glassfish/jersey/examples/shortener/webapp/ResourcesTest.java

@@ -46,7 +46,6 @@
 import java.util.List;
 
 import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Form;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -55,13 +54,15 @@
 import org.glassfish.jersey.examples.shortener.webapp.domain.ShortenedLink;
 import org.glassfish.jersey.examples.shortener.webapp.service.ShortenerService;
 import org.glassfish.jersey.server.validation.ValidationError;
+import org.glassfish.jersey.test.DeploymentContext;
 import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.ServletDeploymentContext;
 import org.glassfish.jersey.test.TestProperties;
 
-import org.junit.Assert;
 import org.junit.Test;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import com.github.mustachejava.DefaultMustacheFactory;
 import com.github.mustachejava.MustacheFactory;
@@ -74,19 +75,20 @@ public class ResourcesTest extends JerseyTest {
     private static final MustacheFactory factory = new DefaultMustacheFactory();
 
     @Override
-    protected Application configure() {
+    protected DeploymentContext configureDeployment() {
         enable(TestProperties.DUMP_ENTITY);
         enable(TestProperties.LOG_TRAFFIC);
 
-        return new ShortenerApplication();
+        return ServletDeploymentContext.builder(ShortenerApplication.class)
+                .contextPath("shortener-webapp").servletPath("/").build();
     }
 
     @Test
     public void testCreateForm() throws Exception {
         final Response response = target().request("text/html").get();
 
         assertThat(response.getStatus(), equalTo(200));
-        Assert.assertTrue(response.getMediaType().isCompatible(MediaType.TEXT_HTML_TYPE));
+        assertTrue(response.getMediaType().isCompatible(MediaType.TEXT_HTML_TYPE));
 
         assertThat(response.readEntity(String.class),
                 equalTo(resolveTemplate("mustache/form.mustache", Collections.singletonMap("greeting", "Link Shortener"))));
@@ -98,7 +100,7 @@ public void testCreateLink() throws Exception {
         final Response response = target().request("text/html").post(Entity.form(form));
 
         assertThat(response.getStatus(), equalTo(200));
-        Assert.assertTrue(response.getMediaType().isCompatible(MediaType.TEXT_HTML_TYPE));
+        assertTrue(response.getMediaType().isCompatible(MediaType.TEXT_HTML_TYPE));
 
         assertThat(response.readEntity(String.class),
                 equalTo(resolveTemplate("mustache/short-link.mustache",
@@ -111,7 +113,7 @@ public void testCreateInvalidLink() throws Exception {
         final Response response = target().request("text/html").post(Entity.form(form));
 
         assertThat(response.getStatus(), equalTo(400));
-        Assert.assertTrue(response.getMediaType().isCompatible(MediaType.TEXT_HTML_TYPE));
+        assertTrue(response.getMediaType().isCompatible(MediaType.TEXT_HTML_TYPE));
 
         assertThat(response.readEntity(String.class),
                 equalTo(resolveTemplate("mustache/error-form.mustache", getCreateFormValidationErrors())));