diff --git a/src/test/java/org/openepics/names/docker/ITUtilNameElement.java b/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
index a22664a221487bce803c4bb9516a743f839816f8..3319e28e367dbe598dec71035b217dd108d012ab 100644
--- a/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
+++ b/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
@@ -52,6 +52,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*/
public class ITUtilNameElement {
+ static final ObjectMapper mapper = new ObjectMapper();
+
/**
* This class is not to be instantiated.
*/
@@ -61,6 +63,23 @@ public class ITUtilNameElement {
// ----------------------------------------------------------------------------------------------------
+ /**
+ * Return string for name element array.
+ *
+ * @param value name element array
+ * @return string for name element array
+ */
+ static String object2Json(NameElementCommand[] value) {
+ try {
+ return mapper.writeValueAsString(value);
+ } catch (JsonProcessingException e) {
+ fail();
+ }
+ return null;
+ }
+
+ // ----------------------------------------------------------------------------------------------------
+
/**
* Assert that array of name elements has expected length.
*
@@ -195,11 +214,10 @@ public class ITUtilNameElement {
* @param queryString query string
* @param expectedLessThanOrEqual (if non-negative number) less than or equal to this number of items
* @param expectedGreaterThanOrEqual (if non-negative number) greater than or equal to this number of items
- * @return number of items in list
+ * @return response page name elements
*/
- public static Integer assertRead(String queryString, int expectedLessThanOrEqual, int expectedGreaterThanOrEqual) {
+ public static ResponsePageNameElements assertRead(String queryString, int expectedLessThanOrEqual, int expectedGreaterThanOrEqual) {
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
ResponsePageNameElements responsePageNameElements = null;
@@ -218,7 +236,7 @@ public class ITUtilNameElement {
// expected value for latest for items in list
assertLatest(responsePageNameElements);
- return responsePageNameElements.getListSize();
+ return responsePageNameElements;
} catch (IOException e) {
fail();
} catch (Exception e) {
@@ -287,7 +305,6 @@ public class ITUtilNameElement {
*/
public static void assertExists(String name, Boolean expected, Boolean expectedMessageEmpty) {
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
response = ITUtil.doGetJson(ITUtil.HTTP_IP_PORT_NAMING_API_V1_NAMES + "/exists/" + name);
@@ -312,7 +329,6 @@ public class ITUtilNameElement {
*/
public static void assertIsLegacy(String name, Boolean expected) {
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
response = ITUtil.doGetJson(ITUtil.HTTP_IP_PORT_NAMING_API_V1_NAMES + "/islegacy/" + name);
@@ -333,7 +349,6 @@ public class ITUtilNameElement {
*/
public static void assertIsValidToCreate(String name, Boolean expected) {
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
response = ITUtil.doGetJson(ITUtil.HTTP_IP_PORT_NAMING_API_V1_NAMES + "/isvalidtocreate/" + name);
@@ -360,12 +375,21 @@ public class ITUtilNameElement {
public static void assertValidate(String json, NameChoice nameChoice, int responseCode) {
assertValidate(json, nameChoice, responseCode, Boolean.FALSE, Boolean.FALSE);
}
-
+ /**
+ * Utility method to (try to) validate a name element from given json and assert expected response.
+ * Method expected to NOT succeed to validate
+ * but instead assert response code (possibly also a non-empty message).
+ *
+ * @param json json
+ * @param nameChoice name choice
+ * @param responseCode response code
+ * @param expected expected
+ * @param expectedMessageEmpty expected message empty
+ */
public static void assertValidate(String json, NameChoice nameChoice, int responseCode, Boolean expected, Boolean expectedMessageEmpty) {
String validatePath = getValidatePath(nameChoice);
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, validatePath, json));
@@ -382,6 +406,8 @@ public class ITUtilNameElement {
}
}
+ // --------------------
+
/**
* Utility method to validate and assert expected response.
*
@@ -396,20 +422,29 @@ public class ITUtilNameElement {
}
/**
- * Utility method to validate and assert expected response.
+ * Utility method to validate name element and assert expected response.
*
* @param nameElement name element
* @param nameChoice name choice
* @param expected expected response
*/
public static void assertValidate(NameElementCommand nameElement, NameChoice nameChoice, Boolean expected) {
- String validatePath = getValidatePath(nameChoice);
+ assertValidate(new NameElementCommand[] {nameElement}, nameChoice, expected);
+ }
+ /**
+ * Utility method to validate name elements and assert expected response.
+ *
+ * @param nameElements name elements
+ * @param nameChoice name choice
+ * @param expected expected response
+ */
+ public static void assertValidate(NameElementCommand[] nameElements, NameChoice nameChoice, Boolean expected) {
+ String path = getValidatePath(nameChoice);
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, validatePath, "[" + mapper.writeValueAsString(nameElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, path, object2Json(nameElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), expected);
} catch (IOException e) {
@@ -457,8 +492,7 @@ public class ITUtilNameElement {
* @throws JsonProcessingException
*/
public static void assertCreate(NameElementCommand nameElement, int responseCode) throws JsonProcessingException {
- ObjectMapper mapper = new ObjectMapper();
- assertCreate("[" + mapper.writeValueAsString(nameElement) + "]", responseCode);
+ assertCreate(object2Json(new NameElementCommand[] {nameElement}), responseCode);
}
/**
@@ -483,40 +517,49 @@ public class ITUtilNameElement {
}
}
+ // --------------------
+
/**
* Utility method to create a name element and assert result.
*
* @param nameElement name element
* @return created name element
*/
- static NameElement assertCreate(NameElementCommand nameElement) {
+ public static NameElement assertCreate(NameElementCommand nameElement) {
+ return assertCreate(new NameElementCommand[] {nameElement})[0];
+ }
+ /**
+ * Utility method to create name elements and assert result.
+ *
+ * @param nameElements name elements
+ * @return created name element
+ */
+ public static NameElement[] assertCreate(NameElementCommand[] nameElements) {
+ String path = getValidatePath(NameChoice.CREATE);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
- UUID uuid = null;
-
NameElement[] createdNameElements = null;
- NameElement createdNameElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "/validatecreate", "[" + mapper.writeValueAsString(nameElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, path, object2Json(nameElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlPostPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "", "[" + mapper.writeValueAsString(nameElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlPostPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "", object2Json(nameElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_CREATED);
createdNameElements = mapper.readValue(response[1], NameElement[].class);
- createdNameElement = ITUtilNameElement.assertContentLengthOne(createdNameElements);
- assertNotNull(createdNameElement.getUuid());
- uuid = createdNameElement.getUuid();
- nameElement.setUuid(uuid);
+ for (NameElement createdNameElement : createdNameElements) {
+ assertNotNull(createdNameElement.getUuid());
+ assertEquals(Boolean.TRUE, createdNameElement.isLatest());
+ assertEquals(Boolean.FALSE, createdNameElement.isDeleted());
+ assertNotNull(createdNameElement.getWhen());
+ }
- ITUtilNameElement.assertContent(createdNameElement, nameElement);
- assertEquals(Boolean.TRUE, createdNameElement.isLatest());
- assertEquals(Boolean.FALSE, createdNameElement.isDeleted());
- assertNotNull(createdNameElement.getWhen());
+ // not set uuid for input parameter(s)
+ // convenience, easy when array length 1, otherwise not easy
- return createdNameElement;
+ return createdNameElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
@@ -534,34 +577,38 @@ public class ITUtilNameElement {
* @param nameElement name element
* @return updated name element
*/
- static NameElement assertUpdate(NameElementCommand nameElement) {
+ public static NameElement assertUpdate(NameElementCommand nameElement) {
+ return assertUpdate(new NameElementCommand[] {nameElement})[0];
+ }
+ /**
+ * Utility method to update name elements and assert result.
+ *
+ * @param nameElements name elements
+ * @return updated name element
+ */
+ public static NameElement[] assertUpdate(NameElementCommand[] nameElements) {
+ String path = getValidatePath(NameChoice.UPDATE);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
- UUID uuid = null;
-
NameElement[] updatedNameElements = null;
- NameElement updatedNameElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "/validateupdate", "[" + mapper.writeValueAsString(nameElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, path, object2Json(nameElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlPutPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "", "[" + mapper.writeValueAsString(nameElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlPutPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "", object2Json(nameElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
updatedNameElements = mapper.readValue(response[1], NameElement[].class);
- updatedNameElement = ITUtilNameElement.assertContentLengthOne(updatedNameElements);
- assertNotNull(updatedNameElement.getUuid());
-
- uuid = updatedNameElement.getUuid();
- nameElement.setUuid(uuid);
- ITUtilNameElement.assertContent(updatedNameElement, nameElement);
- assertEquals(Boolean.TRUE, updatedNameElement.isLatest());
- assertEquals(Boolean.FALSE, updatedNameElement.isDeleted());
- assertNotNull(updatedNameElement.getWhen());
+ for (NameElement updatedNameElement : updatedNameElements) {
+ assertNotNull(updatedNameElement.getUuid());
+ assertEquals(Boolean.TRUE, updatedNameElement.isLatest());
+ assertEquals(Boolean.FALSE, updatedNameElement.isDeleted());
+ assertNotNull(updatedNameElement.getWhen());
+ }
- return updatedNameElement;
+ return updatedNameElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
@@ -579,34 +626,38 @@ public class ITUtilNameElement {
* @param nameElement name element
* @return deleted name element
*/
- static NameElement assertDelete(NameElementCommand nameElement) {
+ public static NameElement assertDelete(NameElementCommand nameElement) {
+ return assertDelete(new NameElementCommand[] {nameElement})[0];
+ }
+ /**
+ * Utility method to delete name elements and assert result.
+ *
+ * @param nameElements name elements
+ * @return deleted name element
+ */
+ public static NameElement[] assertDelete(NameElementCommand[] nameElements) {
+ String path = getValidatePath(NameChoice.DELETE);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
- UUID uuid = null;
-
NameElement[] deletedNameElements = null;
- NameElement deletedNameElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "/validatedelete", "[" + mapper.writeValueAsString(nameElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, path, object2Json(nameElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlDeletePathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "", "[" + mapper.writeValueAsString(nameElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlDeletePathJson(AuthorizationChoice.NONE, EndpointChoice.NAMES, "", object2Json(nameElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
deletedNameElements = mapper.readValue(response[1], NameElement[].class);
- deletedNameElement = ITUtilNameElement.assertContentLengthOne(deletedNameElements);
- assertNotNull(deletedNameElement.getUuid());
-
- uuid = deletedNameElement.getUuid();
- nameElement.setUuid(uuid);
- ITUtilNameElement.assertContent(deletedNameElement, nameElement);
- assertEquals(Boolean.TRUE, deletedNameElement.isLatest());
- assertEquals(Boolean.TRUE, deletedNameElement.isDeleted());
- assertNotNull(deletedNameElement.getWhen());
+ for (NameElement deletedNameElement : deletedNameElements) {
+ assertNotNull(deletedNameElement.getUuid());
+ assertEquals(Boolean.TRUE, deletedNameElement.isLatest());
+ assertEquals(Boolean.TRUE, deletedNameElement.isDeleted());
+ assertNotNull(deletedNameElement.getWhen());
+ }
- return deletedNameElement;
+ return deletedNameElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
diff --git a/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java b/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
index cc06611cb153d9cde4e20b54773b4b00ebcf0875..268d0d2973d1b6aef2b6ca75437333c9ba5d9630 100644
--- a/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
+++ b/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
@@ -53,6 +53,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*/
public class ITUtilStructureElement {
+ static final ObjectMapper mapper = new ObjectMapper();
+
/**
* This class is not to be instantiated.
*/
@@ -62,6 +64,23 @@ public class ITUtilStructureElement {
// ----------------------------------------------------------------------------------------------------
+ /**
+ * Return string for structure element array.
+ *
+ * @param value structure element array
+ * @return string for structure element array
+ */
+ static String object2Json(StructureElementCommand[] value) {
+ try {
+ return mapper.writeValueAsString(value);
+ } catch (JsonProcessingException e) {
+ fail();
+ }
+ return null;
+ }
+
+ // ----------------------------------------------------------------------------------------------------
+
/**
* Assert that array of structure elements has expected length.
*
@@ -197,11 +216,10 @@ public class ITUtilStructureElement {
* @param queryString query string
* @param expectedLessThanOrEqual (if non-negative number) less than or equal to this number of items
* @param expectedGreaterThanOrEqual (if non-negative number) greater than or equal to this number of items
- * @return number of items in list
+ * @return response page structure elements
*/
- public static Integer assertRead(String queryString, int expectedLessThanOrEqual, int expectedGreaterThanOrEqual) {
+ public static ResponsePageStructureElements assertRead(String queryString, int expectedLessThanOrEqual, int expectedGreaterThanOrEqual) {
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
ResponsePageStructureElements responsePageStructureElements = null;
@@ -220,7 +238,7 @@ public class ITUtilStructureElement {
// expected value for latest for items in list
assertLatest(responsePageStructureElements);
- return responsePageStructureElements.getListSize();
+ return responsePageStructureElements;
} catch (IOException e) {
fail();
} catch (Exception e) {
@@ -291,7 +309,6 @@ public class ITUtilStructureElement {
*/
public static void assertExists(Type type, String mnemonicpath, Boolean expected, Boolean expectedMessageEmpty) {
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
response = ITUtil.doGetJson(ITUtil.HTTP_IP_PORT_NAMING_API_V1_STRUCTURES + "/exists/" + type.toString() + "/" + mnemonicpath);
@@ -318,7 +335,6 @@ public class ITUtilStructureElement {
*/
public static void assertIsValidToCreate(Type type, String mnemonicpath, Boolean expected) {
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
response = ITUtil.doGetJson(ITUtil.HTTP_IP_PORT_NAMING_API_V1_STRUCTURES + "/isvalidtocreate/" + type.toString() + "/" + mnemonicpath);
@@ -357,21 +373,32 @@ public class ITUtilStructureElement {
}
}
+ // --------------------
+
/**
- * Utility method to validate and assert expected response.
+ * Utility method to validate structure element and assert expected response.
*
* @param structureElement structure element
* @param structureChoice structure choice
* @param expected expected response
*/
public static void assertValidate(StructureElementCommand structureElement, StructureChoice structureChoice, Boolean expected) {
- String validatePath = getValidatePath(structureChoice);
+ assertValidate(new StructureElementCommand[] {structureElement}, structureChoice, expected);
+ }
+ /**
+ * Utility method to validate structure elements and assert expected response.
+ *
+ * @param structureElements structure elements
+ * @param structureChoice structure choice
+ * @param expected expected response
+ */
+ public static void assertValidate(StructureElementCommand[] structureElements, StructureChoice structureChoice, Boolean expected) {
+ String path = getValidatePath(structureChoice);
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, validatePath, "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, path, object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), expected);
} catch (IOException e) {
@@ -428,8 +455,7 @@ public class ITUtilStructureElement {
* @throws JsonProcessingException
*/
public static void assertCreate(StructureElementCommand structureElement, int responseCode) throws JsonProcessingException {
- ObjectMapper mapper = new ObjectMapper();
- assertCreate("[" + mapper.writeValueAsString(structureElement) + "]", responseCode);
+ assertCreate(object2Json(new StructureElementCommand[] {structureElement}), responseCode);
}
/**
@@ -454,6 +480,8 @@ public class ITUtilStructureElement {
}
}
+ // --------------------
+
/**
* Utility method to create a structure element and assert result.
*
@@ -461,34 +489,41 @@ public class ITUtilStructureElement {
* @return created structure element
*/
public static StructureElement assertCreate(StructureElementCommand structureElement) {
+ return assertCreate(new StructureElementCommand[] {structureElement})[0];
+ }
+ /**
+ * Utility method to create structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return created structure element
+ */
+ public static StructureElement[] assertCreate(StructureElementCommand[] structureElements) {
+ String path = getValidatePath(StructureChoice.CREATE);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
- UUID uuid = null;
-
StructureElement[] createdStructureElements = null;
- StructureElement createdStructureElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/validatecreate", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, path, object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlPostPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlPostPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "", object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_CREATED);
createdStructureElements = mapper.readValue(response[1], StructureElement[].class);
- createdStructureElement = ITUtilStructureElement.assertContentLengthOne(createdStructureElements);
- assertNotNull(createdStructureElement.getUuid());
- uuid = createdStructureElement.getUuid();
- structureElement.setUuid(uuid);
+ for (StructureElement createdStructureElement : createdStructureElements) {
+ assertNotNull(createdStructureElement.getUuid());
+ assertEquals(Status.PENDING, createdStructureElement.getStatus());
+ assertEquals(Boolean.FALSE, createdStructureElement.isLatest());
+ assertEquals(Boolean.FALSE, createdStructureElement.isDeleted());
+ assertNotNull(createdStructureElement.getWhen());
+ }
- ITUtilStructureElement.assertContent(createdStructureElement, structureElement);
- assertEquals(Status.PENDING, createdStructureElement.getStatus());
- assertEquals(Boolean.FALSE, createdStructureElement.isLatest());
- assertEquals(Boolean.FALSE, createdStructureElement.isDeleted());
- assertNotNull(createdStructureElement.getWhen());
+ // not set uuid for input parameter(s)
+ // convenience, easy when array length 1, otherwise not easy
- return createdStructureElement;
+ return createdStructureElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
@@ -507,34 +542,38 @@ public class ITUtilStructureElement {
* @return updated structure element
*/
public static StructureElement assertUpdate(StructureElementCommand structureElement) {
+ return assertUpdate(new StructureElementCommand[] {structureElement})[0];
+ }
+ /**
+ * Utility method to update structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return updated structure element
+ */
+ public static StructureElement[] assertUpdate(StructureElementCommand[] structureElements) {
+ String path = getValidatePath(StructureChoice.UPDATE);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
- UUID uuid = null;
-
StructureElement[] updatedStructureElements = null;
- StructureElement updatedStructureElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/validateupdate", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, path, object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlPutPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlPutPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "", object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
updatedStructureElements = mapper.readValue(response[1], StructureElement[].class);
- updatedStructureElement = ITUtilStructureElement.assertContentLengthOne(updatedStructureElements);
- assertNotNull(updatedStructureElement.getUuid());
- uuid = updatedStructureElement.getUuid();
- structureElement.setUuid(uuid);
-
- ITUtilStructureElement.assertContent(updatedStructureElement, structureElement);
- assertEquals(Status.PENDING, updatedStructureElement.getStatus());
- assertEquals(Boolean.FALSE, updatedStructureElement.isLatest());
- assertEquals(Boolean.FALSE, updatedStructureElement.isDeleted());
- assertNotNull(updatedStructureElement.getWhen());
+ for (StructureElement updatedStructureElement : updatedStructureElements) {
+ assertNotNull(updatedStructureElement.getUuid());
+ assertEquals(Status.PENDING, updatedStructureElement.getStatus());
+ assertEquals(Boolean.FALSE, updatedStructureElement.isLatest());
+ assertEquals(Boolean.FALSE, updatedStructureElement.isDeleted());
+ assertNotNull(updatedStructureElement.getWhen());
+ }
- return updatedStructureElement;
+ return updatedStructureElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
@@ -553,34 +592,38 @@ public class ITUtilStructureElement {
* @return deleted structure element
*/
public static StructureElement assertDelete(StructureElementCommand structureElement) {
+ return assertDelete(new StructureElementCommand[] {structureElement})[0];
+ }
+ /**
+ * Utility method to delete structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return deleted structure element
+ */
+ public static StructureElement[] assertDelete(StructureElementCommand[] structureElements) {
+ String path = getValidatePath(StructureChoice.DELETE);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
- UUID uuid = null;
-
StructureElement[] deletedStructureElements = null;
- StructureElement deletedStructureElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/validatedelete", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, path, object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlDeletePathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlDeletePathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "", object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
deletedStructureElements = mapper.readValue(response[1], StructureElement[].class);
- deletedStructureElement = ITUtilStructureElement.assertContentLengthOne(deletedStructureElements);
- assertNotNull(deletedStructureElement.getUuid());
- uuid = deletedStructureElement.getUuid();
- structureElement.setUuid(uuid);
-
- ITUtilStructureElement.assertContent(deletedStructureElement, structureElement);
- assertEquals(Status.PENDING, deletedStructureElement.getStatus());
- assertEquals(Boolean.FALSE, deletedStructureElement.isLatest());
- assertEquals(Boolean.TRUE, deletedStructureElement.isDeleted());
- assertNotNull(deletedStructureElement.getWhen());
+ for (StructureElement deletedStructureElement : deletedStructureElements) {
+ assertNotNull(deletedStructureElement.getUuid());
+ assertEquals(Status.PENDING, deletedStructureElement.getStatus());
+ assertEquals(Boolean.FALSE, deletedStructureElement.isLatest());
+ assertEquals(Boolean.TRUE, deletedStructureElement.isDeleted());
+ assertNotNull(deletedStructureElement.getWhen());
+ }
- return deletedStructureElement;
+ return deletedStructureElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
@@ -599,29 +642,38 @@ public class ITUtilStructureElement {
* @return approved structure element
*/
public static StructureElement assertApprove(StructureElementCommand structureElement) {
+ return assertApprove(new StructureElementCommand[] {structureElement})[0];
+ }
+ /**
+ * Utility method to approve structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return approved structure element
+ */
+ public static StructureElement[] assertApprove(StructureElementCommand[] structureElements) {
+ String path = getValidatePath(StructureChoice.APPROVE);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
-
StructureElement[] approvedStructureElements = null;
- StructureElement approvedStructureElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/validateapprove", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, path, object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlPatchPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/approve", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlPatchPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/approve", object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
approvedStructureElements = mapper.readValue(response[1], StructureElement[].class);
- approvedStructureElement = ITUtilStructureElement.assertContentLengthOne(approvedStructureElements);
- ITUtilStructureElement.assertContent(approvedStructureElement, structureElement);
- assertEquals(Status.APPROVED, approvedStructureElement.getStatus());
- assertEquals(Boolean.TRUE, approvedStructureElement.isLatest());
- // not known if deleted
- assertNotNull(approvedStructureElement.getWhen());
+ for (StructureElement approvedStructureElement : approvedStructureElements) {
+ assertNotNull(approvedStructureElement.getUuid());
+ assertEquals(Status.APPROVED, approvedStructureElement.getStatus());
+ assertEquals(Boolean.TRUE, approvedStructureElement.isLatest());
+ // not known if deleted
+ assertNotNull(approvedStructureElement.getWhen());
+ }
- return approvedStructureElement;
+ return approvedStructureElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
@@ -640,29 +692,38 @@ public class ITUtilStructureElement {
* @return cancelled structure element
*/
public static StructureElement assertCancel(StructureElementCommand structureElement) {
+ return assertCancel(new StructureElementCommand[] {structureElement})[0];
+ }
+ /**
+ * Utility method to cancel structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return cancelled structure element
+ */
+ public static StructureElement[] assertCancel(StructureElementCommand[] structureElements) {
+ String path = getValidatePath(StructureChoice.CANCEL);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
-
StructureElement[] cancelledStructureElements = null;
- StructureElement cancelledStructureElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/validatecancel", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, path, object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlPatchPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/cancel", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlPatchPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/cancel", object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
cancelledStructureElements = mapper.readValue(response[1], StructureElement[].class);
- cancelledStructureElement = ITUtilStructureElement.assertContentLengthOne(cancelledStructureElements);
- ITUtilStructureElement.assertContent(cancelledStructureElement, structureElement);
- assertEquals(Status.CANCELLED, cancelledStructureElement.getStatus());
- assertEquals(Boolean.FALSE, cancelledStructureElement.isLatest());
- // not known if deleted
- assertNotNull(cancelledStructureElement.getWhen());
+ for (StructureElement cancelledStructureElement : cancelledStructureElements) {
+ assertNotNull(cancelledStructureElement.getUuid());
+ assertEquals(Status.CANCELLED, cancelledStructureElement.getStatus());
+ assertEquals(Boolean.FALSE, cancelledStructureElement.isLatest());
+ // not known if deleted
+ assertNotNull(cancelledStructureElement.getWhen());
+ }
- return cancelledStructureElement;
+ return cancelledStructureElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
@@ -681,29 +742,38 @@ public class ITUtilStructureElement {
* @return rejected structure element
*/
public static StructureElement assertReject(StructureElementCommand structureElement) {
+ return assertReject(new StructureElementCommand[] {structureElement})[0];
+ }
+ /**
+ * Utility method to reject structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return rejected structure element
+ */
+ public static StructureElement[] assertReject(StructureElementCommand[] structureElements) {
+ String path = getValidatePath(StructureChoice.REJECT);
+
try {
- ObjectMapper mapper = new ObjectMapper();
String[] response = null;
-
StructureElement[] rejectedStructureElements = null;
- StructureElement rejectedStructureElement = null;
- response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/validatereject", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlGetPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, path, object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
ITUtil.assertEqualsResponseBoolean(mapper.readValue(response[1], ResponseBooleanList.class), Boolean.TRUE);
- response = ITUtil.runShellCommand(ITUtil.curlPatchPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/reject", "[" + mapper.writeValueAsString(structureElement) + "]"));
+ response = ITUtil.runShellCommand(ITUtil.curlPatchPathJson(AuthorizationChoice.NONE, EndpointChoice.STRUCTURES, "/reject", object2Json(structureElements)));
ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
rejectedStructureElements = mapper.readValue(response[1], StructureElement[].class);
- rejectedStructureElement = ITUtilStructureElement.assertContentLengthOne(rejectedStructureElements);
- ITUtilStructureElement.assertContent(rejectedStructureElement, structureElement);
- assertEquals(Status.REJECTED, rejectedStructureElement.getStatus());
- assertEquals(Boolean.FALSE, rejectedStructureElement.isLatest());
- // not known if deleted
- assertNotNull(rejectedStructureElement.getWhen());
+ for (StructureElement rejectedStructureElement : rejectedStructureElements) {
+ assertNotNull(rejectedStructureElement.getUuid());
+ assertEquals(Status.REJECTED, rejectedStructureElement.getStatus());
+ assertEquals(Boolean.FALSE, rejectedStructureElement.isLatest());
+ // not known if deleted
+ assertNotNull(rejectedStructureElement.getWhen());
+ }
- return rejectedStructureElement;
+ return rejectedStructureElements;
} catch (IOException e) {
fail();
} catch (InterruptedException e) {
@@ -805,4 +875,96 @@ public class ITUtilStructureElement {
return assertReject(assertDelete(structureElement));
}
+ // --------------------
+
+ /**
+ * Utility method to create, approve structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return approved structure elements (after create)
+ */
+ public static StructureElement[] assertCreateApprove(StructureElementCommand[] structureElements) {
+ return assertApprove(assertCreate(structureElements));
+ }
+
+ /**
+ * Utility method to create, cancel structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return cancelled structure elements (after create)
+ */
+ public static StructureElement[] assertCreateCancel(StructureElementCommand[] structureElements) {
+ return assertCancel(assertCreate(structureElements));
+ }
+
+ /**
+ * Utility method to create, reject structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return rejected structure elements (after create)
+ */
+ public static StructureElement[] assertCreateReject(StructureElementCommand[] structureElements) {
+ return assertReject(assertCreate(structureElements));
+ }
+
+ /**
+ * Utility method to update, approve structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return approved structure elements (after update)
+ */
+ public static StructureElement[] assertUpdateApprove(StructureElementCommand[] structureElements) {
+ return assertApprove(assertUpdate(structureElements));
+ }
+
+ /**
+ * Utility method to update, cancel structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return cancelled structure elements (after update)
+ */
+ public static StructureElement[] assertUpdateCancel(StructureElementCommand[] structureElements) {
+ return assertCancel(assertUpdate(structureElements));
+ }
+
+ /**
+ * Utility method to update, reject structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return rejected structure elements (after update)
+ */
+ public static StructureElement[] assertUpdateReject(StructureElementCommand[] structureElements) {
+ return assertReject(assertUpdate(structureElements));
+ }
+
+ /**
+ * Utility method to delete, approve structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return approved structure elements (after delete)
+ */
+ public static StructureElement[] assertDeleteApprove(StructureElementCommand[] structureElements) {
+ return assertApprove(assertDelete(structureElements));
+ }
+
+ /**
+ * Utility method to delete, cancel structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return cancelled structure elements (after delete)
+ */
+ public static StructureElement[] assertDeleteCancel(StructureElementCommand[] structureElements) {
+ return assertCancel(assertDelete(structureElements));
+ }
+
+ /**
+ * Utility method to delete, reject structure elements and assert result.
+ *
+ * @param structureElements structure elements
+ * @return rejected structure elements (after delete)
+ */
+ public static StructureElement[] assertDeleteReject(StructureElementCommand[] structureElements) {
+ return assertReject(assertDelete(structureElements));
+ }
+
}
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index 740fcea5d48a8dad937735dafae3ccbccf783552..c6be3e09157f793c537b907aa5d919cb5dcd773e 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -540,6 +540,7 @@ class NamesIT {
try {
NameElementCommand nameElement = null;
+ NameElement createdNameElement = null;
nameElement = new NameElementCommand(
null, subsystem010PRL, deviceTypeRFA, "054",
@@ -548,7 +549,8 @@ class NamesIT {
ITUtilNameElement.assertValidate(nameElement, NameChoice.UPDATE, Boolean.FALSE);
// create
- ITUtilNameElement.assertCreate(nameElement);
+ createdNameElement = ITUtilNameElement.assertCreate(nameElement);
+ nameElement.setUuid(createdNameElement.getUuid());
ITUtilNameElement.assertValidate(nameElement, NameChoice.UPDATE, Boolean.TRUE);
@@ -588,13 +590,15 @@ class NamesIT {
try {
NameElementCommand nameElement = null;
+ NameElement createdNameElement = null;
nameElement = new NameElementCommand(
null, subsystem010PRL, deviceTypeRFA, "055",
"description", "comment");
// create
- ITUtilNameElement.assertCreate(nameElement);
+ createdNameElement = ITUtilNameElement.assertCreate(nameElement);
+ nameElement.setUuid(createdNameElement.getUuid());
// validate delete
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index 35e3770b71c30d135673285aea2060fa8d8505fb..95962f51825e3de9916f57b28c7029f8b4dc53ee 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -307,6 +307,7 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
@@ -320,7 +321,8 @@ class StructuresDeviceGroupIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.DEVICEGROUP, "Di", Boolean.TRUE);
@@ -365,6 +367,7 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
@@ -378,7 +381,8 @@ class StructuresDeviceGroupIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.DEVICEGROUP, "Di", Boolean.TRUE);
@@ -423,6 +427,7 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
@@ -436,7 +441,8 @@ class StructuresDeviceGroupIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.DEVICEGROUP, "Di", Boolean.TRUE);
@@ -502,6 +508,7 @@ class StructuresDeviceGroupIT {
"name", null,
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate update
@@ -575,13 +582,15 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update approve check");
@@ -624,13 +633,15 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update cancel check");
@@ -673,13 +684,15 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update reject check");
@@ -735,6 +748,7 @@ class StructuresDeviceGroupIT {
"name", null,
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate delete
@@ -808,13 +822,15 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete approve check");
@@ -857,13 +873,15 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update delete check");
@@ -906,13 +924,15 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete reject check");
@@ -959,9 +979,10 @@ class StructuresDeviceGroupIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", -1, 0);
@@ -989,7 +1010,7 @@ class StructuresDeviceGroupIT {
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", -1, 1);
@@ -1041,9 +1062,10 @@ class StructuresDeviceGroupIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", -1, 0);
@@ -1071,7 +1093,7 @@ class StructuresDeviceGroupIT {
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", -1, 0);
@@ -1123,9 +1145,10 @@ class StructuresDeviceGroupIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", -1, 0);
@@ -1153,7 +1176,7 @@ class StructuresDeviceGroupIT {
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", -1, 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index 91656fef6dce418f8f9da434f232f804f222e736..bb6cefb7f411d25fe84de4d081a3afa808b3041c 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -319,6 +319,7 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
@@ -332,7 +333,8 @@ class StructuresDeviceTypeIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
ITUtilStructureElement.assertExists (Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
@@ -369,6 +371,7 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
@@ -382,7 +385,8 @@ class StructuresDeviceTypeIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
@@ -427,6 +431,7 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
@@ -440,7 +445,8 @@ class StructuresDeviceTypeIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
@@ -506,6 +512,7 @@ class StructuresDeviceTypeIT {
"name", "Cu",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate update
@@ -579,13 +586,15 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
"name", "Ua",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update approve check");
@@ -628,13 +637,15 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
"name", "Uc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update cancel check");
@@ -677,13 +688,15 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
"name", "Ur",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update reject check");
@@ -739,6 +752,7 @@ class StructuresDeviceTypeIT {
"name", "Cd",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate delete
@@ -812,13 +826,15 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
"name", "Da",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete approve check");
@@ -861,13 +877,15 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
"name", "Dc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update delete check");
@@ -910,13 +928,15 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
"name", "Dr",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete reject check");
@@ -963,9 +983,10 @@ class StructuresDeviceTypeIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", -1, 0);
@@ -994,7 +1015,7 @@ class StructuresDeviceTypeIT {
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", -1, 1);
@@ -1047,9 +1068,10 @@ class StructuresDeviceTypeIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", -1, 0);
@@ -1078,7 +1100,7 @@ class StructuresDeviceTypeIT {
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", -1, 0);
@@ -1131,9 +1153,10 @@ class StructuresDeviceTypeIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", -1, 0);
@@ -1162,7 +1185,7 @@ class StructuresDeviceTypeIT {
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", -1, 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index 06b7e1b999a4766b8931ad9f888f9aa9156d5e63..6dcd7234ef0882b94b963beda014c262ba6753f8 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -275,6 +275,7 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
@@ -288,7 +289,8 @@ class StructuresDisciplineIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
ITUtilStructureElement.assertExists (Type.DISCIPLINE, "Ca", Boolean.FALSE);
ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.TRUE);
@@ -325,6 +327,7 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
@@ -338,7 +341,8 @@ class StructuresDisciplineIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.DISCIPLINE, "Cc", Boolean.FALSE);
@@ -383,6 +387,7 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
@@ -396,7 +401,8 @@ class StructuresDisciplineIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.DISCIPLINE, "Cr", Boolean.FALSE);
@@ -461,6 +467,7 @@ class StructuresDisciplineIT {
"name", "Cu",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate update
@@ -528,13 +535,15 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
"name", "Ua",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update approve check");
@@ -577,13 +586,15 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
"name", "Uc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update cancel check");
@@ -626,13 +637,15 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
"name", "Ur",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update reject check");
@@ -688,6 +701,7 @@ class StructuresDisciplineIT {
"name", "Cd",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate delete
@@ -755,13 +769,15 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
"name", "Da",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete approve check");
@@ -804,13 +820,15 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
"name", "Dc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update delete check");
@@ -853,13 +871,15 @@ class StructuresDisciplineIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.DISCIPLINE, null,
"name", "Dr",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete reject check");
@@ -906,9 +926,10 @@ class StructuresDisciplineIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", -1, 0);
@@ -932,7 +953,7 @@ class StructuresDisciplineIT {
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", -1, 1);
@@ -980,9 +1001,10 @@ class StructuresDisciplineIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", -1, 0);
@@ -1006,7 +1028,7 @@ class StructuresDisciplineIT {
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", -1, 0);
@@ -1054,9 +1076,10 @@ class StructuresDisciplineIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1);
+ length = ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", -1, 0);
@@ -1080,7 +1103,7 @@ class StructuresDisciplineIT {
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", -1, 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index d64bdfbe5270a48ad7a49fd9a5a617d699b70a8d..ce7eca70fba48fd54215a9f2f758939f8bad8112 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -321,6 +321,7 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
@@ -334,7 +335,8 @@ class StructuresSubsystemIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
ITUtilStructureElement.assertExists (Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
@@ -371,6 +373,7 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
@@ -384,7 +387,8 @@ class StructuresSubsystemIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
@@ -429,6 +433,7 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
@@ -442,7 +447,8 @@ class StructuresSubsystemIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
@@ -508,6 +514,7 @@ class StructuresSubsystemIT {
"name", "Cu",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate update
@@ -581,13 +588,15 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
"name", "Ua",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update approve check");
@@ -630,13 +639,15 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
"name", "Uc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update cancel check");
@@ -679,13 +690,15 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
"name", "Ur",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update reject check");
@@ -741,6 +754,7 @@ class StructuresSubsystemIT {
"name", "Cd",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate delete
@@ -814,13 +828,15 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
"name", "Da",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete approve check");
@@ -863,13 +879,15 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
"name", "Dc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update delete check");
@@ -912,13 +930,15 @@ class StructuresSubsystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
"name", "Dr",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete reject check");
@@ -965,9 +985,10 @@ class StructuresSubsystemIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", -1, 0);
@@ -1003,7 +1024,7 @@ class StructuresSubsystemIT {
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", -1, 1);
@@ -1063,9 +1084,10 @@ class StructuresSubsystemIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", -1, 0);
@@ -1101,7 +1123,7 @@ class StructuresSubsystemIT {
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", -1, 0);
@@ -1161,9 +1183,10 @@ class StructuresSubsystemIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", -1, 0);
@@ -1199,7 +1222,7 @@ class StructuresSubsystemIT {
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", -1, 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index 303c98419a392c2fd9d08c48e895bafe9ca06940..91ae62b2a163bd8a8f2e7ef21473dbfca74f7183 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -310,6 +310,7 @@ class StructuresSystemGroupIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
uuid = createdStructureElement.getUuid();
ITUtilStructureElement.assertExists (Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
@@ -367,6 +368,7 @@ class StructuresSystemGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
@@ -380,7 +382,8 @@ class StructuresSystemGroupIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
@@ -425,6 +428,7 @@ class StructuresSystemGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
@@ -438,7 +442,8 @@ class StructuresSystemGroupIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
@@ -503,6 +508,7 @@ class StructuresSystemGroupIT {
"name", "Cu",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate update
@@ -570,13 +576,15 @@ class StructuresSystemGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
"name", "Ua",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setDescription("description update approve check");
structureElement.setComment("comment update approve check");
@@ -620,13 +628,15 @@ class StructuresSystemGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
"name", "Uc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setDescription("description update cancel check");
structureElement.setComment("comment update cancel check");
@@ -670,13 +680,15 @@ class StructuresSystemGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
"name", "Ur",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setDescription("description update reject check");
structureElement.setComment("comment update reject check");
@@ -733,6 +745,7 @@ class StructuresSystemGroupIT {
"name", "Cd",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate delete
@@ -800,13 +813,15 @@ class StructuresSystemGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
"name", "Da",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete approve check");
@@ -849,13 +864,15 @@ class StructuresSystemGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
"name", "Dc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update delete check");
@@ -898,13 +915,15 @@ class StructuresSystemGroupIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
"name", "Dr",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete reject check");
@@ -951,9 +970,10 @@ class StructuresSystemGroupIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", -1, 0);
@@ -977,7 +997,7 @@ class StructuresSystemGroupIT {
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", -1, 1);
@@ -1025,9 +1045,10 @@ class StructuresSystemGroupIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", -1, 0);
@@ -1051,7 +1072,7 @@ class StructuresSystemGroupIT {
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", -1, 0);
@@ -1099,9 +1120,10 @@ class StructuresSystemGroupIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", -1, 0);
@@ -1125,7 +1147,7 @@ class StructuresSystemGroupIT {
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", -1, 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index 0d566b3737ad1939f0c9cd8ab427decad408abdc..ebb896be13022fb4cb0a4f5a9d304effd3f46332 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -304,6 +304,7 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
@@ -317,7 +318,8 @@ class StructuresSystemIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
ITUtilStructureElement.assertExists (Type.SYSTEM, "Ca", Boolean.FALSE);
ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.TRUE);
@@ -354,6 +356,7 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
@@ -367,7 +370,8 @@ class StructuresSystemIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.SYSTEM, "Cc", Boolean.FALSE);
@@ -412,6 +416,7 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement createdStructureElement = null;
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
@@ -425,7 +430,8 @@ class StructuresSystemIT {
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create
- ITUtilStructureElement.assertCreate(structureElement);
+ createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
UUID uuid = structureElement.getUuid();
ITUtilStructureElement.assertExists (Type.SYSTEM, "Cr", Boolean.FALSE);
@@ -491,6 +497,7 @@ class StructuresSystemIT {
"name", "Cu",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate update
@@ -564,13 +571,15 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
"name", "Ua",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update approve check");
@@ -613,13 +622,15 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
"name", "Uc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update cancel check");
@@ -662,13 +673,15 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
"name", "Ur",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update reject check");
@@ -724,6 +737,7 @@ class StructuresSystemIT {
"name", "Cd",
"description", "comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
uuid = approvedStructureElement.getUuid();
// validate delete
@@ -797,13 +811,15 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
"name", "Da",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete approve check");
@@ -846,13 +862,15 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
"name", "Dc",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment update delete check");
@@ -895,13 +913,15 @@ class StructuresSystemIT {
try {
StructureElementCommand structureElement = null;
+ StructureElement approvedStructureElement = null;
// create, approve
structureElement = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
"name", "Dr",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElement);
+ approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
+ structureElement.setUuid(approvedStructureElement.getUuid());
structureElement.setComment("comment delete reject check");
@@ -948,9 +968,10 @@ class StructuresSystemIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEM", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SYSTEM", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", -1, 0);
@@ -979,7 +1000,7 @@ class StructuresSystemIT {
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", -1, 1);
@@ -1032,9 +1053,10 @@ class StructuresSystemIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEM", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SYSTEM", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", -1, 0);
@@ -1063,7 +1085,7 @@ class StructuresSystemIT {
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", -1, 0);
@@ -1116,9 +1138,10 @@ class StructuresSystemIT {
// create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
+ structureElement.setUuid(createdStructureElement.getUuid());
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEM", -1, 1);
+ length = ITUtilStructureElement.assertRead("/SYSTEM", -1, 1).getListSize();
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", -1, 1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", -1, 0);
@@ -1147,7 +1170,7 @@ class StructuresSystemIT {
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", -1, 1));
+ assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", -1, 1).getListSize());
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", -1, 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", -1, 0);