diff --git a/src/main/java/hostirosti/Constants.java b/src/main/java/hostirosti/Constants.java index 40d2d28..95cc913 100644 --- a/src/main/java/hostirosti/Constants.java +++ b/src/main/java/hostirosti/Constants.java @@ -13,7 +13,7 @@ public final class Constants { /** * Api version constant. */ - public static final String API_VERSION = "v1"; + public static final String API_VERSION = "v2"; /** * Disable public constructor. diff --git a/src/main/java/hostirosti/JavaRESTExample.java b/src/main/java/hostirosti/JavaRESTExample.java index ed7483d..ec64006 100644 --- a/src/main/java/hostirosti/JavaRESTExample.java +++ b/src/main/java/hostirosti/JavaRESTExample.java @@ -40,4 +40,17 @@ public final Response getHelloWorld() { return Response.status(OK) .entity(gson.toJson(new HelloWorld())).build(); } + + /** + * REST API endpoint to get Marriage Proposal Answers per HTTP GET. + * @return Response with Marriage Proposal object and status code HTTP_OK + */ + @GET + @Path(Constants.API_PREFIX + Constants.API_VERSION + "/marriage-proposal") + @Produces(MediaType.APPLICATION_JSON) + public final Response getMarriageProposal() { + Gson gson = new Gson(); + return Response.status(OK) + .entity(gson.toJson(new MarriageProposal())).build(); + } } diff --git a/src/main/java/hostirosti/MarriageProposal.java b/src/main/java/hostirosti/MarriageProposal.java new file mode 100644 index 0000000..21530d8 --- /dev/null +++ b/src/main/java/hostirosti/MarriageProposal.java @@ -0,0 +1,68 @@ +package hostirosti; + +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; + +import java.util.HashMap; +import java.util.Map; + +/** + * Marriage Proposal Statements for Demo + */ +public class MarriageProposal { + + /** + * The ultimate question + */ + private final String question = "Will you marry me?"; + + /** + * The ultimate answers from GitHub, JenkinsCI, GCP + */ + private Map answers = new HashMap(); + + + /** + * Initialize Marriage Proposal object and set hard-coded answers for + * Demo. + */ + public MarriageProposal() { + answers.put("JenkinsCI", "I do!"); + answers.put("GitHub","Hmm,... ok I do!"); + answers.put("Google", "Is MAYBE an option?"); + } + + /** + * + * @param obj the reference object with which to compare + * @return true if object is the same + */ + @Override + public boolean equals(final Object obj) { + if (!(obj instanceof MarriageProposal)) { + return false; + } + if (obj == this) { + return true; + } + + MarriageProposal marriageProposal = (MarriageProposal) obj; + return new EqualsBuilder(). + append(question, marriageProposal.question). + append(answers, marriageProposal.answers). + isEquals(); + } + + /** + * + * @return hash code value for this object + */ + @Override + public int hashCode() { + + return new HashCodeBuilder(33, 79). + append(question). + append(answers). + toHashCode(); + } +} diff --git a/src/non-packaged-resources/jmeter/JavaRESTExampleJMeter.jmx b/src/non-packaged-resources/jmeter/JavaRESTExampleJMeter.jmx index bf3bd5c..7adc8cf 100644 --- a/src/non-packaged-resources/jmeter/JavaRESTExampleJMeter.jmx +++ b/src/non-packaged-resources/jmeter/JavaRESTExampleJMeter.jmx @@ -50,7 +50,7 @@ true true ${testserver.endpoint.protocol}://${testserver.endpoint.host}/ - api/v1/hello-world + api/v2/hello-world ${testserver.endpoint.port} @@ -62,34 +62,43 @@ - - + + - - - - - - - /api/v1/hello-world + GET - true - false true - false - false - - + true + ${testserver.endpoint.protocol}://${testserver.endpoint.host}/ + api/v2/marriage-proposal + ${testserver.endpoint.port} + + - - - {"helloWorld":"Hello World! :)"} - - Assertion.response_data - false - 8 - + + question + Will you marry me? + true + + + + answers.GitHub + Hmm,... ok I do! + true + + + + answers.Google + Is MAYBE an option? + true + + + + answers.JenkinsCI + I do! + true + diff --git a/src/test/java/hostirosti/JavaRESTExampleIntegrationTest.java b/src/test/java/hostirosti/JavaRESTExampleIntegrationTest.java index 0ef5339..170be8d 100644 --- a/src/test/java/hostirosti/JavaRESTExampleIntegrationTest.java +++ b/src/test/java/hostirosti/JavaRESTExampleIntegrationTest.java @@ -1,6 +1,7 @@ package hostirosti; import static com.eclipsesource.restfuse.Assert.*; +import static org.junit.Assert.assertTrue; import com.eclipsesource.restfuse.HttpJUnitRunner; import com.eclipsesource.restfuse.Destination; @@ -51,19 +52,47 @@ public String getDestinationFromEnvironment() { public void checkApiInfoResponse() { assertOk(response); + String jsonResponse = response.getBody(); + + assertTrue(jsonResponse.contains(Constants.API_PREFIX)); + assertTrue(jsonResponse.contains(Constants.API_VERSION)); + Gson gson = new Gson(); - ApiInfo apiInfo = gson.fromJson(response.getBody(), ApiInfo.class); + + ApiInfo apiInfo = gson.fromJson(jsonResponse, ApiInfo.class); Assert.assertEquals(apiInfo, new ApiInfo()); } - @HttpTest(method = Method.GET, path = "/api/v1/hello-world") + @HttpTest(method = Method.GET, path = Constants.API_PREFIX + Constants.API_VERSION +"/hello-world") public void checkHelloWorldResponse() { assertOk(response); + String jsonResponse = response.getBody(); + + assertTrue(jsonResponse.contains("Hello Googlers! :)")); + assertTrue(jsonResponse.contains("helloWorld")); + Gson gson = new Gson(); - HelloWorld helloWord = gson.fromJson(response.getBody(), HelloWorld.class); + HelloWorld helloWord = gson.fromJson(jsonResponse, HelloWorld.class); Assert.assertEquals(helloWord, new HelloWorld()); } + + @HttpTest(method = Method.GET, path = Constants.API_PREFIX + Constants.API_VERSION +"/marriage-proposal") + public void checkMarriageProposalResponse() { + assertOk(response); + + String jsonResponse = response.getBody(); + + assertTrue(jsonResponse.contains("question")); + assertTrue(jsonResponse.contains("JenkinsCI")); + assertTrue(jsonResponse.contains("GitHub")); + assertTrue(jsonResponse.contains("Google")); + + Gson gson = new Gson(); + MarriageProposal marriageProposal = gson.fromJson(jsonResponse, MarriageProposal.class); + + Assert.assertEquals(marriageProposal, new MarriageProposal()); + } } diff --git a/src/test/java/hostirosti/JavaRESTExampleTest.java b/src/test/java/hostirosti/JavaRESTExampleTest.java index 82e78e2..ceeb6f8 100644 --- a/src/test/java/hostirosti/JavaRESTExampleTest.java +++ b/src/test/java/hostirosti/JavaRESTExampleTest.java @@ -4,39 +4,118 @@ import static org.junit.Assert.assertTrue; import com.google.gson.Gson; -import hostirosti.ApiInfo; -import hostirosti.HelloWorld; -import hostirosti.JavaRESTExample; -import org.junit.Before; -import org.junit.BeforeClass; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import javax.ws.rs.core.Response; +import java.util.HashMap; +import java.util.Map; @RunWith(JUnit4.class) public class JavaRESTExampleTest extends JavaRESTExampleTestBase { JavaRESTExample jre = new JavaRESTExample(); Gson gson = new Gson(); + /** + * Test ApiInfo API Response content + */ @Test public void testGetApiInfo() { Response response = jre.getApiInfo(); - ApiInfo apiInfo = gson.fromJson((String)response.getEntity(), ApiInfo.class); + String jsonResponse = (String)response.getEntity(); + + assertTrue(jsonResponse.contains(Constants.API_PREFIX)); + assertTrue(jsonResponse.contains(Constants.API_VERSION)); + + ApiInfo apiInfo = gson.fromJson(jsonResponse, ApiInfo.class); assertEquals(new ApiInfo(), apiInfo); } + /** + * Test ApiInfo hashCode function + */ + @Test + public void testApiInfoHashCode() { + ApiInfo apiInfo = new ApiInfo(); + + assertEquals(apiInfo.hashCode(), + new HashCodeBuilder(29, 83). + append(Constants.API_PREFIX). + append(Constants.API_VERSION). + toHashCode()); + } + + + /** + * Test HelloWorld API Response content + */ @Test - public void testHelloWorld() { + public void testGetHelloWorld() { Response response = jre.getHelloWorld(); + String jsonResponse = (String)response.getEntity(); + + assertTrue(jsonResponse.contains("Hello Googlers! :)")); + assertTrue(jsonResponse.contains("helloWorld")); - HelloWorld helloWorld = gson.fromJson((String)response.getEntity(), HelloWorld.class); + HelloWorld helloWorld = gson.fromJson(jsonResponse, HelloWorld.class); assertEquals(new HelloWorld(), helloWorld); + } + + + /** + * Test HelloWorld hashCode function + */ + @Test + public void testHelloWorldHashCode() { + HelloWorld helloWorld = new HelloWorld(); + assertEquals(helloWorld.hashCode(), + new HashCodeBuilder(27, 87). + append("Hello Googlers! :)"). + toHashCode()); } + + /** + * Test MarriageProposal API Response content + */ + @Test + public void testGetMarriageProposal() { + Response response = jre.getMarriageProposal(); + String jsonResponse = (String)response.getEntity(); + + assertTrue(jsonResponse.contains("question")); + assertTrue(jsonResponse.contains("JenkinsCI")); + assertTrue(jsonResponse.contains("GitHub")); + assertTrue(jsonResponse.contains("Google")); + + MarriageProposal marriageProposal = gson.fromJson(jsonResponse, MarriageProposal.class); + + assertEquals(new MarriageProposal(), marriageProposal); + } + + + /** + * Test MarriageProposal hashCode function + */ + @Test + public void testMarriageProposalHashCode() { + MarriageProposal marriageProposal = new MarriageProposal(); + + Map answers = new HashMap(); + answers.put("JenkinsCI", "I do!"); + answers.put("GitHub","Hmm,... ok I do!"); + answers.put("Google", "Is MAYBE an option?"); + + assertEquals(marriageProposal.hashCode(), + new HashCodeBuilder(33, 79). + append("Will you marry me?"). + append(answers). + toHashCode()); + } }