From 6d6ec05b333740946f4eaf55b15b50aedb1e93bc Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Fri, 16 Jun 2023 11:27:18 +0200
Subject: [PATCH] Adjust readability of integration tests
---
.../org/openepics/names/docker/NamesIT.java | 195 +++++++++---------
.../names/docker/StructuresDeviceGroupIT.java | 150 +++++++-------
.../names/docker/StructuresDeviceTypeIT.java | 160 +++++++-------
.../names/docker/StructuresDisciplineIT.java | 116 +++++------
.../names/docker/StructuresSubsystemIT.java | 180 ++++++++--------
.../names/docker/StructuresSystemGroupIT.java | 116 +++++------
.../names/docker/StructuresSystemIT.java | 174 ++++++++--------
7 files changed, 548 insertions(+), 543 deletions(-)
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index abfbd8e9..7abdac4b 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -231,13 +231,14 @@ class NamesIT {
ITUtilNameElement.assertIsLegacy("RFQ-N1U1", Boolean.FALSE);
ITUtilNameElement.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertRead("/legacy", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=RFQ%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%FS%", 0, 0);
+
+ ITUtilNameElement.assertRead("/legacy", 0);
+ ITUtilNameElement.assertRead("/legacy?name=RFQ%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%FS%", 0);
// create
createdNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
@@ -258,13 +259,14 @@ class NamesIT {
ITUtilNameElement.assertIsLegacy("RFQ-N1U1", Boolean.FALSE);
ITUtilNameElement.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertRead("/legacy", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=RFQ%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%FS%", 0, 0);
+
+ ITUtilNameElement.assertRead("/legacy", 0);
+ ITUtilNameElement.assertRead("/legacy?name=RFQ%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%FS%", 0);
// delete, approve
structureElementCommandConfirm = new StructureElementCommandConfirm(
@@ -282,13 +284,14 @@ class NamesIT {
ITUtilNameElement.assertIsLegacy("RFQ-N1U1", Boolean.FALSE);
ITUtilNameElement.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertRead("/legacy", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=RFQ%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%FS%", 0, 0);
+
+ ITUtilNameElement.assertRead("/legacy", 0);
+ ITUtilNameElement.assertRead("/legacy?name=RFQ%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%FS%", 0);
ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
@@ -306,13 +309,14 @@ class NamesIT {
ITUtilNameElement.assertIsLegacy("RFQ-N1U1", Boolean.TRUE);
ITUtilNameElement.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertRead("/legacy", 2, 2);
- ITUtilNameElement.assertRead("/legacy?name=RFQ%", 2, 2);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1", 1, 1);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 2, 2);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 1, 1);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 1, 1);
- ITUtilNameElement.assertRead("/legacy?name=%FS%", 0, 0);
+
+ ITUtilNameElement.assertRead("/legacy", 2);
+ ITUtilNameElement.assertRead("/legacy?name=RFQ%", 2);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1", 1);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 2);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 1);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 1);
+ ITUtilNameElement.assertRead("/legacy?name=%FS%", 0);
ITUtilNameElement.assertDelete(nameElementCommandConfirm);
@@ -326,13 +330,14 @@ class NamesIT {
ITUtilNameElement.assertIsLegacy("RFQ-N1U1", Boolean.TRUE);
ITUtilNameElement.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertRead("/legacy", 1, 1);
- ITUtilNameElement.assertRead("/legacy?name=RFQ%", 1, 1);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1", 1, 1);
- ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 1, 1);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0, 0);
- ITUtilNameElement.assertRead("/legacy?name=%FS%", 0, 0);
+
+ ITUtilNameElement.assertRead("/legacy", 1);
+ ITUtilNameElement.assertRead("/legacy?name=RFQ%", 1);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1", 1);
+ ITUtilNameElement.assertRead("/legacy?name=%N1U1%", 1);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNameElement.assertRead("/legacy?name=%FS%", 0);
} catch (Exception e) {
fail();
}
@@ -975,87 +980,87 @@ class NamesIT {
// combination
ITUtilNameElement.assertRead("", 8, -1);
- ITUtilNameElement.assertRead("?deleted=false", 6, -1);
- ITUtilNameElement.assertRead("?deleted=true", 2, -1);
+ ITUtilNameElement.assertRead("?deleted=false", 6, -1);
+ ITUtilNameElement.assertRead("?deleted=true", 2, -1);
ITUtilNameElement.assertRead("?uuid=" + deviceTypeFS.toString(), 0);
ITUtilNameElement.assertRead("?uuid=" + uuid.toString(), 1);
- ITUtilNameElement.assertRead("?name=RFQ-010:EMR-FS-005", 1);
- ITUtilNameElement.assertRead("?name=RFQ-010%", 8, -1);
- ITUtilNameElement.assertRead("?name=RFQ-10%", 0);
+ ITUtilNameElement.assertRead("?name=RFQ-010:EMR-FS-005", 1);
+ ITUtilNameElement.assertRead("?name=RFQ-010%", 8, -1);
+ ITUtilNameElement.assertRead("?name=RFQ-10%", 0);
- ITUtilNameElement.assertRead("?nameEquivalence=RFQ-10%", 8, -1);
+ ITUtilNameElement.assertRead("?nameEquivalence=RFQ-10%", 8, -1);
- ITUtilNameElement.assertRead("?systemStructure=RFQ-010", 6, -1);
- ITUtilNameElement.assertRead("?systemStructure=RFQ-0", 0);
- ITUtilNameElement.assertRead("?systemStructure=RFQ-0__", 6, -1);
- ITUtilNameElement.assertRead("?systemStructure=RFQ-N1U1", 0, -1);
+ ITUtilNameElement.assertRead("?systemStructure=RFQ-010", 6, -1);
+ ITUtilNameElement.assertRead("?systemStructure=RFQ-0", 0);
+ ITUtilNameElement.assertRead("?systemStructure=RFQ-0__", 6, -1);
+ ITUtilNameElement.assertRead("?systemStructure=RFQ-N1U1", 0, -1);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS", 6, -1);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-F", 0);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-F_", 6, -1);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-TT", 0);
+ ITUtilNameElement.assertRead("?deviceStructure=EMR-FS", 8);
+ ITUtilNameElement.assertRead("?deviceStructure=EMR-F", 0);
+ ITUtilNameElement.assertRead("?deviceStructure=EMR-F_", 8);
+ ITUtilNameElement.assertRead("?deviceStructure=EMR-TT", 0);
ITUtilNameElement.assertRead("?index=003", 1);
- ITUtilNameElement.assertRead("?description=description", 7, -1);
- ITUtilNameElement.assertRead("?description=%description%", 8, -1);
- ITUtilNameElement.assertRead("?description=updated description", 0, -1);
- ITUtilNameElement.assertRead("?description=updated description%", 1, -1);
- ITUtilNameElement.assertRead("?description=updated description again", 1);
-
- ITUtilNameElement.assertRead("?who=test who", 8, -1);
- ITUtilNameElement.assertRead("?who=test", 0);
- ITUtilNameElement.assertRead("?who=who", 0);
- ITUtilNameElement.assertRead("?who=test%", 8, -1);
- ITUtilNameElement.assertRead("?who=%who", 8, -1);
- ITUtilNameElement.assertRead("?who=%est%", 8, -1);
- ITUtilNameElement.assertRead("?who=%wh%", 8, -1);
- ITUtilNameElement.assertRead("?who=wh%", 0);
- ITUtilNameElement.assertRead("?who=asdf", 0);
- ITUtilNameElement.assertRead("?who=%asdf%", 0);
-
- ITUtilNameElement.assertRead("?nameEquivalence=RFQ-10%&deviceStructure=EMR-FS", 6, -1);
+ ITUtilNameElement.assertRead("?description=description", 7, -1);
+ ITUtilNameElement.assertRead("?description=%description%", 8, -1);
+ ITUtilNameElement.assertRead("?description=updated description", 0, -1);
+ ITUtilNameElement.assertRead("?description=updated description%", 1, -1);
+ ITUtilNameElement.assertRead("?description=updated description again", 1);
+
+ ITUtilNameElement.assertRead("?who=test who", 8, -1);
+ ITUtilNameElement.assertRead("?who=test", 0);
+ ITUtilNameElement.assertRead("?who=who", 0);
+ ITUtilNameElement.assertRead("?who=test%", 8, -1);
+ ITUtilNameElement.assertRead("?who=%who", 8, -1);
+ ITUtilNameElement.assertRead("?who=%est%", 8, -1);
+ ITUtilNameElement.assertRead("?who=%wh%", 8, -1);
+ ITUtilNameElement.assertRead("?who=wh%", 0);
+ ITUtilNameElement.assertRead("?who=asdf", 0);
+ ITUtilNameElement.assertRead("?who=%asdf%", 0);
+
+ ITUtilNameElement.assertRead("?nameEquivalence=RFQ-10%&deviceStructure=EMR-FS", 8);
// name or uuid
// /{name}
- ITUtilNameElement.assertRead("/" + systemGroupAcc.toString(), 0);
- ITUtilNameElement.assertRead("/" + systemRFQ.toString(), 0);
- ITUtilNameElement.assertRead("/" + subsystem010.toString(), 0);
- ITUtilNameElement.assertRead("/" + disciplineEMR.toString(), 0);
- ITUtilNameElement.assertRead("/" + deviceGroupEMR.toString(), 0);
- ITUtilNameElement.assertRead("/" + deviceTypeFS.toString(), 0);
- ITUtilNameElement.assertRead("/" + uuid.toString(), 1);
- ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-001", 1);
- ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-0", 0);
- ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-0__", 6, -1);
- ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-0%", 6, -1);
+ ITUtilNameElement.assertRead("/" + systemGroupAcc.toString(), 0);
+ ITUtilNameElement.assertRead("/" + systemRFQ.toString(), 0);
+ ITUtilNameElement.assertRead("/" + subsystem010.toString(), 0);
+ ITUtilNameElement.assertRead("/" + disciplineEMR.toString(), 0);
+ ITUtilNameElement.assertRead("/" + deviceGroupEMR.toString(), 0);
+ ITUtilNameElement.assertRead("/" + deviceTypeFS.toString(), 0);
+ ITUtilNameElement.assertRead("/" + uuid.toString(), 1);
+ ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-001", 1);
+ ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-0", 0);
+ ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-0__", 6);
+ ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-0%", 6);
// system structure mnemonic path
// /systemStructure/{mnemonicPath}
- ITUtilNameElement.assertRead("/systemStructure/RFQ-010", 6, -1);
- ITUtilNameElement.assertRead("/systemStructure/RFQ-0", 0);
- ITUtilNameElement.assertRead("/systemStructure/RFQ-0__", 6, -1);
- ITUtilNameElement.assertRead("/systemStructure/RFQ-N1U1", 0, -1);
+ ITUtilNameElement.assertRead("/systemStructure/RFQ-010", 6, -1);
+ ITUtilNameElement.assertRead("/systemStructure/RFQ-0", 0);
+ ITUtilNameElement.assertRead("/systemStructure/RFQ-0__", 6, -1);
+ ITUtilNameElement.assertRead("/systemStructure/RFQ-N1U1", 0, -1);
// device structure mnemonic path
// /deviceStructure/{mnemonicPath}
- ITUtilNameElement.assertRead("/deviceStructure/EMR-FS", 6, -1);
- ITUtilNameElement.assertRead("/deviceStructure/EMR-F", 0);
- ITUtilNameElement.assertRead("/deviceStructure/EMR-F_", 6, -1);
- ITUtilNameElement.assertRead("/deviceStructure/EMR-TT", 0);
+ ITUtilNameElement.assertRead("/deviceStructure/EMR-FS", 6);
+ ITUtilNameElement.assertRead("/deviceStructure/EMR-F", 0);
+ ITUtilNameElement.assertRead("/deviceStructure/EMR-F_", 6);
+ ITUtilNameElement.assertRead("/deviceStructure/EMR-TT", 0);
// history
// /history/{uuid}
- ITUtilNameElement.assertRead("/history/" + systemGroupAcc.toString(), 0);
- ITUtilNameElement.assertRead("/history/" + systemRFQ.toString(), 0);
- ITUtilNameElement.assertRead("/history/" + subsystem010.toString(), 0);
- ITUtilNameElement.assertRead("/history/" + disciplineEMR.toString(), 0);
- ITUtilNameElement.assertRead("/history/" + deviceGroupEMR.toString(), 0);
- ITUtilNameElement.assertRead("/history/" + deviceTypeFS.toString(), 0);
- ITUtilNameElement.assertRead("/history/" + uuid.toString(), 3);
- ITUtilNameElement.assertRead("/history/" + uuid2.toString(), 1);
+ ITUtilNameElement.assertRead("/history/" + systemGroupAcc.toString(), 0);
+ ITUtilNameElement.assertRead("/history/" + systemRFQ.toString(), 0);
+ ITUtilNameElement.assertRead("/history/" + subsystem010.toString(), 0);
+ ITUtilNameElement.assertRead("/history/" + disciplineEMR.toString(), 0);
+ ITUtilNameElement.assertRead("/history/" + deviceGroupEMR.toString(), 0);
+ ITUtilNameElement.assertRead("/history/" + deviceTypeFS.toString(), 0);
+ ITUtilNameElement.assertRead("/history/" + uuid.toString(), 3);
+ ITUtilNameElement.assertRead("/history/" + uuid2.toString(), 1);
// /history?parameter=value
// parameter must be available
@@ -1064,7 +1069,7 @@ class NamesIT {
ITUtilNameElement.assertRead("/history?name=%010%", 14, -1);
ITUtilNameElement.assertRead("/history?nameEquivalence=RFQ-10%", 14, -1);
ITUtilNameElement.assertRead("/history?systemStructure=RFQ-0__", 13, -1);
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS", 12, -1);
+ ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS", 12);
ITUtilNameElement.assertRead("/history?index=003", 1, -1);
ITUtilNameElement.assertRead("/history?description=updated description%", 3, -1);
ITUtilNameElement.assertRead("/history?who=test%", 8, -1);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index 63381081..bcc37725 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -1097,10 +1097,10 @@ class StructuresDeviceGroupIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1125,10 +1125,10 @@ class StructuresDeviceGroupIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1181,10 +1181,10 @@ class StructuresDeviceGroupIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
@@ -1209,10 +1209,10 @@ class StructuresDeviceGroupIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
@@ -1265,10 +1265,10 @@ class StructuresDeviceGroupIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1293,10 +1293,10 @@ class StructuresDeviceGroupIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED", 1, -1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1925,35 +1925,35 @@ class StructuresDeviceGroupIT {
ITUtilStructureElement.assertRead("/DEVICEGROUP?parent=" + discipline2Uuid.toString(), 45, -1);
ITUtilStructureElement.assertRead("/DEVICEGROUP?parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na_", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na__", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na___", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?name=name", 45, -1);
-
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicEquivalence=A__", 0);
-
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonic=A__", 0);
-
- ITUtilStructureElement.assertRead("/DEVICEGROUP?description=desc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?description=desc%", 35, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?description=sc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?description=sc%", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?description=%sc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?description=%sc%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?description=description", 35, -1);
-
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=test who", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=test", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=who", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=test%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=%who", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=%est%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=%wh%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=wh%", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=asdf", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?who=%asdf%", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na_", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na__", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na___", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?name=na%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?name=name", 45, -1);
+
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicEquivalence=A__", 0);
+
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonic=A__", 0);
+
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?description=desc", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?description=desc%", 35, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?description=sc", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?description=sc%", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?description=%sc", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?description=%sc%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?description=description", 35, -1);
+
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=test who", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=test", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=who", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=test%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=%who", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=%est%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=%wh%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=wh%", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=asdf", 0);
+ ITUtilStructureElement.assertRead("/DEVICEGROUP?who=%asdf%", 0);
// children
// /children/{uuid}
@@ -1967,40 +1967,40 @@ class StructuresDeviceGroupIT {
// mnemonic
// /mnemonic/{mnemonic}
- ITUtilStructureElement.assertRead("/mnemonic/A", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A__", 0);
- ITUtilStructureElement.assertRead("/mnemonic/AG_", 0);
- ITUtilStructureElement.assertRead("/mnemonic/AG1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di2", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/A__", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/AG_", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/AG1", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/Di2", 1);
// mnemonic path
// /mnemonicPath/{mnemonicPath}
- ITUtilStructureElement.assertRead("/mnemonicPath/D", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/D%", 16, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/D__", 16, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di_", 16, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di2", 16);
+ ITUtilStructureElement.assertRead("/mnemonicPath/D", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/D%", 16, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/D__", 16, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Di_", 16, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Di2", 16);
// history
// /history/{uuid}
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + discipline2Uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + discipline2Uuid.toString(), 2);
// /history?parameter=value
// parameter must be available
ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&uuid=" + uuid.toString(), 2);
ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&uuid=" + uuid2.toString(), 8);
ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&uuid=" + discipline2Uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
- ITUtilStructureElement.assertRead("/history?uuid=" + disciplineUuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?parent=" + disciplineUuid.toString(), 32);
- ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
- ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 0);
- ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 0);
- ITUtilStructureElement.assertRead("/history?description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history?uuid=" + disciplineUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/history?parent=" + disciplineUuid.toString(), 32);
+ ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 0);
+ ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 0);
+ ITUtilStructureElement.assertRead("/history?description=%other%", 40);
+ ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&uuid=" + uuid2.toString() + "&description=more%", 8);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index a616491e..af080763 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -1093,10 +1093,10 @@ class StructuresDeviceTypeIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1122,10 +1122,10 @@ class StructuresDeviceTypeIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1179,10 +1179,10 @@ class StructuresDeviceTypeIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rshc", 1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshc", 0);
@@ -1208,10 +1208,10 @@ class StructuresDeviceTypeIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshc", 1);
@@ -1265,10 +1265,10 @@ class StructuresDeviceTypeIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rshr", 1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1294,10 +1294,10 @@ class StructuresDeviceTypeIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 1, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED", 1, -1);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1935,35 +1935,35 @@ class StructuresDeviceTypeIT {
ITUtilStructureElement.assertRead("/DEVICETYPE?parent=" + deviceGroupUuid.toString(), 45, -1);
ITUtilStructureElement.assertRead("/DEVICETYPE?parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?name=na", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?name=na_", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?name=na__", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?name=na___", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?name=na%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?name=name", 45, -1);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonicEquivalence=A__", 45, -1);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonicPath=A__", 0);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?description=desc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?description=desc%", 35, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?description=sc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?description=sc%", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?description=%sc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?description=%sc%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?description=description", 35, -1);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=test who", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=test", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=who", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=test%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=%who", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=%est%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=%wh%", 45, -1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=wh%", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=asdf", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?who=%asdf%", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?name=na", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?name=na_", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?name=na__", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?name=na___", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?name=na%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?name=name", 45, -1);
+
+ ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonicEquivalence=A__", 45, -1);
+
+ ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonicPath=A__", 0);
+
+ ITUtilStructureElement.assertRead("/DEVICETYPE?description=desc", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?description=desc%", 35, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?description=sc", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?description=sc%", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?description=%sc", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?description=%sc%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?description=description", 35, -1);
+
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=test who", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=test", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=who", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=test%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=%who", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=%est%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=%wh%", 45, -1);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=wh%", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=asdf", 0);
+ ITUtilStructureElement.assertRead("/DEVICETYPE?who=%asdf%", 0);
// children
// /children/{uuid}
@@ -1983,45 +1983,45 @@ class StructuresDeviceTypeIT {
// mnemonic
// /mnemonic/{mnemonic}
- ITUtilStructureElement.assertRead("/mnemonic/A", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
// mnemonic path
// /mnemonicPath/{mnemonicPath}
- ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/A__", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-A%", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A__", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Di-A%", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Di-A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Di-A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Di-AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Di-AG1", 1);
// history
// /history/{uuid}
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + deviceGroupUuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + disciplineUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + deviceGroupUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + disciplineUuid.toString(), 2);
// /history?parameter=value
// parameter must be available
ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&uuid=" + uuid.toString(), 2);
ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&uuid=" + uuid2.toString(), 8);
ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&uuid=" + deviceGroupUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
- ITUtilStructureElement.assertRead("/history?uuid=" + deviceGroupUuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?parent=" + deviceGroupUuid.toString(), 120, -1);
- ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
- ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history?uuid=" + deviceGroupUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/history?parent=" + deviceGroupUuid.toString(), 120, -1);
+ ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
+ ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
+ ITUtilStructureElement.assertRead("/history?description=%other%", 40);
+ ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&uuid=" + uuid2.toString() + "&description=more%", 8);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index 3195b270..f8e59f15 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -1028,10 +1028,10 @@ class StructuresDisciplineIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1052,10 +1052,10 @@ class StructuresDisciplineIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 1, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 1, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1104,10 +1104,10 @@ class StructuresDisciplineIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rshc", 1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshc", 0);
@@ -1128,10 +1128,10 @@ class StructuresDisciplineIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 1, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 1, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshc", 1);
@@ -1180,10 +1180,10 @@ class StructuresDisciplineIT {
// read (1)
length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rshr", 1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1204,10 +1204,10 @@ class StructuresDisciplineIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 1, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED", 1, -1);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1824,11 +1824,11 @@ class StructuresDisciplineIT {
ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuidRandom.toString(), 0);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 2);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuidRandom.toString(), 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?parent=" + uuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?parent=" + uuid.toString(), 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?name=na", 0);
ITUtilStructureElement.assertRead("/DISCIPLINE?name=na_", 0);
@@ -1849,16 +1849,16 @@ class StructuresDisciplineIT {
ITUtilStructureElement.assertRead("/DISCIPLINE?description=%sc%", 45, -1);
ITUtilStructureElement.assertRead("/DISCIPLINE?description=description", 35, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=test who", 45, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=test", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=who", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=test%", 45, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=%who", 45, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=%est%", 45, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=%wh%", 45, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=wh%", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=asdf", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?who=%asdf%", 0);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=test who", 45, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=test", 0);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=who", 0);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=test%", 45, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=%who", 45, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=%est%", 45, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=%wh%", 45, -1);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=wh%", 0);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=asdf", 0);
+ ITUtilStructureElement.assertRead("/DISCIPLINE?who=%asdf%", 0);
// children
// /children/{uuid}
@@ -1868,38 +1868,38 @@ class StructuresDisciplineIT {
// mnemonic
// /mnemonic/{mnemonic}
- ITUtilStructureElement.assertRead("/mnemonic/A", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
// mnemonic path
// /mnemonicPath/{mnemonicPath}
- ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 1);
// history
// /history/{uuid}
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 8);
- ITUtilStructureElement.assertRead("/history/" + uuidRandom.toString(), 0);
+ ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history/" + uuidRandom.toString(), 0);
// /history?parameter=value
// parameter must be available
ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&uuid=" + uuid.toString(), 2);
ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&uuid=" + uuid2.toString(), 8);
ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&uuid=" + uuidRandom.toString(), 0);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuidRandom.toString(), 0);
- ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
- ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuidRandom.toString(), 0);
+ ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
+ ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
+ ITUtilStructureElement.assertRead("/history?description=%other%", 40);
+ ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&uuid=" + uuid2.toString() + "&description=more%", 8);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index 2071c746..f4a960fe 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -1091,10 +1091,10 @@ class StructuresSubsystemIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1127,10 +1127,10 @@ class StructuresSubsystemIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 1, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 1, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1191,10 +1191,10 @@ class StructuresSubsystemIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rshc", 1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshc", 0);
@@ -1227,10 +1227,10 @@ class StructuresSubsystemIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 1, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 1, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshc", 1);
@@ -1291,10 +1291,10 @@ class StructuresSubsystemIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rshr", 1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1327,10 +1327,10 @@ class StructuresSubsystemIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 1, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED", 1, -1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1983,35 +1983,35 @@ class StructuresSubsystemIT {
ITUtilStructureElement.assertRead("/SUBSYSTEM?parent=" + systemUuid.toString(), 45, -1);
ITUtilStructureElement.assertRead("/SUBSYSTEM?parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na_", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na__", 45, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na___", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na%", 45, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?name=name", 45, -1);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonicEquivalence=A__", 45, -1);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonicPath=A__", 0);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?description=desc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?description=desc%", 35, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?description=sc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?description=sc%", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?description=%sc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?description=%sc%", 45, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?description=description", 35, -1);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=test who", 45, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=test", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=who", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=test%", 45, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=%who", 45, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=%est%", 45, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=%wh%", 45, -1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=wh%", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=asdf", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?who=%asdf%", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na_", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na__", 45, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na___", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?name=na%", 45, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?name=name", 45, -1);
+
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonicEquivalence=A__", 45, -1);
+
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonicPath=A__", 0);
+
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?description=desc", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?description=desc%", 35, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?description=sc", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?description=sc%", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?description=%sc", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?description=%sc%", 45, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?description=description", 35, -1);
+
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=test who", 45, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=test", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=who", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=test%", 45, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=%who", 45, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=%est%", 45, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=%wh%", 45, -1);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=wh%", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=asdf", 0);
+ ITUtilStructureElement.assertRead("/SUBSYSTEM?who=%asdf%", 0);
// children
// /children/{uuid}
@@ -2031,55 +2031,55 @@ class StructuresSubsystemIT {
// mnemonic
// /mnemonic/{mnemonic}
- ITUtilStructureElement.assertRead("/mnemonic/A", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
// mnemonic path
// /mnemonicPath/{mnemonicPath}
- ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/A__", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-A%", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-AG1", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A%", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A__", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-AG_", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-AG1", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys%", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys__", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys_", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A__", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sys-A%", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sys-A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sys-A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sys-AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sys-AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A%", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A__", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-AG_", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-AG1", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys%", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys__", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys_", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
// history
// /history/{uuid}
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + systemUuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + systemGroupUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + systemUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + systemGroupUuid.toString(), 2);
// /history?parameter=value
// parameter must be available
ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&uuid=" + uuid.toString(), 2);
ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&uuid=" + uuid2.toString(), 8);
ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&uuid=" + systemUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
- ITUtilStructureElement.assertRead("/history?uuid=" + systemUuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?parent=" + systemUuid.toString(), 142);
- ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
- ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history?uuid=" + systemUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/history?parent=" + systemUuid.toString(), 142);
+ ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
+ ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
+ ITUtilStructureElement.assertRead("/history?description=%other%", 40);
+ ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&uuid=" + uuid2.toString() + "&description=more%", 8);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index 1ffb9382..2e22be01 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -1090,10 +1090,10 @@ class StructuresSystemGroupIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1114,10 +1114,10 @@ class StructuresSystemGroupIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1166,10 +1166,10 @@ class StructuresSystemGroupIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rshc", 1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
@@ -1190,10 +1190,10 @@ class StructuresSystemGroupIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshc", 1);
@@ -1242,10 +1242,10 @@ class StructuresSystemGroupIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rshr", 1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1266,10 +1266,10 @@ class StructuresSystemGroupIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED", 1, -1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1886,11 +1886,11 @@ class StructuresSystemGroupIT {
ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuidRandom.toString(), 0);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 2);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuidRandom.toString(), 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?parent=" + uuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?parent=" + uuid.toString(), 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?name=na", 0);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?name=na_", 0);
@@ -1911,16 +1911,16 @@ class StructuresSystemGroupIT {
ITUtilStructureElement.assertRead("/SYSTEMGROUP?description=%sc%", 45, -1);
ITUtilStructureElement.assertRead("/SYSTEMGROUP?description=description", 35, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=test who", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=test", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=who", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=test%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=%who", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=%est%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=%wh%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=wh%", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=asdf", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=%asdf%", 0);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=test who", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=test", 0);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=who", 0);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=test%", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=%who", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=%est%", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=%wh%", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=wh%", 0);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=asdf", 0);
+ ITUtilStructureElement.assertRead("/SYSTEMGROUP?who=%asdf%", 0);
// children
// /children/{uuid}
@@ -1930,38 +1930,38 @@ class StructuresSystemGroupIT {
// mnemonic
// /mnemonic/{mnemonic}
- ITUtilStructureElement.assertRead("/mnemonic/A", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
// mnemonic path
// /mnemonicPath/{mnemonicPath}
- ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 1);
// history
// /history/{uuid}
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 8);
- ITUtilStructureElement.assertRead("/history/" + uuidRandom.toString(), 0);
+ ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history/" + uuidRandom.toString(), 0);
// /history?parameter=value
// parameter must be available
ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&uuid=" + uuid.toString(), 2);
ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&uuid=" + uuid2.toString(), 8);
ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&uuid=" + uuidRandom.toString(), 0);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuidRandom.toString(), 0);
- ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
- ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuidRandom.toString(), 0);
+ ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
+ ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
+ ITUtilStructureElement.assertRead("/history?description=%other%", 40);
+ ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&uuid=" + uuid2.toString() + "&description=more%", 8);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index 8e36cd61..b06c4d08 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -1074,10 +1074,10 @@ class StructuresSystemIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1103,10 +1103,10 @@ class StructuresSystemIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rsha", 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
@@ -1160,10 +1160,10 @@ class StructuresSystemIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rshc", 1, -1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshc", 0);
@@ -1189,10 +1189,10 @@ class StructuresSystemIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshc", 1);
@@ -1246,10 +1246,10 @@ class StructuresSystemIT {
// read (1)
length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rshr", 1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1275,10 +1275,10 @@ class StructuresSystemIT {
// read (2)
assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize());
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 1, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED", 1, -1);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
@@ -1907,42 +1907,42 @@ class StructuresSystemIT {
ITUtilStructureElement.assertRead("/SYSTEM?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
ITUtilStructureElement.assertRead("/SYSTEM?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + systemGroupUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 2);
-
- ITUtilStructureElement.assertRead("/SYSTEM?parent=" + systemGroupUuid.toString(), 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?parent=" + uuid.toString(), 0);
-
- ITUtilStructureElement.assertRead("/SYSTEM?name=na", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?name=na_", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?name=na__", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?name=na___", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?name=na%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?name=name", 45, -1);
-
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonicEquivalence=A__", 45, -1);
-
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonicPath=A__", 30);
-
- ITUtilStructureElement.assertRead("/SYSTEM?description=desc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?description=desc%", 35, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?description=sc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?description=sc%", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?description=%sc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?description=%sc%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?description=description", 35, -1);
-
- ITUtilStructureElement.assertRead("/SYSTEM?who=test who", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?who=test", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?who=who", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?who=test%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?who=%who", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?who=%est%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?who=%wh%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?who=wh%", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?who=asdf", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?who=%asdf%", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + systemGroupUuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid.toString(), 1);
+ ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 2);
+
+ ITUtilStructureElement.assertRead("/SYSTEM?parent=" + systemGroupUuid.toString(), 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?parent=" + uuid.toString(), 0);
+
+ ITUtilStructureElement.assertRead("/SYSTEM?name=na", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?name=na_", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?name=na__", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?name=na___", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?name=na%", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?name=name", 45, -1);
+
+ ITUtilStructureElement.assertRead("/SYSTEM?mnemonicEquivalence=A__", 45, -1);
+
+ ITUtilStructureElement.assertRead("/SYSTEM?mnemonicPath=A__", 30);
+
+ ITUtilStructureElement.assertRead("/SYSTEM?description=desc", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?description=desc%", 35, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?description=sc", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?description=sc%", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?description=%sc", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?description=%sc%", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?description=description", 35, -1);
+
+ ITUtilStructureElement.assertRead("/SYSTEM?who=test who", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=test", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=who", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=test%", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=%who", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=%est%", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=%wh%", 45, -1);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=wh%", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=asdf", 0);
+ ITUtilStructureElement.assertRead("/SYSTEM?who=%asdf%", 0);
// children
// /children/{uuid}
@@ -1956,44 +1956,44 @@ class StructuresSystemIT {
// mnemonic
// /mnemonic/{mnemonic}
- ITUtilStructureElement.assertRead("/mnemonic/A", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
// mnemonic path
// /mnemonicPath/{mnemonicPath}
- ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A%", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A__", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-AG_", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-AG1", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/A__", 15, -1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG_", 5);
+ ITUtilStructureElement.assertRead("/mnemonicPath/AG1", 1);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A%", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-A__", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-AG_", 0);
+ ITUtilStructureElement.assertRead("/mnemonicPath/Sg-AG1", 0);
// history
// /history/{uuid}
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + systemGroupUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history/" + systemGroupUuid.toString(), 2);
// /history?parameter=value
// parameter must be available
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&uuid=" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history?type=SYSTEM&uuid=" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?type=SYSTEM&uuid=" + uuid2.toString(), 8);
ITUtilStructureElement.assertRead("/history?type=SYSTEM&uuid=" + systemGroupUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
- ITUtilStructureElement.assertRead("/history?uuid=" + systemGroupUuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?uuid=" + uuid2.toString(), 8);
+ ITUtilStructureElement.assertRead("/history?uuid=" + systemGroupUuid.toString(), 2);
+ ITUtilStructureElement.assertRead("/history?parent=" + uuid.toString(), 0);
ITUtilStructureElement.assertRead("/history?parent=" + systemGroupUuid.toString(), 142);
- ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
- ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?name=na%", 120, -1);
+ ITUtilStructureElement.assertRead("/history?mnemonic=AF_", 20);
+ ITUtilStructureElement.assertRead("/history?mnemonicEquivalence=_A_", 10);
+ ITUtilStructureElement.assertRead("/history?description=%other%", 40);
+ ITUtilStructureElement.assertRead("/history?who=%wh%", 120, -1);
ITUtilStructureElement.assertRead("/history?type=SYSTEM&uuid=" + uuid2.toString() + "&description=more%", 8);
--
GitLab