diff --git a/src/main/java/org/openepics/names/util/NamingConventionUtil.java b/src/main/java/org/openepics/names/util/NamingConventionUtil.java
index 01d4e1a621b3fcaeeb386bbca215f1db63bca0d4..07e6e36341404733d4f93ff60068af94e90ccbb9 100644
--- a/src/main/java/org/openepics/names/util/NamingConventionUtil.java
+++ b/src/main/java/org/openepics/names/util/NamingConventionUtil.java
@@ -288,10 +288,23 @@ public class NamingConventionUtil {
public static String extractMnemonicPathSystemStructure(String conventionName) {
if (!StringUtils.isEmpty(conventionName)) {
int index = conventionName.indexOf(DELIMITER_EXTRA);
+ String mnemonicpath = null;
if (index != -1) {
- return conventionName.substring(0, index);
+ mnemonicpath = conventionName.substring(0, index);
} else {
- return conventionName;
+ mnemonicpath = conventionName;
+ }
+
+ // 0 or 1 DELIMITER_INTRA expected
+ index = mnemonicpath.indexOf(DELIMITER_INTRA);
+ if (index != -1) {
+ if (mnemonicpath.indexOf(DELIMITER_INTRA, index + 1) != -1) {
+ return null;
+ } else {
+ return mnemonicpath;
+ }
+ } else {
+ return mnemonicpath;
}
}
return null;
diff --git a/src/main/java/org/openepics/names/util/StructureElementUtil.java b/src/main/java/org/openepics/names/util/StructureElementUtil.java
index 1a40fbbfdf768813da779b0b16f28de52c6ad4eb..04197ebf2ce676eacc6ead30a2942302ecfdceef 100644
--- a/src/main/java/org/openepics/names/util/StructureElementUtil.java
+++ b/src/main/java/org/openepics/names/util/StructureElementUtil.java
@@ -22,7 +22,6 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
-import org.apache.commons.lang3.StringUtils;
import org.openepics.names.repository.model.DeviceGroup;
import org.openepics.names.repository.model.DeviceType;
import org.openepics.names.repository.model.Discipline;
@@ -277,12 +276,7 @@ public class StructureElementUtil {
return null;
}
-// String mnemonicpath = holderSystemDeviceStructure != null
-// ? systemGroup.getMnemonic()
-// : null;
- String mnemonicpath = !StringUtils.isEmpty(systemGroup.getMnemonic())
- ? systemGroup.getMnemonic()
- : null;
+ String mnemonicpath = StructureUtil.getMnemonicPath(systemGroup, holderSystemDeviceStructure);
return getStructureElement(
Type.SYSTEMGROUP,
@@ -304,12 +298,7 @@ public class StructureElementUtil {
return null;
}
-// String mnemonicpath = holderSystemDeviceStructure != null
-// ? systemGroup.getMnemonic()
-// : null;
- String mnemonicpath = !StringUtils.isEmpty(systemGroup.getMnemonic())
- ? systemGroup.getMnemonic()
- : null;
+ String mnemonicpath = StructureUtil.getMnemonicPath(systemGroup, holderSystemDeviceStructure);
return getStructureElement(
Type.SYSTEMGROUP,
@@ -420,12 +409,7 @@ public class StructureElementUtil {
return null;
}
-// String mnemonicpath = holderSystemDeviceStructure != null
-// ? discipline.getMnemonic()
-// : null;
- String mnemonicpath = !StringUtils.isEmpty(discipline.getMnemonic())
- ? discipline.getMnemonic()
- : null;
+ String mnemonicpath = StructureUtil.getMnemonicPath(discipline, holderSystemDeviceStructure);
return getStructureElement(
Type.DISCIPLINE,
@@ -447,12 +431,7 @@ public class StructureElementUtil {
return null;
}
-// String mnemonicpath = holderSystemDeviceStructure != null
-// ? discipline.getMnemonic()
-// : null;
- String mnemonicpath = !StringUtils.isEmpty(discipline.getMnemonic())
- ? discipline.getMnemonic()
- : null;
+ String mnemonicpath = StructureUtil.getMnemonicPath(discipline, holderSystemDeviceStructure);
return getStructureElement(
Type.DISCIPLINE,
diff --git a/src/main/java/org/openepics/names/util/StructureUtil.java b/src/main/java/org/openepics/names/util/StructureUtil.java
index 076900ba8d6e2943b2a93bea50e26d46b455e6ae..354d0e425a65eb55273062e551f17de82330ce89 100644
--- a/src/main/java/org/openepics/names/util/StructureUtil.java
+++ b/src/main/java/org/openepics/names/util/StructureUtil.java
@@ -45,6 +45,23 @@ public class StructureUtil {
throw new IllegalStateException("Utility class");
}
+ /**
+ * Return mnemonic path for system group.
+ *
+ * @param systemGroup system group
+ * @param holderSystemDeviceStructure holder of containers for system and device structure content
+ * @return mnemonic path
+ */
+ public static String getMnemonicPath(SystemGroup systemGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) {
+ if (systemGroup == null || holderSystemDeviceStructure == null) {
+ return null;
+ }
+
+ return !StringUtils.isEmpty(systemGroup.getMnemonic())
+ ? systemGroup.getMnemonic()
+ : null;
+ }
+
/**
* Return mnemonic path for system.
*
@@ -57,10 +74,7 @@ public class StructureUtil {
return null;
}
- SystemGroup systemGroup = holderSystemDeviceStructure.findSystemGroupByUuid(system.getParentUuid());
- return systemGroup != null && !StringUtils.isEmpty(systemGroup.getMnemonic())
- ? systemGroup.getMnemonic() + "-" + system.getMnemonic()
- : system.getMnemonic();
+ return system.getMnemonic();
}
/**
@@ -75,16 +89,25 @@ public class StructureUtil {
return null;
}
- System system = holderSystemDeviceStructure.findSystemByUuid(subsystem.getParentUuid());
- SystemGroup systemGroup = system != null
- ? holderSystemDeviceStructure.findSystemGroupByUuid(system.getParentUuid())
+ System system = holderSystemDeviceStructure.findSystemByUuid(subsystem.getParentUuid());
+ return system != null
+ ? system.getMnemonic() + "-" + subsystem.getMnemonic()
: null;
- return systemGroup != null && !StringUtils.isEmpty(systemGroup.getMnemonic()) && system != null
- ? systemGroup.getMnemonic() + "-" + system.getMnemonic() + "-" + subsystem.getMnemonic()
- : system != null
- ? system.getMnemonic() + "-" + subsystem.getMnemonic()
- : subsystem.getMnemonic();
+ }
+
+ /**
+ * Return mnemonic path for discipline.
+ *
+ * @param discipline discipline
+ * @param holderSystemDeviceStructure holder of containers for system and device structure content
+ * @return mnemonic path
+ */
+ public static String getMnemonicPath(Discipline discipline, HolderSystemDeviceStructure holderSystemDeviceStructure) {
+ if (discipline == null || holderSystemDeviceStructure == null) {
+ return null;
+ }
+ return discipline.getMnemonic();
}
/**
@@ -123,7 +146,7 @@ public class StructureUtil {
: null;
return discipline != null && deviceGroup != null
? discipline.getMnemonic() + "-" + deviceType.getMnemonic()
- : deviceType.getMnemonic();
+ : null;
}
// ---------------------------------------------------
diff --git a/src/main/java/org/openepics/names/util/ValidateUtil.java b/src/main/java/org/openepics/names/util/ValidateUtil.java
index c9e3b92d1848593f6484ada5020a1e46878d443a..46b3bc1dc4c822f9e66673d19af089058a75b593 100644
--- a/src/main/java/org/openepics/names/util/ValidateUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateUtil.java
@@ -442,19 +442,9 @@ public class ValidateUtil {
} else if (system != null) {
ValidateUtil.validateCondition(!system.isDeleted(), HttpStatus.BAD_REQUEST, ValidateUtil.SYSTEM + ValidateUtil.SPACE + ValidateUtil.IS_DELETED, nameElement.toString());
mnemonicPathSystemStructure = StructureUtil.getMnemonicPath(system, holder);
- String[] mnemonicpath = NamingConventionUtil.string2MnemonicPath(mnemonicPathSystemStructure);
- mnemonicPathSystemStructure = mnemonicpath != null && mnemonicpath.length == 2
- ? mnemonicpath[1]
- : null;
} else if (subsystem != null) {
ValidateUtil.validateCondition(!subsystem.isDeleted(), HttpStatus.BAD_REQUEST, ValidateUtil.SUBSYSTEM + ValidateUtil.SPACE + ValidateUtil.IS_DELETED, nameElement.toString());
mnemonicPathSystemStructure = StructureUtil.getMnemonicPath(subsystem, holder);
- String[] mnemonicpath = NamingConventionUtil.string2MnemonicPath(mnemonicPathSystemStructure);
- mnemonicPathSystemStructure = mnemonicpath != null && mnemonicpath.length == 3
- ? mnemonicpath[1] + "-" + mnemonicpath[2]
- : mnemonicpath != null && mnemonicpath.length == 2
- ? mnemonicpath[0] + "-" + mnemonicpath[1]
- : null;
} else {
throw ExceptionUtil.createServiceHttpStatusExceptionBadRequest("system structure uuid " + IS_NOT_CORRECT, nameElement.toString(), null);
}
@@ -516,6 +506,33 @@ public class ValidateUtil {
condition = names == null || names.isEmpty();
validateCondition(condition, HttpStatus.BAD_REQUEST, "convention name equivalence " + ValidateUtil.EXISTS, nameElement.toString());
}
+ } else if (NameChoice.DELETE.equals(nameChoice)) {
+ // find out parent
+ // system group, system, subsystem
+ // maximum one of the three expected to be non-null, other two expected to be null
+ // parent mnemonic path expected to match extracted system structure mnemonic path (extracted from name)
+ // parent may be deleted - legacy name
+
+ systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(nameElement.getParentsystemstructure().toString());
+ system = holderIRepositories.getSystemRepository().findLatestByUuid(nameElement.getParentsystemstructure().toString());
+ subsystem = holderIRepositories.getSubsystemRepository().findLatestByUuid(nameElement.getParentsystemstructure().toString());
+
+ if (systemGroup != null) {
+ mnemonicPathSystemStructure = systemGroup.getMnemonic();
+ } else if (system != null) {
+ mnemonicPathSystemStructure = StructureUtil.getMnemonicPath(system, holder);
+ } else if (subsystem != null) {
+ mnemonicPathSystemStructure = StructureUtil.getMnemonicPath(subsystem, holder);
+ } else {
+ throw ExceptionUtil.createServiceHttpStatusExceptionBadRequest("parent system structure uuid " + IS_NOT_CORRECT, nameElement.toString(), null);
+ }
+
+ // name
+ // system structure
+ if (!StringUtils.isEmpty(nameElement.getName())) {
+ condition = StringUtils.equals(mnemonicPathSystemStructure, NamingConventionUtil.extractMnemonicPathSystemStructure(nameElement.getName()));
+ validateCondition(condition, HttpStatus.BAD_REQUEST, "convention name " + ValidateUtil.IS_NOT_CORRECT, nameElement.toString());
+ }
}
}
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index 750539922e3d59ef98d1169a7129cfc8e1e8b262..7dfd957a03d86b4672497edb123e3b3fb2c13366 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -86,7 +86,7 @@ public class NamesIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupAcc,
- "Radio Frequency Quadrupole", "RFQ", "Acc-RFQ", 2,
+ "Radio Frequency Quadrupole", "RFQ", "RFQ", 2,
"empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "empty");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -94,7 +94,7 @@ public class NamesIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemRFQ,
- "01 Phase Reference Line", "010PRL", "Acc-RFQ-010PRL", 3,
+ "01 Phase Reference Line", "010PRL", "RFQ-010PRL", 3,
"empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "Approved by Daniel Piso");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -102,7 +102,7 @@ public class NamesIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemRFQ,
- "RFQ-010", "010", "Acc-RFQ-010", 3,
+ "RFQ-010", "010", "RFQ-010", 3,
"empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "Approved by Daniel Piso");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -110,7 +110,7 @@ public class NamesIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemRFQ,
- "Power switch board 01", "N1U1", "Acc-RFQ-N1U1", 3,
+ "Power switch board 01", "N1U1", "RFQ-N1U1", 3,
"Electrical power cabinets", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "Approved by Daniel Piso");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -536,14 +536,11 @@ public class NamesIT {
ITUtilNameElement.assertValidate(nameElement, NameChoice.DELETE, Boolean.FALSE);
nameElement.setParentsystemstructure(null);
- ITUtilNameElement.assertValidate(nameElement, NameChoice.DELETE, Boolean.TRUE);
+ ITUtilNameElement.assertValidate(nameElement, NameChoice.DELETE, Boolean.FALSE);
nameElement.setParentsystemstructure(systemRFQ);
ITUtilNameElement.assertValidate(nameElement, NameChoice.DELETE, Boolean.FALSE);
- nameElement.setParentsystemstructure(null);
- ITUtilNameElement.assertValidate(nameElement, NameChoice.DELETE, Boolean.TRUE);
-
nameElement.setParentsystemstructure(null);
ITUtilNameElement.assertValidate(nameElement, NameChoice.DELETE, Boolean.FALSE);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index 65f18b81b439e8c48c046ad978f2930fdd38900b..de7a9e40fec78363669b7a6eb193b78f2c6177ba 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -92,7 +92,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Sys", "Sg-Sys", 2,
+ "name", "Sys", "Sys", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -296,7 +296,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Ca", "Sg-Sys-Ca", 3,
+ "name", "Ca", "Sys-Ca", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -342,7 +342,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Cc", "Sg-Sys-Cc", 3,
+ "name", "Cc", "Sys-Cc", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -388,7 +388,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Cr", "Sg-Sys-Cr", 3,
+ "name", "Cr", "Sys-Cr", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -438,7 +438,7 @@ public class StructuresSubsystemIT {
// create, approve
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Cu", "Sg-Sys-Cu", 3,
+ "name", "Cu", "Sys-Cu", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -522,7 +522,7 @@ public class StructuresSubsystemIT {
// create, approve
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Ua", "Sg-Sys-Ua", 3,
+ "name", "Ua", "Sys-Ua", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -577,7 +577,7 @@ public class StructuresSubsystemIT {
// create, approve
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Uc", "Sg-Sys-Uc", 3,
+ "name", "Uc", "Sys-Uc", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -633,7 +633,7 @@ public class StructuresSubsystemIT {
// create, approve
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Ur", "Sg-Sys-Ur", 3,
+ "name", "Ur", "Sys-Ur", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -687,7 +687,7 @@ public class StructuresSubsystemIT {
// create, approve
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Cd", "Sg-Sys-Cd", 3,
+ "name", "Cd", "Sys-Cd", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -771,7 +771,7 @@ public class StructuresSubsystemIT {
// create, approve
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Da", "Sg-Sys-Da", 3,
+ "name", "Da", "Sys-Da", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -827,7 +827,7 @@ public class StructuresSubsystemIT {
// create, approve
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Dc", "Sg-Sys-Dc", 3,
+ "name", "Dc", "Sys-Dc", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -883,7 +883,7 @@ public class StructuresSubsystemIT {
// create, approve
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Dr", "Sg-Sys-Dr", 3,
+ "name", "Dr", "Sys-Dr", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -931,7 +931,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Rsha", "Sg-Sys-Rsha", 3,
+ "name", "Rsha", "Sys-Rsha", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -1005,7 +1005,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Rshc", "Sg-Sys-Rshc", 3,
+ "name", "Rshc", "Sys-Rshc", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -1079,7 +1079,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "Rshr", "Sg-Sys-Rshr", 3,
+ "name", "Rshr", "Sys-Rshr", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -1156,7 +1156,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AA1", "Sg-Sys-AA1", 3,
+ "name", "AA1", "Sys-AA1", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1164,133 +1164,133 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AA2", "Sg-Sys-AA2", 3,
+ "name", "AA2", "Sys-AA2", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AA3", "Sg-Sys-AA3", 3,
+ "name", "AA3", "Sys-AA3", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AA4", "Sg-Sys-AA4", 3,
+ "name", "AA4", "Sys-AA4", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AA5", "Sg-Sys-AA5", 3,
+ "name", "AA5", "Sys-AA5", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AB1", "Sg-Sys-AB1", 3,
+ "name", "AB1", "Sys-AB1", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AB2", "Sg-Sys-AB2", 3,
+ "name", "AB2", "Sys-AB2", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AB3", "Sg-Sys-AB3", 3,
+ "name", "AB3", "Sys-AB3", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AB4", "Sg-Sys-AB4", 3,
+ "name", "AB4", "Sys-AB4", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AB5", "Sg-Sys-AB5", 3,
+ "name", "AB5", "Sys-AB5", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AC1", "Sg-Sys-AC1", 3,
+ "name", "AC1", "Sys-AC1", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AC2", "Sg-Sys-AC2", 3,
+ "name", "AC2", "Sys-AC2", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AC3", "Sg-Sys-AC3", 3,
+ "name", "AC3", "Sys-AC3", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AC4", "Sg-Sys-AC4", 3,
+ "name", "AC4", "Sys-AC4", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AC5", "Sg-Sys-AC5", 3,
+ "name", "AC5", "Sys-AC5", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AD1", "Sg-Sys-AD1", 3,
+ "name", "AD1", "Sys-AD1", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AD2", "Sg-Sys-AD2", 3,
+ "name", "AD2", "Sys-AD2", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AD3", "Sg-Sys-AD3", 3,
+ "name", "AD3", "Sys-AD3", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AD4", "Sg-Sys-AD4", 3,
+ "name", "AD4", "Sys-AD4", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AD5", "Sg-Sys-AD5", 3,
+ "name", "AD5", "Sys-AD5", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
@@ -1302,7 +1302,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AE1", "Sg-Sys-AE1", 3,
+ "name", "AE1", "Sys-AE1", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1320,7 +1320,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AE2", "Sg-Sys-AE2", 3,
+ "name", "AE2", "Sys-AE2", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1338,7 +1338,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AE3", "Sg-Sys-AE3", 3,
+ "name", "AE3", "Sys-AE3", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1356,7 +1356,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AE4", "Sg-Sys-AE4", 3,
+ "name", "AE4", "Sys-AE4", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1374,7 +1374,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AE5", "Sg-Sys-AE5", 3,
+ "name", "AE5", "Sys-AE5", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1392,7 +1392,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AF1", "Sg-Sys-AF1", 3,
+ "name", "AF1", "Sys-AF1", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1402,7 +1402,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AF2", "Sg-Sys-AF2", 3,
+ "name", "AF2", "Sys-AF2", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1412,7 +1412,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AF3", "Sg-Sys-AF3", 3,
+ "name", "AF3", "Sys-AF3", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1422,7 +1422,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AF4", "Sg-Sys-AF4", 3,
+ "name", "AF4", "Sys-AF4", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1432,7 +1432,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AF5", "Sg-Sys-AF5", 3,
+ "name", "AF5", "Sys-AF5", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1442,7 +1442,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AG1", "Sg-Sys-AG1", 3,
+ "name", "AG1", "Sys-AG1", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1452,7 +1452,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AG2", "Sg-Sys-AG2", 3,
+ "name", "AG2", "Sys-AG2", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1462,7 +1462,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AG3", "Sg-Sys-AG3", 3,
+ "name", "AG3", "Sys-AG3", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1472,7 +1472,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AG4", "Sg-Sys-AG4", 3,
+ "name", "AG4", "Sys-AG4", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1482,7 +1482,7 @@ public class StructuresSubsystemIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemUuid,
- "name", "AG5", "Sg-Sys-AG5", 3,
+ "name", "AG5", "Sys-AG5", 3,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index 7d431e23fccc48d72846f5421746124288cc6e70..daeb89d261185d223ce75ad838c5d28a3a554329 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -284,7 +284,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Ca", "Sg-Ca", 2,
+ "name", "Ca", "Ca", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -330,7 +330,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Cc", "Sg-Cc", 2,
+ "name", "Cc", "Cc", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -376,7 +376,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Cr", "Sg-Cr", 2,
+ "name", "Cr", "Cr", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -426,7 +426,7 @@ public class StructuresSystemIT {
// create, approve
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Cu", "Sg-Cu", 2,
+ "name", "Cu", "Cu", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -510,7 +510,7 @@ public class StructuresSystemIT {
// create, approve
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Ua", "Sg-Ua", 2,
+ "name", "Ua", "Ua", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -565,7 +565,7 @@ public class StructuresSystemIT {
// create, approve
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Uc", "Sg-Uc", 2,
+ "name", "Uc", "Uc", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -621,7 +621,7 @@ public class StructuresSystemIT {
// create, approve
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Ur", "Sg-Ur", 2,
+ "name", "Ur", "Ur", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -675,7 +675,7 @@ public class StructuresSystemIT {
// create, approve
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Cd", "Sg-Cd", 2,
+ "name", "Cd", "Cd", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -759,7 +759,7 @@ public class StructuresSystemIT {
// create, approve
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Da", "Sg-Da", 2,
+ "name", "Da", "Da", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -815,7 +815,7 @@ public class StructuresSystemIT {
// create, approve
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Dc", "Sg-Dc", 2,
+ "name", "Dc", "Dc", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -871,7 +871,7 @@ public class StructuresSystemIT {
// create, approve
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Dr", "Sg-Dr", 2,
+ "name", "Dr", "Dr", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -919,7 +919,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Rsha", "Sg-Rsha", 2,
+ "name", "Rsha", "Rsha", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -993,7 +993,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Rshc", "Sg-Rshc", 2,
+ "name", "Rshc", "Rshc", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -1067,7 +1067,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "Rshr", "Sg-Rshr", 2,
+ "name", "Rshr", "Rshr", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "comment");
@@ -1144,7 +1144,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AA1", "Sg-AA1", 2,
+ "name", "AA1", "AA1", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1152,133 +1152,133 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AA2", "Sg-AA2", 2,
+ "name", "AA2", "AA2", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AA3", "Sg-AA3", 2,
+ "name", "AA3", "AA3", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AA4", "Sg-AA4", 2,
+ "name", "AA4", "AA4", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AA5", "Sg-AA5", 2,
+ "name", "AA5", "AA5", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AB1", "Sg-AB1", 2,
+ "name", "AB1", "AB1", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AB2", "Sg-AB2", 2,
+ "name", "AB2", "AB2", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AB3", "Sg-AB3", 2,
+ "name", "AB3", "AB3", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AB4", "Sg-AB4", 2,
+ "name", "AB4", "AB4", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AB5", "Sg-AB5", 2,
+ "name", "AB5", "AB5", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AC1", "Sg-AC1", 2,
+ "name", "AC1", "AC1", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AC2", "Sg-AC2", 2,
+ "name", "AC2", "AC2", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AC3", "Sg-AC3", 2,
+ "name", "AC3", "AC3", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AC4", "Sg-AC4", 2,
+ "name", "AC4", "AC4", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AC5", "Sg-AC5", 2,
+ "name", "AC5", "AC5", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AD1", "Sg-AD1", 2,
+ "name", "AD1", "AD1", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AD2", "Sg-AD2", 2,
+ "name", "AD2", "AD2", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AD3", "Sg-AD3", 2,
+ "name", "AD3", "AD3", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AD4", "Sg-AD4", 2,
+ "name", "AD4", "AD4", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AD5", "Sg-AD5", 2,
+ "name", "AD5", "AD5", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreate(structureElement);
@@ -1290,7 +1290,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AE1", "Sg-AE1", 2,
+ "name", "AE1", "AE1", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1308,7 +1308,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AE2", "Sg-AE2", 2,
+ "name", "AE2", "AE2", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1326,7 +1326,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AE3", "Sg-AE3", 2,
+ "name", "AE3", "AE3", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1344,7 +1344,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AE4", "Sg-AE4", 2,
+ "name", "AE4", "AE4", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1362,7 +1362,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AE5", "Sg-AE5", 2,
+ "name", "AE5", "AE5", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1380,7 +1380,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AF1", "Sg-AF1", 2,
+ "name", "AF1", "AF1", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1390,7 +1390,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AF2", "Sg-AF2", 2,
+ "name", "AF2", "AF2", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1400,7 +1400,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AF3", "Sg-AF3", 2,
+ "name", "AF3", "AF3", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1410,7 +1410,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AF4", "Sg-AF4", 2,
+ "name", "AF4", "AF4", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1420,7 +1420,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AF5", "Sg-AF5", 2,
+ "name", "AF5", "AF5", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1430,7 +1430,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AG1", "Sg-AG1", 2,
+ "name", "AG1", "AG1", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1440,7 +1440,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AG2", "Sg-AG2", 2,
+ "name", "AG2", "AG2", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1450,7 +1450,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AG3", "Sg-AG3", 2,
+ "name", "AG3", "AG3", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1460,7 +1460,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AG4", "Sg-AG4", 2,
+ "name", "AG4", "AG4", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -1470,7 +1470,7 @@ public class StructuresSystemIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupUuid,
- "name", "AG5", "Sg-AG5", 2,
+ "name", "AG5", "AG5", 2,
"description", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "test comment");
responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
index e298a2b9b7ad59f266a5cfd4ad6d00e13e7bdab6..8839b7fadeff9bac46247cb6a3970eb7eab1f660 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
@@ -146,7 +146,7 @@ public class NamesInstanceIndexIT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupAcc,
- "Radio Frequency Quadrupole", "RFQ", "Acc-RFQ", 2,
+ "Radio Frequency Quadrupole", "RFQ", "RFQ", 2,
"empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "empty");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -154,7 +154,7 @@ public class NamesInstanceIndexIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemRFQ,
- "01 Phase Reference Line", "010PRL", "Acc-RFQ-010PRL", 3,
+ "01 Phase Reference Line", "010PRL", "RFQ-010PRL", 3,
"empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "Approved by Daniel Piso");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -162,7 +162,7 @@ public class NamesInstanceIndexIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemRFQ,
- "RFQ-010", "010", "Acc-RFQ-010", 3,
+ "RFQ-010", "010", "RFQ-010", 3,
"empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "Approved by Daniel Piso");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -170,7 +170,7 @@ public class NamesInstanceIndexIT {
structureElement = new StructureElement(
Type.SUBSYSTEM, null, systemRFQ,
- "Power switch board 01", "N1U1", "Acc-RFQ-N1U1", 3,
+ "Power switch board 01", "N1U1", "RFQ-N1U1", 3,
"Electrical power cabinets", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "Approved by Daniel Piso");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
index 6a85029ef857c61e07361cc85b363a20481d2766..03ee09faad7fc4fc23f9c3a6a7ccab82e52bc7e9 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
@@ -50,7 +50,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
@Testcontainers
public class StructuresCreateLevel3IT {
// create in order to approve
- // all create first, all approve separately after all create
+ // all create first, all approve separately after all create
@Container
public static final DockerComposeContainer<?> ENVIRONMENT =
@@ -60,7 +60,7 @@ public class StructuresCreateLevel3IT {
private static UUID systemGroupAcc = null;
private static UUID systemRFQ = null;
private static UUID subsystem010PRL = null;
- private static UUID subsystem010 = null;
+ private static UUID subsystem010 = null;
private static UUID subsystemN1U1 = null;
private static UUID disciplineCryo = null;
@@ -138,7 +138,7 @@ public class StructuresCreateLevel3IT {
structureElement = new StructureElement(
Type.SYSTEM, null, systemGroupAcc,
- "Radio Frequency Quadrupole", "RFQ", "Acc-RFQ", 2,
+ "Radio Frequency Quadrupole", "RFQ", "RFQ", 2,
"empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
null, "test who", "empty");
approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElement);
@@ -282,7 +282,7 @@ public class StructuresCreateLevel3IT {
public void createSubsystem() {
// purpose
// test create and approve subsystem
- // all create, then all approve
+ // all create, then all approve
//
// what - combination of
// create create structures
@@ -292,7 +292,7 @@ public class StructuresCreateLevel3IT {
//
// note
// create in order to approve
- // all create first, all approve separately after all create
+ // all create first, all approve separately after all create
try {
StructureElement structureElement = null;
@@ -301,39 +301,39 @@ public class StructuresCreateLevel3IT {
StructureElement createdStructureElement_N1U1 = null;
StructureElement approvedStructureElement = null;
- structureElement = new StructureElement(
- Type.SUBSYSTEM, null, systemRFQ,
- "01 Phase Reference Line", "010PRL", "Acc-RFQ-010PRL", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "Approved by Daniel Piso");
- createdStructureElement_010PRL = ITUtilStructureElement.assertCreate(structureElement);
-
- structureElement = new StructureElement(
- Type.SUBSYSTEM, null, systemRFQ,
- "RFQ-010", "010", "Acc-RFQ-010", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "Approved by Daniel Piso");
- createdStructureElement_010 = ITUtilStructureElement.assertCreate(structureElement);
-
- structureElement = new StructureElement(
- Type.SUBSYSTEM, null, systemRFQ,
- "Power switch board 01", "N1U1", "Acc-RFQ-N1U1", 3,
- "Electrical power cabinets", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "Approved by Daniel Piso");
- createdStructureElement_N1U1 = ITUtilStructureElement.assertCreate(structureElement);
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_010PRL);
- subsystem010PRL = approvedStructureElement.getUuid();
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_010);
- subsystem010 = approvedStructureElement.getUuid();
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_N1U1);
- subsystemN1U1 = approvedStructureElement.getUuid();
-
- assertNotNull(subsystem010PRL);
- assertNotNull(subsystem010);
- assertNotNull(subsystemN1U1);
+ structureElement = new StructureElement(
+ Type.SUBSYSTEM, null, systemRFQ,
+ "01 Phase Reference Line", "010PRL", "RFQ-010PRL", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "Approved by Daniel Piso");
+ createdStructureElement_010PRL = ITUtilStructureElement.assertCreate(structureElement);
+
+ structureElement = new StructureElement(
+ Type.SUBSYSTEM, null, systemRFQ,
+ "RFQ-010", "010", "RFQ-010", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "Approved by Daniel Piso");
+ createdStructureElement_010 = ITUtilStructureElement.assertCreate(structureElement);
+
+ structureElement = new StructureElement(
+ Type.SUBSYSTEM, null, systemRFQ,
+ "Power switch board 01", "N1U1", "RFQ-N1U1", 3,
+ "Electrical power cabinets", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "Approved by Daniel Piso");
+ createdStructureElement_N1U1 = ITUtilStructureElement.assertCreate(structureElement);
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_010PRL);
+ subsystem010PRL = approvedStructureElement.getUuid();
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_010);
+ subsystem010 = approvedStructureElement.getUuid();
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_N1U1);
+ subsystemN1U1 = approvedStructureElement.getUuid();
+
+ assertNotNull(subsystem010PRL);
+ assertNotNull(subsystem010);
+ assertNotNull(subsystemN1U1);
} catch (Exception e) {
fail();
}
@@ -343,7 +343,7 @@ public class StructuresCreateLevel3IT {
public void createDeviceType() {
// purpose
// test create and approve device type
- // all create, then all approve
+ // all create, then all approve
//
// what - combination of
// create create structures
@@ -353,7 +353,7 @@ public class StructuresCreateLevel3IT {
//
// note
// create in order to approve
- // all create first, all approve separately after all create
+ // all create first, all approve separately after all create
try {
StructureElement structureElement = null;
@@ -403,356 +403,356 @@ public class StructuresCreateLevel3IT {
// ----------------------------------------------------------------------------------------------------
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupCryo,
- "Flow Switch", "FS", "Cryo-FS", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupCryo,
+ "Flow Switch", "FS", "Cryo-FS", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Cryo_FS = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupCryo,
- "Input Output Controller", "IOC", "Cryo-IOC", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupCryo,
+ "Input Output Controller", "IOC", "Cryo-IOC", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Cryo_IOC = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupCryo,
- "RF Antenna", "RFA", "Cryo-RFA", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupCryo,
+ "RF Antenna", "RFA", "Cryo-RFA", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Cryo_RFA = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupCryo,
- "Temperature Transmitter", "TT", "Cryo-TT", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupCryo,
+ "Temperature Transmitter", "TT", "Cryo-TT", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Cryo_TT = ITUtilStructureElement.assertCreate(structureElement);
// ----------------------------------------------------------------------------------------------------
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupEMR,
- "Input Output Controller", "IOC", "EMR-IOC", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupEMR,
+ "Input Output Controller", "IOC", "EMR-IOC", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_EMR_FS = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupEMR,
- "Flow Switch", "FS", "EMR-FS", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupEMR,
+ "Flow Switch", "FS", "EMR-FS", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_EMR_IOC = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupEMR,
- "RF Antenna", "RFA", "EMR-RFA", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupEMR,
+ "RF Antenna", "RFA", "EMR-RFA", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_EMR_RFA = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupEMR,
- "Temperature Transmitter", "TT", "EMR-TT", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupEMR,
+ "Temperature Transmitter", "TT", "EMR-TT", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_EMR_TT = ITUtilStructureElement.assertCreate(structureElement);
// ----------------------------------------------------------------------------------------------------
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupHVAC,
- "Flow Switch", "FS", "HVAC-FS", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupHVAC,
+ "Flow Switch", "FS", "HVAC-FS", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_HVAC_FS = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupHVAC,
- "Input Output Controller", "IOC", "HVAC-IOC", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupHVAC,
+ "Input Output Controller", "IOC", "HVAC-IOC", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_HVAC_IOC = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupHVAC,
- "RF Antenna", "RFA", "HVAC-RFA", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupHVAC,
+ "RF Antenna", "RFA", "HVAC-RFA", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_HVAC_RFA = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupHVAC,
- "Temperature Transmitter", "TT", "HVAC-TT", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupHVAC,
+ "Temperature Transmitter", "TT", "HVAC-TT", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_HVAC_TT = ITUtilStructureElement.assertCreate(structureElement);
// ----------------------------------------------------------------------------------------------------
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupProc,
- "Flow Switch", "FS", "Proc-FS", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupProc,
+ "Flow Switch", "FS", "Proc-FS", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Proc_FS = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupProc,
- "Input Output Controller", "IOC", "Proc-IOC", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupProc,
+ "Input Output Controller", "IOC", "Proc-IOC", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Proc_IOC = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupProc,
- "RF Antenna", "RFA", "Proc-RFA", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupProc,
+ "RF Antenna", "RFA", "Proc-RFA", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Proc_RFA = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupProc,
- "Temperature Transmitter", "TT", "Proc-TT", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupProc,
+ "Temperature Transmitter", "TT", "Proc-TT", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Proc_TT = ITUtilStructureElement.assertCreate(structureElement);
// ----------------------------------------------------------------------------------------------------
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupSC,
- "Flow Switch", "FS", "SC-FS", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupSC,
+ "Flow Switch", "FS", "SC-FS", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_SC_FS = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupSC,
- "Input Output Controller", "IOC", "SC-IOC", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupSC,
+ "Input Output Controller", "IOC", "SC-IOC", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_SC_IOC = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupSC,
- "RF Antenna", "RFA", "SC-RFA", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupSC,
+ "RF Antenna", "RFA", "SC-RFA", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_SC_RFA = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupSC,
- "Temperature Transmitter", "TT", "SC-TT", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupSC,
+ "Temperature Transmitter", "TT", "SC-TT", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_SC_TT = ITUtilStructureElement.assertCreate(structureElement);
// ----------------------------------------------------------------------------------------------------
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupVac,
- "Flow Switch", "FS", "Vac-FS", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupVac,
+ "Flow Switch", "FS", "Vac-FS", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Vac_FS = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupVac,
- "Input Output Controller", "IOC", "Vac-IOC", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupVac,
+ "Input Output Controller", "IOC", "Vac-IOC", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Vac_IOC = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupVac,
- "RF Antenna", "RFA", "Vac-RFA", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupVac,
+ "RF Antenna", "RFA", "Vac-RFA", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Vac_RFA = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupVac,
- "Temperature Transmitter", "TT", "Vac-TT", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupVac,
+ "Temperature Transmitter", "TT", "Vac-TT", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_Vac_TT = ITUtilStructureElement.assertCreate(structureElement);
// ----------------------------------------------------------------------------------------------------
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupWtrC,
- "Flow Switch", "FS", "WtrC-FS", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupWtrC,
+ "Flow Switch", "FS", "WtrC-FS", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_WtrC_FS = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupWtrC,
- "Input Output Controller", "IOC", "WtrC-IOC", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupWtrC,
+ "Input Output Controller", "IOC", "WtrC-IOC", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_WtrC_IOC = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupWtrC,
- "RF Antenna", "RFA", "WtrC-RFA", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupWtrC,
+ "RF Antenna", "RFA", "WtrC-RFA", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_WtrC_RFA = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupWtrC,
- "Temperature Transmitter", "TT", "WtrC-TT", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupWtrC,
+ "Temperature Transmitter", "TT", "WtrC-TT", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_WtrC_TT = ITUtilStructureElement.assertCreate(structureElement);
// ----------------------------------------------------------------------------------------------------
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupBMD,
- "Flow Switch", "FS", "BMD-FS", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupBMD,
+ "Flow Switch", "FS", "BMD-FS", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_BMD_FS = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupBMD,
- "Input Output Controller", "IOC", "BMD-IOC", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupBMD,
+ "Input Output Controller", "IOC", "BMD-IOC", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_BMD_IOC = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupBMD,
- "RF Antenna", "RFA", "BMD-RFA", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupBMD,
+ "RF Antenna", "RFA", "BMD-RFA", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_BMD_RFA = ITUtilStructureElement.assertCreate(structureElement);
structureElement = new StructureElement(
- Type.DEVICETYPE, null, deviceGroupBMD,
- "Temperature Transmitter", "TT", "BMD-TT", 3,
- "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- null, "test who", "empty");
+ Type.DEVICETYPE, null, deviceGroupBMD,
+ "Temperature Transmitter", "TT", "BMD-TT", 3,
+ "empty", Status.PENDING, Boolean.FALSE, Boolean.FALSE,
+ null, "test who", "empty");
createdStructureElement_BMD_TT = ITUtilStructureElement.assertCreate(structureElement);
// ----------------------------------------------------------------------------------------------------
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Cryo_FS);
- deviceType_Cryo_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Cryo_IOC);
- deviceType_Cryo_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Cryo_RFA);
- deviceType_Cryo_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Cryo_TT);
- deviceType_Cryo_TT = approvedStructureElement.getUuid();
-
- assertNotNull(deviceType_Cryo_FS);
- assertNotNull(deviceType_Cryo_IOC);
- assertNotNull(deviceType_Cryo_RFA);
- assertNotNull(deviceType_Cryo_TT);
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_EMR_FS);
- deviceType_EMR_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_EMR_IOC);
- deviceType_EMR_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_EMR_RFA);
- deviceType_EMR_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_EMR_TT);
- deviceType_EMR_TT = approvedStructureElement.getUuid();
-
- assertNotNull(deviceType_EMR_FS);
- assertNotNull(deviceType_EMR_IOC);
- assertNotNull(deviceType_EMR_RFA);
- assertNotNull(deviceType_EMR_TT);
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_HVAC_FS);
- deviceType_HVAC_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_HVAC_IOC);
- deviceType_HVAC_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_HVAC_RFA);
- deviceType_HVAC_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_HVAC_TT);
- deviceType_HVAC_TT = approvedStructureElement.getUuid();
-
- assertNotNull(deviceType_HVAC_FS);
- assertNotNull(deviceType_HVAC_IOC);
- assertNotNull(deviceType_HVAC_RFA);
- assertNotNull(deviceType_HVAC_TT);
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Proc_FS);
- deviceType_Proc_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Proc_IOC);
- deviceType_Proc_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Proc_RFA);
- deviceType_Proc_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Proc_TT);
- deviceType_Proc_TT = approvedStructureElement.getUuid();
-
- assertNotNull(deviceType_Proc_FS);
- assertNotNull(deviceType_Proc_IOC);
- assertNotNull(deviceType_Proc_RFA);
- assertNotNull(deviceType_Proc_TT);
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_SC_FS);
- deviceType_SC_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_SC_IOC);
- deviceType_SC_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_SC_RFA);
- deviceType_SC_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_SC_TT);
- deviceType_SC_TT = approvedStructureElement.getUuid();
-
- assertNotNull(deviceType_SC_FS);
- assertNotNull(deviceType_SC_IOC);
- assertNotNull(deviceType_SC_RFA);
- assertNotNull(deviceType_SC_TT);
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Vac_FS);
- deviceType_Vac_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Vac_IOC);
- deviceType_Vac_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Vac_RFA);
- deviceType_Vac_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Vac_TT);
- deviceType_Vac_TT = approvedStructureElement.getUuid();
-
- assertNotNull(deviceType_Vac_FS);
- assertNotNull(deviceType_Vac_IOC);
- assertNotNull(deviceType_Vac_RFA);
- assertNotNull(deviceType_Vac_TT);
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_WtrC_FS);
- deviceType_WtrC_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_WtrC_IOC);
- deviceType_WtrC_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_WtrC_RFA);
- deviceType_WtrC_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_WtrC_TT);
- deviceType_WtrC_TT = approvedStructureElement.getUuid();
-
- assertNotNull(deviceType_WtrC_FS);
- assertNotNull(deviceType_WtrC_IOC);
- assertNotNull(deviceType_WtrC_RFA);
- assertNotNull(deviceType_WtrC_TT);
-
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_BMD_FS);
- deviceType_BMD_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_BMD_IOC);
- deviceType_BMD_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_BMD_RFA);
- deviceType_BMD_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_BMD_TT);
- deviceType_BMD_TT = approvedStructureElement.getUuid();
-
- assertNotNull(deviceType_BMD_FS);
- assertNotNull(deviceType_BMD_IOC);
- assertNotNull(deviceType_BMD_RFA);
- assertNotNull(deviceType_BMD_TT);
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Cryo_FS);
+ deviceType_Cryo_FS = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Cryo_IOC);
+ deviceType_Cryo_IOC = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Cryo_RFA);
+ deviceType_Cryo_RFA = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Cryo_TT);
+ deviceType_Cryo_TT = approvedStructureElement.getUuid();
+
+ assertNotNull(deviceType_Cryo_FS);
+ assertNotNull(deviceType_Cryo_IOC);
+ assertNotNull(deviceType_Cryo_RFA);
+ assertNotNull(deviceType_Cryo_TT);
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_EMR_FS);
+ deviceType_EMR_IOC = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_EMR_IOC);
+ deviceType_EMR_FS = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_EMR_RFA);
+ deviceType_EMR_RFA = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_EMR_TT);
+ deviceType_EMR_TT = approvedStructureElement.getUuid();
+
+ assertNotNull(deviceType_EMR_FS);
+ assertNotNull(deviceType_EMR_IOC);
+ assertNotNull(deviceType_EMR_RFA);
+ assertNotNull(deviceType_EMR_TT);
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_HVAC_FS);
+ deviceType_HVAC_FS = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_HVAC_IOC);
+ deviceType_HVAC_IOC = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_HVAC_RFA);
+ deviceType_HVAC_RFA = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_HVAC_TT);
+ deviceType_HVAC_TT = approvedStructureElement.getUuid();
+
+ assertNotNull(deviceType_HVAC_FS);
+ assertNotNull(deviceType_HVAC_IOC);
+ assertNotNull(deviceType_HVAC_RFA);
+ assertNotNull(deviceType_HVAC_TT);
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Proc_FS);
+ deviceType_Proc_FS = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Proc_IOC);
+ deviceType_Proc_IOC = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Proc_RFA);
+ deviceType_Proc_RFA = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Proc_TT);
+ deviceType_Proc_TT = approvedStructureElement.getUuid();
+
+ assertNotNull(deviceType_Proc_FS);
+ assertNotNull(deviceType_Proc_IOC);
+ assertNotNull(deviceType_Proc_RFA);
+ assertNotNull(deviceType_Proc_TT);
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_SC_FS);
+ deviceType_SC_FS = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_SC_IOC);
+ deviceType_SC_IOC = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_SC_RFA);
+ deviceType_SC_RFA = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_SC_TT);
+ deviceType_SC_TT = approvedStructureElement.getUuid();
+
+ assertNotNull(deviceType_SC_FS);
+ assertNotNull(deviceType_SC_IOC);
+ assertNotNull(deviceType_SC_RFA);
+ assertNotNull(deviceType_SC_TT);
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Vac_FS);
+ deviceType_Vac_FS = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Vac_IOC);
+ deviceType_Vac_IOC = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Vac_RFA);
+ deviceType_Vac_RFA = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_Vac_TT);
+ deviceType_Vac_TT = approvedStructureElement.getUuid();
+
+ assertNotNull(deviceType_Vac_FS);
+ assertNotNull(deviceType_Vac_IOC);
+ assertNotNull(deviceType_Vac_RFA);
+ assertNotNull(deviceType_Vac_TT);
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_WtrC_FS);
+ deviceType_WtrC_FS = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_WtrC_IOC);
+ deviceType_WtrC_IOC = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_WtrC_RFA);
+ deviceType_WtrC_RFA = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_WtrC_TT);
+ deviceType_WtrC_TT = approvedStructureElement.getUuid();
+
+ assertNotNull(deviceType_WtrC_FS);
+ assertNotNull(deviceType_WtrC_IOC);
+ assertNotNull(deviceType_WtrC_RFA);
+ assertNotNull(deviceType_WtrC_TT);
+
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_BMD_FS);
+ deviceType_BMD_FS = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_BMD_IOC);
+ deviceType_BMD_IOC = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_BMD_RFA);
+ deviceType_BMD_RFA = approvedStructureElement.getUuid();
+ approvedStructureElement = ITUtilStructureElement.assertApprove(createdStructureElement_BMD_TT);
+ deviceType_BMD_TT = approvedStructureElement.getUuid();
+
+ assertNotNull(deviceType_BMD_FS);
+ assertNotNull(deviceType_BMD_IOC);
+ assertNotNull(deviceType_BMD_RFA);
+ assertNotNull(deviceType_BMD_TT);
// possibly combine with readStructures
} catch (Exception e) {
diff --git a/src/test/java/org/openepics/names/util/NamingConventionUtilTest.java b/src/test/java/org/openepics/names/util/NamingConventionUtilTest.java
index 01b7acb2e478148036cde8213ec20857a2867791..b5a1d2d9ded874e19b98ee47b9817abe2d6942c3 100644
--- a/src/test/java/org/openepics/names/util/NamingConventionUtilTest.java
+++ b/src/test/java/org/openepics/names/util/NamingConventionUtilTest.java
@@ -229,19 +229,19 @@ public class NamingConventionUtilTest {
assertEquals(CONVENTIONNAME_010, NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_010));
assertEquals(CONVENTIONNAME_011, NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_011));
- assertEquals(CONVENTIONNAME_111, NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_111));
+ assertEquals(NULL, NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_111));
assertEquals("CWL", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_010_111));
assertEquals("LEBT-010", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_011_110));
assertEquals("CWL-CWSE05", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_011_111));
- assertEquals("Acc-LEBT-010", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_111_110));
- assertEquals("DUMMY-CWL-CWSE05", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_111_111));
+ assertEquals(NULL, NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_111_110));
+ assertEquals(NULL, NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_111_111));
assertEquals("CWL-CWSE05", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_011_111_SC1));
assertEquals("CWL-CWSE05", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_011_111_SC2));
assertEquals("CW1-CWSE5", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_011_111_EQCLASS));
- assertEquals("DUMMY-CW1-CWSE5", NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_111_111_EQCLASS));
+ assertEquals(NULL, NamingConventionUtil.extractMnemonicPathSystemStructure(CONVENTIONNAME_111_111_EQCLASS));
}
/**