feat: serenity-rest-assured updated rest core and tests, renamed some…

… classes
shaundsmith · Apr 20, 2016 · a608efe · a608efe
1 parent ae9e4a8
commit a608efe
Show file tree

Hide file tree

Showing 104 changed files with 1,134 additions and 1,798 deletions.
diff --git a/...d/rest/staging/DecomposedContentType.java → ...renitybdd/rest/DecomposedContentType.java b/...d/rest/staging/DecomposedContentType.java → ...renitybdd/rest/DecomposedContentType.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.rest.staging;
+package net.serenitybdd.rest;
 
 import com.jayway.restassured.http.ContentType;
 import org.apache.commons.lang3.ObjectUtils;

diff --git a/...serenitybdd/rest/staging/HeaderNames.java → ...ava/net/serenitybdd/rest/HeaderNames.java b/...serenitybdd/rest/staging/HeaderNames.java → ...ava/net/serenitybdd/rest/HeaderNames.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.rest.staging;
+package net.serenitybdd.rest;
 
 /**
  * User: YamStranger

diff --git a/...renitybdd/rest/staging/JsonConverter.java → ...a/net/serenitybdd/rest/JsonConverter.java b/...renitybdd/rest/staging/JsonConverter.java → ...a/net/serenitybdd/rest/JsonConverter.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.rest.staging;
+package net.serenitybdd.rest;
 
 import com.google.gson.JsonParser;
 import org.apache.commons.lang3.StringUtils;

diff --git a/serenity-rest-assured/src/main/java/net/serenitybdd/rest/QueryPayload.java b/serenity-rest-assured/src/main/java/net/serenitybdd/rest/QueryPayload.java
diff --git a/...erenitybdd/rest/staging/RestDefaults.java → ...va/net/serenitybdd/rest/RestDefaults.java b/...erenitybdd/rest/staging/RestDefaults.java → ...va/net/serenitybdd/rest/RestDefaults.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.rest.staging;
+package net.serenitybdd.rest;
 
 import com.jayway.restassured.authentication.*;
 import com.jayway.restassured.config.LogConfig;

diff --git a/...bdd/rest/staging/RestDefaultsChained.java → ...serenitybdd/rest/RestDefaultsChained.java b/...bdd/rest/staging/RestDefaultsChained.java → ...serenitybdd/rest/RestDefaultsChained.java
@@ -1,9 +1,7 @@
-package net.serenitybdd.rest.staging;
+package net.serenitybdd.rest;
 
 import com.jayway.restassured.authentication.AuthenticationScheme;
-import com.jayway.restassured.config.LogConfig;
 import com.jayway.restassured.config.RestAssuredConfig;
-import com.jayway.restassured.config.SSLConfig;
 import com.jayway.restassured.filter.Filter;
 import com.jayway.restassured.filter.log.LogDetail;
 import com.jayway.restassured.mapper.ObjectMapper;

diff --git a/...erenitybdd/rest/staging/RestRequests.java → ...va/net/serenitybdd/rest/RestRequests.java b/...erenitybdd/rest/staging/RestRequests.java → ...va/net/serenitybdd/rest/RestRequests.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.rest.staging;
+package net.serenitybdd.rest;
 
 import com.jayway.restassured.response.Response;
 import com.jayway.restassured.specification.RequestSender;

diff --git a/serenity-rest-assured/src/main/java/net/serenitybdd/rest/RestStepListener.java b/serenity-rest-assured/src/main/java/net/serenitybdd/rest/RestStepListener.java
@@ -11,9 +11,6 @@
 
 import java.util.Map;
 
-/**
- * Created by john on 18/05/2015.
- */
 public class RestStepListener implements StepListener {
 
     @Override
@@ -28,7 +25,7 @@ public void testSuiteStarted(Story story) {
 
     @Override
     public void testSuiteFinished() {
-        SerenityRest.clearQueryData();
+
     }
 
     @Override
@@ -38,12 +35,12 @@ public void testStarted(String description) {
 
     @Override
     public void testFinished(TestOutcome result) {
-        SerenityRest.clearQueryData();
+
     }
 
     @Override
     public void testRetried() {
-        SerenityRest.clearQueryData();
+
     }
 
     @Override
@@ -88,22 +85,22 @@ public void stepFinished() {
 
     @Override
     public void testFailed(TestOutcome testOutcome, Throwable cause) {
-        SerenityRest.clearQueryData();
+
     }
 
     @Override
     public void testIgnored() {
-        SerenityRest.clearQueryData();
+
     }
 
     @Override
     public void testSkipped() {
-        SerenityRest.clearQueryData();
+
     }
 
     @Override
     public void testPending() {
-        SerenityRest.clearQueryData();
+
     }
 
     @Override
@@ -133,11 +130,11 @@ public void exampleStarted(Map<String, String> data) {
 
     @Override
     public void exampleFinished() {
-        SerenityRest.clearQueryData();
+
     }
 
     @Override
     public void assumptionViolated(String message) {
-        SerenityRest.clearQueryData();
+
     }
 }
diff --git a/...serenitybdd/rest/staging/RestUtility.java → ...ava/net/serenitybdd/rest/RestUtility.java b/...serenitybdd/rest/staging/RestUtility.java → ...ava/net/serenitybdd/rest/RestUtility.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.rest.staging;
+package net.serenitybdd.rest;
 
 import com.jayway.restassured.authentication.*;
 import com.jayway.restassured.config.RestAssuredConfig;