FINERACT-775 Clean up Util
This commit is contained in:
committed by
Michael Vorburger ⛑️
parent
7919a35a6b
commit
aadc2a006c
@@ -28,13 +28,11 @@ import com.jayway.restassured.RestAssured;
|
|||||||
import com.jayway.restassured.path.json.JsonPath;
|
import com.jayway.restassured.path.json.JsonPath;
|
||||||
import com.jayway.restassured.specification.RequestSpecification;
|
import com.jayway.restassured.specification.RequestSpecification;
|
||||||
import com.jayway.restassured.specification.ResponseSpecification;
|
import com.jayway.restassured.specification.ResponseSpecification;
|
||||||
import java.text.ParseException;
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Random;
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.apache.http.conn.HttpHostConnectException;
|
import org.apache.http.conn.HttpHostConnectException;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Util for RestAssured tests. This class here in src/test is copy/pasted :(
|
* Util for RestAssured tests. This class here in src/test is copy/pasted :(
|
||||||
* from and identical to the one in src/integrationTest; please keep it in sync.
|
* from and identical to the one in src/integrationTest; please keep it in sync.
|
||||||
@@ -77,56 +75,4 @@ public class Utils {
|
|||||||
return (T) from(json).get(jsonAttributeToGetBack);
|
return (T) from(json).get(jsonAttributeToGetBack);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> T performServerPost(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
|
|
||||||
final String postURL, final String jsonBodyToSend, final String jsonAttributeToGetBack) {
|
|
||||||
final String json = given().spec(requestSpec).body(jsonBodyToSend).expect().spec(responseSpec).log().ifError().when().post(postURL)
|
|
||||||
.andReturn().asString();
|
|
||||||
if (jsonAttributeToGetBack == null) { return (T) json; }
|
|
||||||
return (T) from(json).get(jsonAttributeToGetBack);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> T performServerPut(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
|
|
||||||
final String putURL, final String jsonBodyToSend, final String jsonAttributeToGetBack) {
|
|
||||||
final String json = given().spec(requestSpec).body(jsonBodyToSend).expect().spec(responseSpec).log().ifError().when().put(putURL)
|
|
||||||
.andReturn().asString();
|
|
||||||
return (T) from(json).get(jsonAttributeToGetBack);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> T performServerDelete(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
|
|
||||||
final String deleteURL, final String jsonAttributeToGetBack) {
|
|
||||||
final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().delete(deleteURL).andReturn()
|
|
||||||
.asString();
|
|
||||||
return (T) from(json).get(jsonAttributeToGetBack);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String convertDateToURLFormat(String dateToBeConvert) {
|
|
||||||
SimpleDateFormat oldFormat = new SimpleDateFormat("dd MMMMMM yyyy", Locale.US);
|
|
||||||
SimpleDateFormat newFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
||||||
String reformattedStr = "";
|
|
||||||
try {
|
|
||||||
reformattedStr = newFormat.format(oldFormat.parse(dateToBeConvert));
|
|
||||||
} catch (final ParseException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return reformattedStr;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String randomStringGenerator(final String prefix, final int len, final String sourceSetString) {
|
|
||||||
final int lengthOfSource = sourceSetString.length();
|
|
||||||
final Random rnd = new Random();
|
|
||||||
final StringBuilder sb = new StringBuilder(len);
|
|
||||||
for (int i = 0; i < len; i++) {
|
|
||||||
sb.append((sourceSetString).charAt(rnd.nextInt(lengthOfSource)));
|
|
||||||
}
|
|
||||||
return (prefix + (sb.toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String randomStringGenerator(final String prefix, final int len) {
|
|
||||||
return randomStringGenerator(prefix, len, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String randomNameGenerator(final String prefix, final int lenOfRandomSuffix) {
|
|
||||||
return randomStringGenerator(prefix, lenOfRandomSuffix);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user