Skip to content
Snippets Groups Projects
Commit 8cd59d41 authored by Lars Johansson's avatar Lars Johansson
Browse files

Change validation for structure to allow one pending entry 

Allow one pending entry for uuid, mnemonic, mnemonic equivalence.
Update validation to consider status together with mnemonic, mnemonic validation.
Multiple pending entries per uuid no longer allowed.

Update docker integration tests accordingly.
parent 741bcb7e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 328 additions and 98 deletions
src/main/java/org/openepics/names/util/ValidateUtil.java
+ 202
− 98
View file @ 8cd59d41
This diff is collapsed.
src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+ 21
− 0
View file @ 8cd59d41
...@@ -326,18 +326,21 @@ public class StructuresDeviceGroupIT { ...@@ -326,18 +326,21 @@ public class StructuresDeviceGroupIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
structureElement = approvedStructureElement; structureElement = approvedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -369,18 +372,21 @@ public class StructuresDeviceGroupIT { ...@@ -369,18 +372,21 @@ public class StructuresDeviceGroupIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -412,18 +418,21 @@ public class StructuresDeviceGroupIT { ...@@ -412,18 +418,21 @@ public class StructuresDeviceGroupIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -554,11 +563,13 @@ public class StructuresDeviceGroupIT { ...@@ -554,11 +563,13 @@ public class StructuresDeviceGroupIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -607,12 +618,14 @@ public class StructuresDeviceGroupIT { ...@@ -607,12 +618,14 @@ public class StructuresDeviceGroupIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -661,12 +674,14 @@ public class StructuresDeviceGroupIT { ...@@ -661,12 +674,14 @@ public class StructuresDeviceGroupIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -798,11 +813,13 @@ public class StructuresDeviceGroupIT { ...@@ -798,11 +813,13 @@ public class StructuresDeviceGroupIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -851,12 +868,14 @@ public class StructuresDeviceGroupIT { ...@@ -851,12 +868,14 @@ public class StructuresDeviceGroupIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -905,12 +924,14 @@ public class StructuresDeviceGroupIT { ...@@ -905,12 +924,14 @@ public class StructuresDeviceGroupIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
......
src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+ 21
− 0
View file @ 8cd59d41
...@@ -337,18 +337,21 @@ public class StructuresDeviceTypeIT { ...@@ -337,18 +337,21 @@ public class StructuresDeviceTypeIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
structureElement = approvedStructureElement; structureElement = approvedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -380,18 +383,21 @@ public class StructuresDeviceTypeIT { ...@@ -380,18 +383,21 @@ public class StructuresDeviceTypeIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -423,18 +429,21 @@ public class StructuresDeviceTypeIT { ...@@ -423,18 +429,21 @@ public class StructuresDeviceTypeIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -565,11 +574,13 @@ public class StructuresDeviceTypeIT { ...@@ -565,11 +574,13 @@ public class StructuresDeviceTypeIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -618,12 +629,14 @@ public class StructuresDeviceTypeIT { ...@@ -618,12 +629,14 @@ public class StructuresDeviceTypeIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -672,12 +685,14 @@ public class StructuresDeviceTypeIT { ...@@ -672,12 +685,14 @@ public class StructuresDeviceTypeIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -809,11 +824,13 @@ public class StructuresDeviceTypeIT { ...@@ -809,11 +824,13 @@ public class StructuresDeviceTypeIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -862,12 +879,14 @@ public class StructuresDeviceTypeIT { ...@@ -862,12 +879,14 @@ public class StructuresDeviceTypeIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -916,12 +935,14 @@ public class StructuresDeviceTypeIT { ...@@ -916,12 +935,14 @@ public class StructuresDeviceTypeIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
......
src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+ 21
− 0
View file @ 8cd59d41
...@@ -293,18 +293,21 @@ public class StructuresDisciplineIT { ...@@ -293,18 +293,21 @@ public class StructuresDisciplineIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
structureElement = approvedStructureElement; structureElement = approvedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -336,18 +339,21 @@ public class StructuresDisciplineIT { ...@@ -336,18 +339,21 @@ public class StructuresDisciplineIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -379,18 +385,21 @@ public class StructuresDisciplineIT { ...@@ -379,18 +385,21 @@ public class StructuresDisciplineIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -515,11 +524,13 @@ public class StructuresDisciplineIT { ...@@ -515,11 +524,13 @@ public class StructuresDisciplineIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -568,12 +579,14 @@ public class StructuresDisciplineIT { ...@@ -568,12 +579,14 @@ public class StructuresDisciplineIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -622,12 +635,14 @@ public class StructuresDisciplineIT { ...@@ -622,12 +635,14 @@ public class StructuresDisciplineIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -753,11 +768,13 @@ public class StructuresDisciplineIT { ...@@ -753,11 +768,13 @@ public class StructuresDisciplineIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -806,12 +823,14 @@ public class StructuresDisciplineIT { ...@@ -806,12 +823,14 @@ public class StructuresDisciplineIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -860,12 +879,14 @@ public class StructuresDisciplineIT { ...@@ -860,12 +879,14 @@ public class StructuresDisciplineIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
......
src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+ 21
− 0
View file @ 8cd59d41
...@@ -353,18 +353,21 @@ public class StructuresSubsystemIT { ...@@ -353,18 +353,21 @@ public class StructuresSubsystemIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
structureElement = approvedStructureElement; structureElement = approvedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -396,18 +399,21 @@ public class StructuresSubsystemIT { ...@@ -396,18 +399,21 @@ public class StructuresSubsystemIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -439,18 +445,21 @@ public class StructuresSubsystemIT { ...@@ -439,18 +445,21 @@ public class StructuresSubsystemIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -581,11 +590,13 @@ public class StructuresSubsystemIT { ...@@ -581,11 +590,13 @@ public class StructuresSubsystemIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -634,12 +645,14 @@ public class StructuresSubsystemIT { ...@@ -634,12 +645,14 @@ public class StructuresSubsystemIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -688,12 +701,14 @@ public class StructuresSubsystemIT { ...@@ -688,12 +701,14 @@ public class StructuresSubsystemIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -825,11 +840,13 @@ public class StructuresSubsystemIT { ...@@ -825,11 +840,13 @@ public class StructuresSubsystemIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -878,12 +895,14 @@ public class StructuresSubsystemIT { ...@@ -878,12 +895,14 @@ public class StructuresSubsystemIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -932,12 +951,14 @@ public class StructuresSubsystemIT { ...@@ -932,12 +951,14 @@ public class StructuresSubsystemIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
......
src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+ 21
− 0
View file @ 8cd59d41
...@@ -313,6 +313,7 @@ public class StructuresSystemGroupIT { ...@@ -313,6 +313,7 @@ public class StructuresSystemGroupIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create // create
...@@ -320,12 +321,14 @@ public class StructuresSystemGroupIT { ...@@ -320,12 +321,14 @@ public class StructuresSystemGroupIT {
structureElement = createdStructureElement; structureElement = createdStructureElement;
uuid = createdStructureElement.getUuid(); uuid = createdStructureElement.getUuid();
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
structureElement = approvedStructureElement; structureElement = approvedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create // create
...@@ -379,18 +382,21 @@ public class StructuresSystemGroupIT { ...@@ -379,18 +382,21 @@ public class StructuresSystemGroupIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -422,18 +428,21 @@ public class StructuresSystemGroupIT { ...@@ -422,18 +428,21 @@ public class StructuresSystemGroupIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -559,11 +568,13 @@ public class StructuresSystemGroupIT { ...@@ -559,11 +568,13 @@ public class StructuresSystemGroupIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -613,12 +624,14 @@ public class StructuresSystemGroupIT { ...@@ -613,12 +624,14 @@ public class StructuresSystemGroupIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -668,12 +681,14 @@ public class StructuresSystemGroupIT { ...@@ -668,12 +681,14 @@ public class StructuresSystemGroupIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -799,11 +814,13 @@ public class StructuresSystemGroupIT { ...@@ -799,11 +814,13 @@ public class StructuresSystemGroupIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -852,12 +869,14 @@ public class StructuresSystemGroupIT { ...@@ -852,12 +869,14 @@ public class StructuresSystemGroupIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -906,12 +925,14 @@ public class StructuresSystemGroupIT { ...@@ -906,12 +925,14 @@ public class StructuresSystemGroupIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
......
src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+ 21
− 0
View file @ 8cd59d41
...@@ -338,18 +338,21 @@ public class StructuresSystemIT { ...@@ -338,18 +338,21 @@ public class StructuresSystemIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
structureElement = approvedStructureElement; structureElement = approvedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -381,18 +384,21 @@ public class StructuresSystemIT { ...@@ -381,18 +384,21 @@ public class StructuresSystemIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -424,18 +430,21 @@ public class StructuresSystemIT { ...@@ -424,18 +430,21 @@ public class StructuresSystemIT {
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE, "description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment"); null, "test who", "comment");
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
// create // create
createdStructureElement = ITUtilStructureElement.assertCreate(structureElement); createdStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = createdStructureElement; structureElement = createdStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CREATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -566,11 +575,13 @@ public class StructuresSystemIT { ...@@ -566,11 +575,13 @@ public class StructuresSystemIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -619,12 +630,14 @@ public class StructuresSystemIT { ...@@ -619,12 +630,14 @@ public class StructuresSystemIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -673,12 +686,14 @@ public class StructuresSystemIT { ...@@ -673,12 +686,14 @@ public class StructuresSystemIT {
updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement); updatedStructureElement = ITUtilStructureElement.assertUpdate(structureElement);
structureElement = updatedStructureElement; structureElement = updatedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.UPDATE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -810,11 +825,13 @@ public class StructuresSystemIT { ...@@ -810,11 +825,13 @@ public class StructuresSystemIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.TRUE);
// approve // approve
approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement); approvedStructureElement = ITUtilStructureElement.assertApprove(structureElement);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.APPROVE, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -863,12 +880,14 @@ public class StructuresSystemIT { ...@@ -863,12 +880,14 @@ public class StructuresSystemIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.TRUE);
// cancel // cancel
cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement); cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElement);
structureElement = cancelledStructureElement; structureElement = cancelledStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.CANCEL, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
...@@ -917,12 +936,14 @@ public class StructuresSystemIT { ...@@ -917,12 +936,14 @@ public class StructuresSystemIT {
deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement); deletedStructureElement = ITUtilStructureElement.assertDelete(structureElement);
structureElement = deletedStructureElement; structureElement = deletedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.FALSE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.TRUE);
// reject // reject
rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement); rejectedStructureElement = ITUtilStructureElement.assertReject(structureElement);
structureElement = rejectedStructureElement; structureElement = rejectedStructureElement;
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.DELETE, Boolean.TRUE);
ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE); ITUtilStructureElement.assertValidate(structureElement, StructureChoice.REJECT, Boolean.FALSE);
} catch (Exception e) { } catch (Exception e) {
fail(); fail();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment