From 22241a412645b474c3668407eb58087840fe3afa Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Thu, 9 Feb 2017 12:15:55 +0200
Subject: [PATCH] testing fix

---
 ...est.java => JavaEEAppIntegrationTest.java} | 61 +++++++++----------
 1 file changed, 29 insertions(+), 32 deletions(-)
 rename spring-boot/src/test/java/com/baeldung/annotation/servletcomponentscan/{JavaEEAppTest.java => JavaEEAppIntegrationTest.java} (79%)

diff --git a/spring-boot/src/test/java/com/baeldung/annotation/servletcomponentscan/JavaEEAppTest.java b/spring-boot/src/test/java/com/baeldung/annotation/servletcomponentscan/JavaEEAppIntegrationTest.java
similarity index 79%
rename from spring-boot/src/test/java/com/baeldung/annotation/servletcomponentscan/JavaEEAppTest.java
rename to spring-boot/src/test/java/com/baeldung/annotation/servletcomponentscan/JavaEEAppIntegrationTest.java
index 00705be307..95106d2dc8 100644
--- a/spring-boot/src/test/java/com/baeldung/annotation/servletcomponentscan/JavaEEAppTest.java
+++ b/spring-boot/src/test/java/com/baeldung/annotation/servletcomponentscan/JavaEEAppIntegrationTest.java
@@ -1,17 +1,12 @@
 package com.baeldung.annotation.servletcomponentscan;
 
-import com.baeldung.annotation.servletcomponentscan.javaee.AttrListener;
-import com.baeldung.annotation.servletcomponentscan.javaee.EchoServlet;
-import com.baeldung.annotation.servletcomponentscan.javaee.HelloFilter;
-import com.baeldung.annotation.servletcomponentscan.javaee.HelloServlet;
-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.Test;
-import org.junit.runner.RunWith;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 
 import javax.inject.Inject;
 import javax.servlet.FilterRegistration;
@@ -22,24 +17,31 @@ import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
 
-import static org.junit.Assert.*;
+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.Test;
+import org.junit.runner.RunWith;
+
+import com.baeldung.annotation.servletcomponentscan.javaee.AttrListener;
+import com.baeldung.annotation.servletcomponentscan.javaee.EchoServlet;
+import com.baeldung.annotation.servletcomponentscan.javaee.HelloFilter;
+import com.baeldung.annotation.servletcomponentscan.javaee.HelloServlet;
 
 @RunWith(Arquillian.class)
-public class JavaEEAppTest {
+public class JavaEEAppIntegrationTest {
 
     @Deployment
     public static WebArchive createDeployment() {
-        return ShrinkWrap
-          .create(WebArchive.class)
-          .addClass(JavaEEApp.class)
-          .addClasses(AttrListener.class, HelloFilter.class, HelloServlet.class, EchoServlet.class);
+        return ShrinkWrap.create(WebArchive.class).addClass(JavaEEApp.class).addClasses(AttrListener.class, HelloFilter.class, HelloServlet.class, EchoServlet.class);
     }
 
-    @Inject private ServletContext servletContext;
+    @Inject
+    private ServletContext servletContext;
 
     @Test
     public void givenServletContextListener_whenAccessSpecialAttrs_thenFound() throws MalformedURLException {
@@ -54,21 +56,18 @@ public class JavaEEAppTest {
         FilterRegistration filterRegistration = servletContext.getFilterRegistration("hello filter");
 
         assertNotNull(filterRegistration);
-        assertTrue(filterRegistration
-          .getServletNameMappings()
-          .contains("echo servlet"));
+        assertTrue(filterRegistration.getServletNameMappings().contains("echo servlet"));
     }
 
-    @ArquillianResource private URL base;
+    @ArquillianResource
+    private URL base;
 
     @Test
     @RunAsClient
     public void givenFilterAndServlet_whenGetHello_thenRespondFilteringHello() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
         WebTarget target = client.target(URI.create(new URL(base, "hello").toExternalForm()));
-        Response response = target
-          .request()
-          .get();
+        Response response = target.request().get();
 
         assertEquals("filtering hello", response.readEntity(String.class));
     }
@@ -78,9 +77,7 @@ public class JavaEEAppTest {
     public void givenFilterAndServlet_whenPostEcho_thenEchoFiltered() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
         WebTarget target = client.target(URI.create(new URL(base, "echo").toExternalForm()));
-        Response response = target
-          .request()
-          .post(Entity.entity("echo", MediaType.TEXT_PLAIN_TYPE));
+        Response response = target.request().post(Entity.entity("echo", MediaType.TEXT_PLAIN_TYPE));
 
         assertEquals("filtering echo", response.readEntity(String.class));
     }