diff --git a/apache-poi/temp.xlsx b/apache-poi/temp.xlsx index 5281b2c4de..50307a28c2 100644 Binary files a/apache-poi/temp.xlsx and b/apache-poi/temp.xlsx differ 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 96% 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"> 4.0.0 com.baeldung - MyStrutsApp + struts 0.0.1-SNAPSHOT pom struts + src/main/java @@ -13,6 +14,7 @@ src/main/resources + maven-compiler-plugin