From e8faa73d749804a6a534eb992e3349d8887c6285 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Sat, 11 Mar 2017 23:31:41 +0200
Subject: [PATCH] testing cleanup

---
 apache-poi/temp.xlsx                          | Bin 3508 -> 3510 bytes
 ...disTest.java => JedisIntegrationTest.java} |   4 +-
 ...RedissonConfigurationIntegrationTest.java} |   2 +-
 ...Test.java => RedissonIntegrationTest.java} |   2 +-
 ...a => ResourceEndpointIntegrationTest.java} |  41 ++++--------------
 struts2/pom.xml                               |   4 +-
 6 files changed, 16 insertions(+), 37 deletions(-)
 rename redis/src/test/java/com/baeldung/{JedisTest.java => JedisIntegrationTest.java} (98%)
 rename redis/src/test/java/com/baeldung/{RedissonConfigurationTest.java => RedissonConfigurationIntegrationTest.java} (97%)
 rename redis/src/test/java/com/baeldung/{RedissonTest.java => RedissonIntegrationTest.java} (99%)
 rename spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/{ResourceEndpointTest.java => ResourceEndpointIntegrationTest.java} (50%)

diff --git a/apache-poi/temp.xlsx b/apache-poi/temp.xlsx
index 5281b2c4de3e395676c86da7df086c5019b7fa52..50307a28c2ae5c64afdcaf6baae59a0648c28c6b 100644
GIT binary patch
delta 597
zcmdlYy-k`oz?+#xgn@&DgCS*m_C{V=MrI(rS(mX6%$U56=^RL4ay_$A{i1aX-zuGI
zTCgL*^`qXB<mj9_k43Tf?`_!~?YMW&Oyl;M>m%M@X|Ox^^WF=g%~O(CqGm0-p4&P9
zmG7oQC)gKC8%pr1USnIo`toF_D81h1wZ>vGFAgr&xHQi@`jH;XY0i(Em{n_}IAz=O
zk7)`fy^Km~tr6Fq&~vGHkwS+Xi=$e7Vv@MBord&IjkoR6X^zUAJPRDy{Uc7D;Fmt2
z`TzYPo5&M$--~C-94|SOt`~RY#Oc3xAJ^1edi}DJv*OoJh3A(VIW8<%@!;X<V<CN$
zpa1!_?A`;d#cz}rRvwC&8(3F%^5v_o3j4o(KUJF=Q!48Gk|9?<PrWG9z2gt3b=iK#
z0B>n_jyH-MPVq1@Fzf<ilz^Ljg5@?i;FhsIfP`QtyEufgm_r`IILf&U5~g|FX5cVg
z&TR*#UvOJ<0>jt~Z2Dv!9y56mZ`pw}igOqk7%l*@2oNK{-pP$T%26OS3>~SHRsh}N
z%EG|Fi%<Y$&1Pj_sL0VTE~(5(E!L~Z%?a>kWD)@y1dVC0%)7lZcYzAyf!g^|wAM}j
t$0G-Jm^`mE<BZAHyqaJK{qp?Yng~?An2CWw0!7EJ$<4glY>C_;K>%58*slNp

delta 550
zcmdlcy+xWgz?+#xgn@&DgP|?ZYa_2LBQucRtjkyjW=vkkbPgmixt`gmo;B9#w(AsD
z$HIfBy2=$LZzp|r7JB>Z+p@b`o2o30)A@|!cUrz+tZm@mYbu&%d6c7P%PRBS*7>t?
zw;j`PNt`0Frjbj!+x+X#NKM)4*AAbHX1Dt$5Fj-3z|z$P;)@@*u-t4EQ}l1~JRJUd
zYsbnjx`j^rI>kI3U$R~lXcY>a;8{Oo=g|&-FIDlS)!z^61WY=>Amzi;^0epA2Ejdi
z|MkvHZnbHtTX?MS%<-#dmUc^2?%Q8Ir~iDFv8_I%zy16tF;xPBB3@i__OV`1t2f2R
z-ZzPk5uXy9w&jFG?u%KQn~c8&O^W~R{&eG}efzu?mNb;{Zx`OVMcCzE%iLY@0p9E!
zlCsBoc5*Q?Fzf<ilwg~Disd#q*jBJUfP`N+yEufgltUiEIL^5Y5~2m%X5bKA$!!Ow
zUvXP=0z=pfZ2Dw99y56mZ`pw}igOqk7%l*@2oNK{?#azO$`BKHq-|!hGB8x+=ogn%
z=A;(uRpjObcr!AI0JT74)GPCDugqPb?s%Z1`4Of7Sv8Y*<-q1B@=7yKn{3Og3Fc)2
Qc{?Vz@@liibA!|a09R7Ns{jB1

diff --git a/redis/src/test/java/com/baeldung/JedisTest.java b/redis/src/test/java/com/baeldung/JedisIntegrationTest.java
similarity index 98%
rename from redis/src/test/java/com/baeldung/JedisTest.java
rename to redis/src/test/java/com/baeldung/JedisIntegrationTest.java
index 582bb266aa..c1ec9bd2f8 100644
--- a/redis/src/test/java/com/baeldung/JedisTest.java
+++ b/redis/src/test/java/com/baeldung/JedisIntegrationTest.java
@@ -10,12 +10,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-public class JedisTest {
+public class JedisIntegrationTest {
 
     private Jedis jedis;
     private static RedisServer redisServer;
 
-    public JedisTest() {
+    public JedisIntegrationTest() {
         jedis = new Jedis();
     }
 
diff --git a/redis/src/test/java/com/baeldung/RedissonConfigurationTest.java b/redis/src/test/java/com/baeldung/RedissonConfigurationIntegrationTest.java
similarity index 97%
rename from redis/src/test/java/com/baeldung/RedissonConfigurationTest.java
rename to redis/src/test/java/com/baeldung/RedissonConfigurationIntegrationTest.java
index ba6d2eb54a..1862d6b035 100644
--- a/redis/src/test/java/com/baeldung/RedissonConfigurationTest.java
+++ b/redis/src/test/java/com/baeldung/RedissonConfigurationIntegrationTest.java
@@ -14,7 +14,7 @@ import java.io.IOException;
 /**
  * Created by johnson on 3/9/17.
  */
-public class RedissonConfigurationTest {
+public class RedissonConfigurationIntegrationTest {
     private static RedisServer redisServer;
     private static RedissonClient client;
 
diff --git a/redis/src/test/java/com/baeldung/RedissonTest.java b/redis/src/test/java/com/baeldung/RedissonIntegrationTest.java
similarity index 99%
rename from redis/src/test/java/com/baeldung/RedissonTest.java
rename to redis/src/test/java/com/baeldung/RedissonIntegrationTest.java
index 59d8a1ebc9..67c0e05a7e 100644
--- a/redis/src/test/java/com/baeldung/RedissonTest.java
+++ b/redis/src/test/java/com/baeldung/RedissonIntegrationTest.java
@@ -22,7 +22,7 @@ import java.util.stream.StreamSupport;
 
 import static org.junit.Assert.assertEquals;
 
-public class RedissonTest {
+public class RedissonIntegrationTest {
 
     private static RedisServer redisServer;
     private static RedissonClient client;
diff --git a/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointTest.java b/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java
similarity index 50%
rename from spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointTest.java
rename to spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java
index 6d532f98fc..2c48878917 100644
--- a/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointTest.java
+++ b/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java
@@ -1,68 +1,45 @@
 package com.baeldung.cachecontrol;
 
-import com.jayway.restassured.http.ContentType;
+import static com.jayway.restassured.RestAssured.given;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static com.jayway.restassured.RestAssured.given;
+import com.jayway.restassured.http.ContentType;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AppRunner.class)
-public class ResourceEndpointTest {
+public class ResourceEndpointIntegrationTest {
 
     @LocalServerPort
     private int serverPort;
 
     @Test
     public void whenGetRequestForUser_shouldRespondWithDefaultCacheHeaders() {
-        given()
-          .when()
-          .get(getBaseUrl() + "/default/users/Michael")
-          .then()
-          .headers("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate")
-          .header("Pragma", "no-cache");
+        given().when().get(getBaseUrl() + "/default/users/Michael").then().headers("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate").header("Pragma", "no-cache");
     }
 
     @Test
     public void whenGetRequestForUser_shouldRespondMaxAgeCacheControl() {
-        given()
-          .when()
-          .get(getBaseUrl() + "/users/Michael")
-          .then()
-          .header("Cache-Control", "max-age=60");
+        given().when().get(getBaseUrl() + "/users/Michael").then().header("Cache-Control", "max-age=60");
     }
 
     @Test
     public void givenServiceEndpoint_whenGetRequestForUser_shouldResponseWithCacheControlMaxAge() {
-        given()
-                .when()
-                .get(getBaseUrl() + "/users/Michael")
-                .then()
-                .contentType(ContentType.JSON).and().statusCode(200).and()
-                .header("Cache-Control", "max-age=60");
+        given().when().get(getBaseUrl() + "/users/Michael").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "max-age=60");
     }
 
     @Test
     public void givenServiceEndpoint_whenGetRequestForNotCacheableContent_shouldResponseWithCacheControlNoCache() {
-        given()
-                .when()
-                .get(getBaseUrl() + "/timestamp")
-                .then()
-                .contentType(ContentType.JSON).and().statusCode(200).and()
-                .header("Cache-Control", "no-store");
+        given().when().get(getBaseUrl() + "/timestamp").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "no-store");
     }
 
     @Test
     public void givenServiceEndpoint_whenGetRequestForPrivateUser_shouldResponseWithSecurityDefaultCacheControl() {
-        given()
-                .when()
-                .get(getBaseUrl() + "/private/users/Michael")
-                .then()
-                .contentType(ContentType.JSON).and().statusCode(200).and()
-                .header("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate");
+        given().when().get(getBaseUrl() + "/private/users/Michael").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate");
     }
 
     private String getBaseUrl() {
diff --git a/struts2/pom.xml b/struts2/pom.xml
index 25a374549d..ca5a682f9d 100644
--- a/struts2/pom.xml
+++ b/struts2/pom.xml
@@ -2,10 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.baeldung</groupId>
-	<artifactId>MyStrutsApp</artifactId>
+	<artifactId>struts</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>struts</name>
+    
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
 		<resources>
@@ -13,6 +14,7 @@
 				<directory>src/main/resources</directory>
 			</resource>
 		</resources>
+        
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>