diff --git a/src/main/java/org/openepics/names/rest/api/v1/IHistory.java b/src/main/java/org/openepics/names/rest/api/v1/IHistory.java
new file mode 100644
index 0000000000000000000000000000000000000000..930a250528dc20b9bcc0fa3ca6d360e3c431938e
--- /dev/null
+++ b/src/main/java/org/openepics/names/rest/api/v1/IHistory.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright (C) 2023 European Spallation Source ERIC.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.openepics.names.rest.api.v1;
+
+import org.openepics.names.rest.beans.FieldName;
+import org.openepics.names.rest.beans.FieldStructure;
+import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.response.Response;
+import org.openepics.names.rest.beans.response.ResponsePageNameElements;
+import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+/**
+ * This part of REST API provides history for names and structures data for Naming application.
+ *
+ * @author Lars Johansson
+ */
+@Tag(name = "History",
+ description = "handle history for names and structures data for Naming application")
+@RequestMapping("/api/v1/history")
+public interface IHistory {
+
+ /*
+ NameElement
+ uuid (UUID)
+ parentSystemStructure (UUID)
+ parentDeviceStructure (UUID)
+ index (String)
+ description (String)
+ comment (String)
+ ----------------------------------
+ systemStructure (String)
+ deviceStructure (String)
+ name (String)
+ status (Status)
+ latest (Boolean)
+ deleted (Boolean)
+ when (Date)
+ who (String)
+
+ StructureElement
+ uuid (UUID)
+ type (Type)
+ parent (UUID)
+ name (String)
+ mnemonic (String)
+ description (String)
+ comment (String)
+ ----------------------------------
+ mnemonicPath (String)
+ level (Integer)
+ status (Status)
+ latest (Boolean)
+ deleted (Boolean)
+ when (Date)
+ who (String)
+
+ Methods
+ read GET /names - readNamesHistory
+ read GET /names/{uuid} - readNamesHistory
+ ----------------------------------------------------------------------------------------------------
+ read GET /structures - readStructuresHistory
+ read GET /structures/{uuid} - readStructuresHistory
+ */
+
+ public static final String DEFAULT_PAGE = "0";
+ public static final String DEFAULT_PAGE_SIZE = "100";
+ public static final String DEFAULT_SORT_FIELD_WHEN = "WHEN";
+ public static final String DEFAULT_SORT_ORDER_ASC = "true";
+
+ /**
+ * Find history for name (search).
+ * History consists of lines of uuid.
+ * The line of uuid is not broken in retrieving history. If combination of parameters is found in name entries, the entire lines of uuid are returned.
+ * Return paged list of name elements.
+ *
+ * @param uuid uuid
+ * @param name name
+ * @param nameEquivalence name equivalence
+ * @param systemStructure system structure mnemonic path
+ * @param deviceStructure device structure mnemonic path
+ * @param index index
+ * @param description description
+ * @param who who
+ * @param orderBy order by field
+ * @param isAsc sort order, ascending or descending
+ * @param page page starting from 0, offset
+ * @param pageSize page size, limit
+ * @return paged list of name elements
+ */
+ @Operation(
+ summary = "Find history for name (search)",
+ description = """
+ Find history for name (search).
+ History consists of lines of uuid.
+ The line of uuid is not broken in retrieving history. If combination of parameters is found in name entries, the entire lines of uuid are returned.
+ Return paged array of name elements.
+ """
+ )
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = "200",
+ description = "OK. Return paged array of name elements.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ResponsePageNameElements.class))),
+ @ApiResponse(
+ responseCode = "400",
+ description = "Bad request. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class))),
+ @ApiResponse(
+ responseCode = "422",
+ description = "Unprocessable entity. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class))),
+ @ApiResponse(
+ responseCode = "500",
+ description = "Internal server error. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class)))
+ })
+ @GetMapping(
+ value = "/names",
+ produces = {"application/json"})
+ public ResponsePageNameElements readNamesHistory(
+ @Parameter(in = ParameterIn.QUERY, description = "find by uuid") @RequestParam(required = false) String uuid,
+ @Parameter(in = ParameterIn.QUERY, description = "search by name") @RequestParam(required = false) String name,
+ @Parameter(in = ParameterIn.QUERY, description = "search by name equivalence") @RequestParam(required = false) String nameEquivalence,
+ @Parameter(in = ParameterIn.QUERY, description = "search by system structure mnemonic path") @RequestParam(required = false) String systemStructure,
+ @Parameter(in = ParameterIn.QUERY, description = "search by device structure mnemonic path") @RequestParam(required = false) String deviceStructure,
+ @Parameter(in = ParameterIn.QUERY, description = "search by index") @RequestParam(required = false) String index,
+ @Parameter(in = ParameterIn.QUERY, description = "search by description") @RequestParam(required = false) String description,
+ @Parameter(in = ParameterIn.QUERY, description = "search by who") @RequestParam(required = false) String who,
+ @Parameter(in = ParameterIn.QUERY, description = "order by field") @RequestParam(required = false, defaultValue = DEFAULT_SORT_FIELD_WHEN) FieldName orderBy,
+ @Parameter(in = ParameterIn.QUERY, description = "sort order, ascending or descending") @RequestParam(required = false, defaultValue = DEFAULT_SORT_ORDER_ASC) Boolean isAsc,
+ @Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
+ @Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
+
+ /**
+ * Find history for name by uuid (exact match).
+ * History consists of line of uuid.
+ * The line of uuid is not broken in retrieving history. If the uuid is found in a name entry, the entire line of uuid is returned.
+ * Return paged list of name elements.
+ *
+ * @param uuid uuid
+ * @param orderBy order by field
+ * @param isAsc sort order, ascending or descending
+ * @param page page starting from 0, offset
+ * @param pageSize page size, limit
+ * @return paged list of name elements
+ */
+ @Operation(
+ summary = "Find history for name by uuid (exact match)",
+ description = """
+ Find history for name by uuid (exact match).
+ History consists of line of uuid.
+ The line of uuid is not broken in retrieving history. If the uuid is found in a name entry, the entire line of uuid is returned.
+ Return paged array of name elements.
+ """
+ )
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = "200",
+ description = "OK. Return paged array of name elements.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ResponsePageNameElements.class))),
+ @ApiResponse(
+ responseCode = "400",
+ description = "Bad request. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class))),
+ @ApiResponse(
+ responseCode = "422",
+ description = "Unprocessable entity. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class))),
+ @ApiResponse(
+ responseCode = "500",
+ description = "Internal server error. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class)))
+ })
+ @GetMapping(
+ value = "/names/{uuid}",
+ produces = {"application/json"})
+ public ResponsePageNameElements readNamesHistory(
+ @Parameter(in = ParameterIn.PATH, description = "find by uuid") @PathVariable("uuid") String uuid,
+ @Parameter(in = ParameterIn.QUERY, description = "order by field") @RequestParam(required = false, defaultValue = DEFAULT_SORT_FIELD_WHEN) FieldName orderBy,
+ @Parameter(in = ParameterIn.QUERY, description = "sort order, ascending or descending") @RequestParam(required = false, defaultValue = DEFAULT_SORT_ORDER_ASC) Boolean isAsc,
+ @Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
+ @Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
+
+ // ----------------------------------------------------------------------------------------------------
+
+ /**
+ * Find history for structure (search).
+ * History consists of lines of uuid.
+ * The line of uuid is not broken in retrieving history. If combination of parameters is found in structure entries, the entire lines of uuid are returned.
+ * Return paged list of structure elements.
+ *
+ * @param type type of structure
+ * @param uuid uuid
+ * @param parent parent uuid
+ * @param name name
+ * @param mnemonic mnemonic
+ * @param mnemonicEquivalence mnemonic equivalence
+ * @param description description
+ * @param who who
+ * @param orderBy order by field
+ * @param isAsc sort order, ascending or descending
+ * @param page page starting from 0, offset
+ * @param pageSize page size, limit
+ * @return paged list of structure elements
+ */
+ @Operation(
+ summary = "Find history for structure (search)",
+ description = """
+ Find history for structure (search).
+ History consists of lines of uuid. The line of uuid is not broken in retrieving history. If combination of parameters is found in structure entries, the entire lines of uuid are returned.
+ Return paged array of structure elements.
+ """
+ )
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = "200",
+ description = "OK. Return paged array of structure elements.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ResponsePageStructureElements.class))),
+ @ApiResponse(
+ responseCode = "400",
+ description = "Bad request. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class))),
+ @ApiResponse(
+ responseCode = "422",
+ description = "Unprocessable entity. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class))),
+ @ApiResponse(
+ responseCode = "500",
+ description = "Internal server error. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class)))
+ })
+ @GetMapping(
+ value = "/structures",
+ produces = {"application/json"})
+ public ResponsePageStructureElements readStructuresHistory(
+ @Parameter(in = ParameterIn.QUERY, description = "search by type of structure") @RequestParam(required = true) Type type,
+ @Parameter(in = ParameterIn.QUERY, description = "find by uuid") @RequestParam(required = false) String uuid,
+ @Parameter(in = ParameterIn.QUERY, description = "search by parent uuid") @RequestParam(required = false) String parent,
+ @Parameter(in = ParameterIn.QUERY, description = "search by name") @RequestParam(required = false) String name,
+ @Parameter(in = ParameterIn.QUERY, description = "search by mnemonic") @RequestParam(required = false) String mnemonic,
+ @Parameter(in = ParameterIn.QUERY, description = "search by mnemonic equivalence") @RequestParam(required = false) String mnemonicEquivalence,
+ @Parameter(in = ParameterIn.QUERY, description = "search by description") @RequestParam(required = false) String description,
+ @Parameter(in = ParameterIn.QUERY, description = "search by who") @RequestParam(required = false) String who,
+ @Parameter(in = ParameterIn.QUERY, description = "order by field") @RequestParam(required = false) FieldStructure orderBy,
+ @Parameter(in = ParameterIn.QUERY, description = "sort order, ascending or descending") @RequestParam(required = false) Boolean isAsc,
+ @Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
+ @Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
+
+ /**
+ * Find history for structure by uuid (exact match).
+ * History consists of line of uuid.
+ * The line of uuid is not broken in retrieving history. If the uuid is found in a structure entry, the entire line of uuid is returned.
+ * Return paged list of structure elements.
+ *
+ * @param uuid uuid
+ * @param type type of structure to search in
+ * @param orderBy order by field
+ * @param isAsc sort order, ascending or descending
+ * @param page page starting from 0, offset
+ * @param pageSize page size, limit
+ * @return paged list of structure elements
+ */
+ @Operation(
+ summary = "Find history for structure by uuid (exact match)",
+ description = """
+ Find history for structure by uuid (exact match).
+ History consists of line of uuid. The line of uuid is not broken in retrieving history. If the uuid is found in a structure entry, the entire line of uuid is returned.
+ Return paged array of structure elements.
+ """
+ )
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = "200",
+ description = "OK. Return paged array of structure elements.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ResponsePageStructureElements.class))),
+ @ApiResponse(
+ responseCode = "400",
+ description = "Bad request. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class))),
+ @ApiResponse(
+ responseCode = "422",
+ description = "Unprocessable entity. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class))),
+ @ApiResponse(
+ responseCode = "500",
+ description = "Internal server error. Reason and information such as message, details, field are available.",
+ content = @Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = Response.class)))
+ })
+ @GetMapping(
+ value = "/structures/{uuid}",
+ produces = {"application/json"})
+ public ResponsePageStructureElements readStructuresHistory(
+ @Parameter(in = ParameterIn.PATH, description = "find by uuid") @PathVariable("uuid") String uuid,
+ @Parameter(in = ParameterIn.QUERY, description = "search by type of structure") @RequestParam(required = false) Type type,
+ @Parameter(in = ParameterIn.QUERY, description = "order by field") @RequestParam(required = false, defaultValue = DEFAULT_SORT_FIELD_WHEN) FieldStructure orderBy,
+ @Parameter(in = ParameterIn.QUERY, description = "sort order, ascending or descending") @RequestParam(required = false, defaultValue = DEFAULT_SORT_ORDER_ASC) Boolean isAsc,
+ @Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
+ @Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
+
+}
diff --git a/src/main/java/org/openepics/names/rest/api/v1/INames.java b/src/main/java/org/openepics/names/rest/api/v1/INames.java
index 463f51ce71678464b729c8d7ae7214e50c3b60a1..f3a5df354f79161cc941eb0c980744bfa827d513 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/INames.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/INames.java
@@ -97,8 +97,6 @@ public interface INames {
read GET /names/{name} - readNames
read GET /names/systemStructure/{mnemonicPath} - readNamesSystemStructure
read GET /names/deviceStructure/{mnemonicPath} - readNamesDeviceStructure
- read GET /names/history - readNamesHistory
- read GET /names/history/{uuid} - readNamesHistory
read GET /names/legacy - readNamesLegacy
----------------------------------------------------------------------------------------------------
read GET /names/equivalence/{name} - equivalenceName
@@ -588,136 +586,6 @@ public interface INames {
@Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
@Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
- /**
- * Find history for name (search).
- * History consists of lines of uuid.
- * The line of uuid is not broken in retrieving history. If combination of parameters is found in name entries, the entire lines of uuid are returned.
- * Return paged list of name elements.
- *
- * @param uuid uuid
- * @param name name
- * @param nameEquivalence name equivalence
- * @param systemStructure system structure mnemonic path
- * @param deviceStructure device structure mnemonic path
- * @param index index
- * @param description description
- * @param who who
- * @param orderBy order by field
- * @param isAsc sort order, ascending or descending
- * @param page page starting from 0, offset
- * @param pageSize page size, limit
- * @return paged list of name elements
- */
- @Operation(
- summary = "Find history for name (search)",
- description = """
- Find history for name (search).
- History consists of lines of uuid.
- The line of uuid is not broken in retrieving history. If combination of parameters is found in name entries, the entire lines of uuid are returned.
- Return paged array of name elements.
- """
- )
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = "200",
- description = "OK. Return paged array of name elements.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ResponsePageNameElements.class))),
- @ApiResponse(
- responseCode = "400",
- description = "Bad request. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class))),
- @ApiResponse(
- responseCode = "422",
- description = "Unprocessable entity. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class))),
- @ApiResponse(
- responseCode = "500",
- description = "Internal server error. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class)))
- })
- @GetMapping(
- value = "/history",
- produces = {"application/json"})
- public ResponsePageNameElements readNamesHistory(
- @Parameter(in = ParameterIn.QUERY, description = "find by uuid") @RequestParam(required = false) String uuid,
- @Parameter(in = ParameterIn.QUERY, description = "search by name") @RequestParam(required = false) String name,
- @Parameter(in = ParameterIn.QUERY, description = "search by name equivalence") @RequestParam(required = false) String nameEquivalence,
- @Parameter(in = ParameterIn.QUERY, description = "search by system structure mnemonic path") @RequestParam(required = false) String systemStructure,
- @Parameter(in = ParameterIn.QUERY, description = "search by device structure mnemonic path") @RequestParam(required = false) String deviceStructure,
- @Parameter(in = ParameterIn.QUERY, description = "search by index") @RequestParam(required = false) String index,
- @Parameter(in = ParameterIn.QUERY, description = "search by description") @RequestParam(required = false) String description,
- @Parameter(in = ParameterIn.QUERY, description = "search by who") @RequestParam(required = false) String who,
- @Parameter(in = ParameterIn.QUERY, description = "order by field") @RequestParam(required = false, defaultValue = DEFAULT_SORT_FIELD_WHEN) FieldName orderBy,
- @Parameter(in = ParameterIn.QUERY, description = "sort order, ascending or descending") @RequestParam(required = false, defaultValue = DEFAULT_SORT_ORDER_ASC) Boolean isAsc,
- @Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
- @Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
-
- /**
- * Find history for name by uuid (exact match).
- * History consists of line of uuid.
- * The line of uuid is not broken in retrieving history. If the uuid is found in a name entry, the entire line of uuid is returned.
- * Return paged list of name elements.
- *
- * @param uuid uuid
- * @param orderBy order by field
- * @param isAsc sort order, ascending or descending
- * @param page page starting from 0, offset
- * @param pageSize page size, limit
- * @return paged list of name elements
- */
- @Operation(
- summary = "Find history for name by uuid (exact match)",
- description = """
- Find history for name by uuid (exact match).
- History consists of line of uuid.
- The line of uuid is not broken in retrieving history. If the uuid is found in a name entry, the entire line of uuid is returned.
- Return paged array of name elements.
- """
- )
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = "200",
- description = "OK. Return paged array of name elements.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ResponsePageNameElements.class))),
- @ApiResponse(
- responseCode = "400",
- description = "Bad request. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class))),
- @ApiResponse(
- responseCode = "422",
- description = "Unprocessable entity. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class))),
- @ApiResponse(
- responseCode = "500",
- description = "Internal server error. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class)))
- })
- @GetMapping(
- value = "/history/{uuid}",
- produces = {"application/json"})
- public ResponsePageNameElements readNamesHistory(
- @Parameter(in = ParameterIn.PATH, description = "find by uuid") @PathVariable("uuid") String uuid,
- @Parameter(in = ParameterIn.QUERY, description = "order by field") @RequestParam(required = false, defaultValue = DEFAULT_SORT_FIELD_WHEN) FieldName orderBy,
- @Parameter(in = ParameterIn.QUERY, description = "sort order, ascending or descending") @RequestParam(required = false, defaultValue = DEFAULT_SORT_ORDER_ASC) Boolean isAsc,
- @Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
- @Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
-
@Operation(
summary = "Find valid legacy names (search)",
description = """
diff --git a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
index 6a55f8e7fbecf5f990b80e27067defafc0bd0ba8..7305ab90fae8ba5ef7017aa4955c3a33c646cd0c 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
@@ -100,8 +100,6 @@ public interface IStructures {
read GET /structures/children/{uuid} - readStructuresChildren
read GET /structures/mnemonic/{mnemonic} - readStructuresMnemonic
read GET /structures/mnemonicPath/{mnemonicPath} - readStructuresMnemonicPath
- read GET /structures/history - readStructuresHistory
- read GET /structures/history/{uuid} - readStructuresHistory
----------------------------------------------------------------------------------------------------
read GET /structures/equivalence/{mnemonic} - equivalenceMnemonic
read GET /structures/exists/{type}/{mnemonicPath} - existsStructure
@@ -625,136 +623,6 @@ public interface IStructures {
@Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
@Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
- /**
- * Find history for structure (search).
- * History consists of lines of uuid.
- * The line of uuid is not broken in retrieving history. If combination of parameters is found in structure entries, the entire lines of uuid are returned.
- * Return paged list of structure elements.
- *
- * @param type type of structure
- * @param uuid uuid
- * @param parent parent uuid
- * @param name name
- * @param mnemonic mnemonic
- * @param mnemonicEquivalence mnemonic equivalence
- * @param description description
- * @param who who
- * @param orderBy order by field
- * @param isAsc sort order, ascending or descending
- * @param page page starting from 0, offset
- * @param pageSize page size, limit
- * @return paged list of structure elements
- */
- @Operation(
- summary = "Find history for structure (search)",
- description = """
- Find history for structure (search).
- History consists of lines of uuid. The line of uuid is not broken in retrieving history. If combination of parameters is found in structure entries, the entire lines of uuid are returned.
- Return paged array of structure elements.
- """
- )
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = "200",
- description = "OK. Return paged array of structure elements.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ResponsePageStructureElements.class))),
- @ApiResponse(
- responseCode = "400",
- description = "Bad request. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class))),
- @ApiResponse(
- responseCode = "422",
- description = "Unprocessable entity. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class))),
- @ApiResponse(
- responseCode = "500",
- description = "Internal server error. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class)))
- })
- @GetMapping(
- value = "/history",
- produces = {"application/json"})
- public ResponsePageStructureElements readStructuresHistory(
- @Parameter(in = ParameterIn.QUERY, description = "search by type of structure") @RequestParam(required = true) Type type,
- @Parameter(in = ParameterIn.QUERY, description = "find by uuid") @RequestParam(required = false) String uuid,
- @Parameter(in = ParameterIn.QUERY, description = "search by parent uuid") @RequestParam(required = false) String parent,
- @Parameter(in = ParameterIn.QUERY, description = "search by name") @RequestParam(required = false) String name,
- @Parameter(in = ParameterIn.QUERY, description = "search by mnemonic") @RequestParam(required = false) String mnemonic,
- @Parameter(in = ParameterIn.QUERY, description = "search by mnemonic equivalence") @RequestParam(required = false) String mnemonicEquivalence,
- @Parameter(in = ParameterIn.QUERY, description = "search by description") @RequestParam(required = false) String description,
- @Parameter(in = ParameterIn.QUERY, description = "search by who") @RequestParam(required = false) String who,
- @Parameter(in = ParameterIn.QUERY, description = "order by field") @RequestParam(required = false) FieldStructure orderBy,
- @Parameter(in = ParameterIn.QUERY, description = "sort order, ascending or descending") @RequestParam(required = false) Boolean isAsc,
- @Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
- @Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
-
- /**
- * Find history for structure by uuid (exact match).
- * History consists of line of uuid.
- * The line of uuid is not broken in retrieving history. If the uuid is found in a structure entry, the entire line of uuid is returned.
- * Return paged list of structure elements.
- *
- * @param uuid uuid
- * @param type type of structure to search in
- * @param orderBy order by field
- * @param isAsc sort order, ascending or descending
- * @param page page starting from 0, offset
- * @param pageSize page size, limit
- * @return paged list of structure elements
- */
- @Operation(
- summary = "Find history for structure by uuid (exact match)",
- description = """
- Find history for structure by uuid (exact match).
- History consists of line of uuid. The line of uuid is not broken in retrieving history. If the uuid is found in a structure entry, the entire line of uuid is returned.
- Return paged array of structure elements.
- """
- )
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = "200",
- description = "OK. Return paged array of structure elements.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ResponsePageStructureElements.class))),
- @ApiResponse(
- responseCode = "400",
- description = "Bad request. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class))),
- @ApiResponse(
- responseCode = "422",
- description = "Unprocessable entity. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class))),
- @ApiResponse(
- responseCode = "500",
- description = "Internal server error. Reason and information such as message, details, field are available.",
- content = @Content(
- mediaType = "application/json",
- schema = @Schema(implementation = Response.class)))
- })
- @GetMapping(
- value = "/history/{uuid}",
- produces = {"application/json"})
- public ResponsePageStructureElements readStructuresHistory(
- @Parameter(in = ParameterIn.PATH, description = "find by uuid") @PathVariable("uuid") String uuid,
- @Parameter(in = ParameterIn.QUERY, description = "search by type of structure") @RequestParam(required = false) Type type,
- @Parameter(in = ParameterIn.QUERY, description = "order by field") @RequestParam(required = false, defaultValue = DEFAULT_SORT_FIELD_WHEN) FieldStructure orderBy,
- @Parameter(in = ParameterIn.QUERY, description = "sort order, ascending or descending") @RequestParam(required = false, defaultValue = DEFAULT_SORT_ORDER_ASC) Boolean isAsc,
- @Parameter(in = ParameterIn.QUERY, description = "page starting from 0, offset") @RequestParam(required = false, defaultValue = DEFAULT_PAGE) Integer page,
- @Parameter(in = ParameterIn.QUERY, description = "page size, limit") @RequestParam(required = false, defaultValue = DEFAULT_PAGE_SIZE) Integer pageSize);
-
// ----------------------------------------------------------------------------------------------------
/**
diff --git a/src/main/java/org/openepics/names/rest/controller/HistoryController.java b/src/main/java/org/openepics/names/rest/controller/HistoryController.java
new file mode 100644
index 0000000000000000000000000000000000000000..14199cadbd3897224d44afe9780976dde40cd50c
--- /dev/null
+++ b/src/main/java/org/openepics/names/rest/controller/HistoryController.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2023 European Spallation Source ERIC.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.openepics.names.rest.controller;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.openepics.names.exception.ServiceException;
+import org.openepics.names.rest.api.v1.IHistory;
+import org.openepics.names.rest.beans.FieldName;
+import org.openepics.names.rest.beans.FieldStructure;
+import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.response.ResponsePageNameElements;
+import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
+import org.openepics.names.service.LogService;
+import org.openepics.names.service.NamesService;
+import org.openepics.names.service.StructuresService;
+import org.openepics.names.util.ValidateNameElementUtil;
+import org.openepics.names.util.ValidateStructureElementUtil;
+import org.openepics.names.util.ValidateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * This part of REST API provides history for names and structures data for Naming application.
+ *
+ * @author Lars Johansson
+ */
+@RestController
+@EnableAutoConfiguration
+public class HistoryController implements IHistory {
+
+ // note
+ // global exception handler available
+ // controller layer to call validation prior to invoking service layer
+ // business logic may be validation
+ // different kinds of validation
+
+ private static final Logger LOGGER = Logger.getLogger(HistoryController.class.getName());
+
+ private LogService logService;
+ private NamesService namesService;
+ private StructuresService structuresService;
+
+ @Autowired
+ public HistoryController(
+ LogService logUtil,
+ NamesService namesService,
+ StructuresService structuresService) {
+ this.logService = logUtil;
+ this.namesService = namesService;
+ this.structuresService = structuresService;
+ }
+
+ @Override
+ public ResponsePageNameElements readNamesHistory(
+ String uuid, String name, String nameEquivalence, String systemStructure, String deviceStructure, String index, String description, String who,
+ FieldName orderBy, Boolean isAsc, Integer page, Integer pageSize) {
+ // validate
+ // read names
+
+ try {
+ ValidateUtil.validateInputAvailable(
+ !ValidateUtil.areAllNull(uuid, name, nameEquivalence, systemStructure, deviceStructure, index, description, who));
+ ValidateNameElementUtil.validateNamesInputRead(
+ null,
+ uuid, name, nameEquivalence, systemStructure, deviceStructure, index, description, who,
+ null,
+ orderBy, isAsc,
+ page, pageSize);
+ return namesService.readNamesHistory(
+ uuid, name, nameEquivalence, systemStructure, deviceStructure, index, description, who,
+ orderBy, isAsc, page, pageSize);
+ } catch (ServiceException e) {
+ logService.logServiceException(LOGGER, Level.WARNING, e);
+ logService.logStackTraceElements(LOGGER, Level.WARNING, e);
+ throw e;
+ } catch (Exception e) {
+ logService.logStackTraceElements(LOGGER, Level.WARNING, e);
+ throw e;
+ }
+ }
+
+ @Override
+ public ResponsePageNameElements readNamesHistory(String uuid,
+ FieldName orderBy, Boolean isAsc, Integer page, Integer pageSize) {
+ // validate
+ // read names
+
+ try {
+ ValidateUtil.validateInputUuid(uuid);
+ return namesService.readNamesHistory(uuid,
+ orderBy, isAsc, page, pageSize);
+ } catch (ServiceException e) {
+ logService.logServiceException(LOGGER, Level.WARNING, e);
+ logService.logStackTraceElements(LOGGER, Level.WARNING, e);
+ throw e;
+ } catch (Exception e) {
+ logService.logStackTraceElements(LOGGER, Level.WARNING, e);
+ throw e;
+ }
+ }
+
+ // ----------------------------------------------------------------------------------------------------
+
+ @Override
+ public ResponsePageStructureElements readStructuresHistory(Type type,
+ String uuid, String parent, String name, String mnemonic, String mnemonicEquivalence, String description, String who,
+ FieldStructure orderBy, Boolean isAsc, Integer page, Integer pageSize) {
+ // validate
+ // read names
+
+ try {
+ ValidateUtil.validateInputType(type);
+ ValidateUtil.validateInputAvailable(
+ !ValidateUtil.areAllNull(uuid, parent, name, mnemonic, mnemonicEquivalence, description, who));
+ ValidateStructureElementUtil.validateStructuresInputRead(
+ null, null,
+ uuid, parent, name, mnemonic, mnemonicEquivalence, null, description, who,
+ null,
+ orderBy, isAsc,
+ page, pageSize);
+ return structuresService.readStructuresHistory(type,
+ uuid, parent, name, mnemonic, mnemonicEquivalence, description, who,
+ orderBy, isAsc, page, pageSize);
+ } catch (ServiceException e) {
+ logService.logServiceException(LOGGER, Level.WARNING, e);
+ logService.logStackTraceElements(LOGGER, Level.WARNING, e);
+ throw e;
+ } catch (Exception e) {
+ logService.logStackTraceElements(LOGGER, Level.WARNING, e);
+ throw e;
+ }
+ }
+
+ @Override
+ public ResponsePageStructureElements readStructuresHistory(String uuid, Type type,
+ FieldStructure orderBy, Boolean isAsc, Integer page, Integer pageSize) {
+ // validate
+ // read structures
+
+ try {
+ ValidateUtil.validateInputUuid(uuid);
+ return structuresService.readStructuresHistory(uuid, type,
+ orderBy, isAsc, page, pageSize);
+ } catch (ServiceException e) {
+ logService.logServiceException(LOGGER, Level.WARNING, e);
+ logService.logStackTraceElements(LOGGER, Level.WARNING, e);
+ throw e;
+ } catch (Exception e) {
+ logService.logStackTraceElements(LOGGER, Level.WARNING, e);
+ throw e;
+ }
+ }
+
+}
diff --git a/src/main/java/org/openepics/names/rest/controller/NamesController.java b/src/main/java/org/openepics/names/rest/controller/NamesController.java
index a30f1c23744a43c42a4549c04c9e0dcc5958aa87..235c2fe7e18c5054431a8e9cb53ccd018648f306 100644
--- a/src/main/java/org/openepics/names/rest/controller/NamesController.java
+++ b/src/main/java/org/openepics/names/rest/controller/NamesController.java
@@ -254,55 +254,6 @@ public class NamesController implements INames {
}
}
- @Override
- public ResponsePageNameElements readNamesHistory(
- String uuid, String name, String nameEquivalence, String systemStructure, String deviceStructure, String index, String description, String who,
- FieldName orderBy, Boolean isAsc, Integer page, Integer pageSize) {
- // validate
- // read names
-
- try {
- ValidateUtil.validateInputAvailable(
- !ValidateUtil.areAllNull(uuid, name, nameEquivalence, systemStructure, deviceStructure, index, description, who));
- ValidateNameElementUtil.validateNamesInputRead(
- null,
- uuid, name, nameEquivalence, systemStructure, deviceStructure, index, description, who,
- null,
- orderBy, isAsc,
- page, pageSize);
- return namesService.readNamesHistory(
- uuid, name, nameEquivalence, systemStructure, deviceStructure, index, description, who,
- orderBy, isAsc, page, pageSize);
- } catch (ServiceException e) {
- logService.logServiceException(LOGGER, Level.WARNING, e);
- logService.logStackTraceElements(LOGGER, Level.WARNING, e);
- throw e;
- } catch (Exception e) {
- logService.logStackTraceElements(LOGGER, Level.WARNING, e);
- throw e;
- }
- }
-
- @Override
- public ResponsePageNameElements readNamesHistory(String uuid,
- FieldName orderBy, Boolean isAsc, Integer page, Integer pageSize) {
- // validate
- // read names
-
- try {
- ValidateUtil.validateInputUuid(uuid);
- return namesService.readNamesHistory(uuid,
- orderBy, isAsc, page, pageSize);
- } catch (ServiceException e) {
- logService.logServiceException(LOGGER, Level.WARNING, e);
- logService.logStackTraceElements(LOGGER, Level.WARNING, e);
- throw e;
- } catch (Exception e) {
- logService.logStackTraceElements(LOGGER, Level.WARNING, e);
- throw e;
- }
- }
-
@Override
public ResponsePageNameElements readNamesLegacy(String name,
FieldName orderBy, Boolean isAsc, Integer page, Integer pageSize) {
diff --git a/src/main/java/org/openepics/names/rest/controller/StructuresController.java b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
index 7144b6d6e0b565fd7ae287336472b35d290fe3e9..4185183135f9bc49a27e335958e02aee64d9648e 100644
--- a/src/main/java/org/openepics/names/rest/controller/StructuresController.java
+++ b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
@@ -253,56 +253,6 @@ public class StructuresController implements IStructures {
}
}
- @Override
- public ResponsePageStructureElements readStructuresHistory(Type type,
- String uuid, String parent, String name, String mnemonic, String mnemonicEquivalence, String description, String who,
- FieldStructure orderBy, Boolean isAsc, Integer page, Integer pageSize) {
- // validate
- // read names
-
- try {
- ValidateUtil.validateInputType(type);
- ValidateUtil.validateInputAvailable(
- !ValidateUtil.areAllNull(uuid, parent, name, mnemonic, mnemonicEquivalence, description, who));
- ValidateStructureElementUtil.validateStructuresInputRead(
- null, null,
- uuid, parent, name, mnemonic, mnemonicEquivalence, null, description, who,
- null,
- orderBy, isAsc,
- page, pageSize);
- return structuresService.readStructuresHistory(type,
- uuid, parent, name, mnemonic, mnemonicEquivalence, description, who,
- orderBy, isAsc, page, pageSize);
- } catch (ServiceException e) {
- logService.logServiceException(LOGGER, Level.WARNING, e);
- logService.logStackTraceElements(LOGGER, Level.WARNING, e);
- throw e;
- } catch (Exception e) {
- logService.logStackTraceElements(LOGGER, Level.WARNING, e);
- throw e;
- }
- }
-
- @Override
- public ResponsePageStructureElements readStructuresHistory(String uuid, Type type,
- FieldStructure orderBy, Boolean isAsc, Integer page, Integer pageSize) {
- // validate
- // read structures
-
- try {
- ValidateUtil.validateInputUuid(uuid);
- return structuresService.readStructuresHistory(uuid, type,
- orderBy, isAsc, page, pageSize);
- } catch (ServiceException e) {
- logService.logServiceException(LOGGER, Level.WARNING, e);
- logService.logStackTraceElements(LOGGER, Level.WARNING, e);
- throw e;
- } catch (Exception e) {
- logService.logStackTraceElements(LOGGER, Level.WARNING, e);
- throw e;
- }
- }
-
// ----------------------------------------------------------------------------------------------------
@Override
diff --git a/src/test/java/org/openepics/names/docker/ITUtil.java b/src/test/java/org/openepics/names/docker/ITUtil.java
index 400e1bc3aa54567014bf5e50b4558f2eda661046..315f9d9e3b8ae2fe96e2cabae5090722b9ecfa56 100644
--- a/src/test/java/org/openepics/names/docker/ITUtil.java
+++ b/src/test/java/org/openepics/names/docker/ITUtil.java
@@ -56,11 +56,14 @@ public class ITUtil {
static final String IP_PORT_NAMING = "127.0.0.1:8080";
+ static final String API_V1_HISTORY = "/api/v1/history";
static final String API_V1_NAMES = "/api/v1/names";
static final String API_V1_STRUCTURES = "/api/v1/structures";
static final String HTTP_IP_PORT_NAMING = ITUtil.HTTP + ITUtil.IP_PORT_NAMING;
+ static final String HTTP_IP_PORT_NAMING_API_V1_HISTORY = ITUtil.HTTP + ITUtil.IP_PORT_NAMING + API_V1_HISTORY;
+
static final String HTTP_IP_PORT_NAMING_API_V1_NAMES = ITUtil.HTTP + ITUtil.IP_PORT_NAMING + API_V1_NAMES;
static final String HTTP_AUTH_USER_IP_PORT_NAMING_API_V1_NAMES = ITUtil.HTTP + ITUtil.AUTH_USER + "@" + ITUtil.IP_PORT_NAMING + API_V1_NAMES;
static final String HTTP_AUTH_ADMIN_IP_PORT_NAMING_API_V1_NAMES = ITUtil.HTTP + ITUtil.AUTH_ADMIN + "@" + ITUtil.IP_PORT_NAMING + API_V1_NAMES;
diff --git a/src/test/java/org/openepics/names/docker/ITUtilHistory.java b/src/test/java/org/openepics/names/docker/ITUtilHistory.java
new file mode 100644
index 0000000000000000000000000000000000000000..0d54a29ec1cd8b12c26ed49ec9cb43e45ad672c6
--- /dev/null
+++ b/src/test/java/org/openepics/names/docker/ITUtilHistory.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2023 European Spallation Source ERIC.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.openepics.names.docker;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
+import org.openepics.names.rest.beans.response.ResponsePageNameElements;
+import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Utility class to help (Docker) integration tests for Naming and PostgreSQL.
+ *
+ * @author Lars Johansson
+ */
+public class ITUtilHistory {
+
+ static final ObjectMapper mapper = new ObjectMapper();
+
+ /**
+ * This class is not to be instantiated.
+ */
+ private ITUtilHistory() {
+ throw new IllegalStateException("Utility class");
+ }
+
+ // ----------------------------------------------------------------------------------------------------
+
+ /**
+ * Utility method to read history for name elements.
+ *
+ * @param queryString query string
+ * @return response page name elements
+ */
+ public static ResponsePageNameElements assertHistoryNames(String queryString) {
+ return assertHistoryNames(queryString, -1, -1);
+ }
+ /**
+ * Utility method to read history for name elements and assert number of items in list.
+ *
+ * @param queryString query string
+ * @param expectedEqual (if non-negative number) equal to this number of items
+ * @return response page name elements
+ */
+ public static ResponsePageNameElements assertHistoryNames(String queryString, int expectedEqual) {
+ return assertHistoryNames(queryString, expectedEqual, expectedEqual);
+ }
+ /**
+ * Utility method to read history for name elements and assert number of items in list.
+ *
+ * @param queryString query string
+ * @param expectedGreaterThanOrEqual (if non-negative number) greater than or equal to this number of items
+ * @param expectedLessThanOrEqual (if non-negative number) less than or equal to this number of items
+ * @return response page name elements
+ */
+ public static ResponsePageNameElements assertHistoryNames(String queryString, int expectedGreaterThanOrEqual, int expectedLessThanOrEqual) {
+ try {
+ String[] response = null;
+ ResponsePageNameElements responsePageNameElements = null;
+
+ response = ITUtil.doGetJson(ITUtil.HTTP_IP_PORT_NAMING_API_V1_HISTORY + "/names" + queryString);
+ ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
+ responsePageNameElements = mapper.readValue(response[1], ResponsePageNameElements.class);
+
+ // expected number of items in list
+ // (if non-negative number)
+ // expectedGreaterThanOrEqual <= nbr of items <= expectedLessThanOrEqual
+ if (expectedGreaterThanOrEqual >= 0) {
+ assertTrue(responsePageNameElements.getListSize() >= expectedGreaterThanOrEqual);
+ }
+ if (expectedLessThanOrEqual >= 0) {
+ assertTrue(responsePageNameElements.getListSize() <= expectedLessThanOrEqual);
+ }
+
+ // expected value for latest for items in list
+ ITUtilNames.assertLatest(responsePageNameElements);
+
+ return responsePageNameElements;
+ } catch (IOException e) {
+ fail();
+ } catch (Exception e) {
+ fail();
+ }
+ return null;
+ }
+
+ // ----------------------------------------------------------------------------------------------------
+
+ /**
+ * Utility method to read history for structure elements.
+ *
+ * @param queryString query string
+ * @return response page structure elements
+ */
+ public static ResponsePageStructureElements assertHistoryStructures(String queryString) {
+ return assertHistoryStructures(queryString, -1, -1);
+ }
+ /**
+ * Utility method to read history for structure elements and assert number of items in list.
+ *
+ * @param queryString query string
+ * @param expectedEqual (if non-negative number) equal to this number of items
+ * @return response page structure elements
+ */
+ public static ResponsePageStructureElements assertHistoryStructures(String queryString, int expectedEqual) {
+ return assertHistoryStructures(queryString, expectedEqual, expectedEqual);
+ }
+ /**
+ * Utility method to read history for structure elements and assert number of items in list.
+ *
+ * @param queryString query string
+ * @param expectedGreaterThanOrEqual (if non-negative number) greater than or equal to this number of items
+ * @param expectedLessThanOrEqual (if non-negative number) less than or equal to this number of items
+ * @return response page structure elements
+ */
+ public static ResponsePageStructureElements assertHistoryStructures(String queryString, int expectedGreaterThanOrEqual, int expectedLessThanOrEqual) {
+ try {
+ String[] response = null;
+ ResponsePageStructureElements responsePageStructureElements = null;
+
+ response = ITUtil.doGetJson(ITUtil.HTTP_IP_PORT_NAMING_API_V1_HISTORY + "/structures" + queryString);
+ ITUtil.assertResponseLength2Code(response, HttpURLConnection.HTTP_OK);
+ responsePageStructureElements = mapper.readValue(response[1], ResponsePageStructureElements.class);
+
+ // expected number of items in list
+ // (if non-negative number)
+ // expectedGreaterThanOrEqual <= nbr of items <= expectedLessThanOrEqual
+ if (expectedGreaterThanOrEqual >= 0) {
+ assertTrue(responsePageStructureElements.getListSize() >= expectedGreaterThanOrEqual);
+ }
+ if (expectedLessThanOrEqual >= 0) {
+ assertTrue(responsePageStructureElements.getListSize() <= expectedLessThanOrEqual);
+ }
+
+ // expected value for latest for items in list
+ ITUtilStructures.assertLatest(responsePageStructureElements);
+
+ return responsePageStructureElements;
+ } catch (IOException e) {
+ fail();
+ } catch (Exception e) {
+ fail();
+ }
+ return null;
+ }
+
+}
diff --git a/src/test/java/org/openepics/names/docker/ITUtilNameElement.java b/src/test/java/org/openepics/names/docker/ITUtilNames.java
similarity index 99%
rename from src/test/java/org/openepics/names/docker/ITUtilNameElement.java
rename to src/test/java/org/openepics/names/docker/ITUtilNames.java
index 2f32dfea0bc3310bf69d96dee86ac0a1afab6c7a..b2c81ead8d5fce3acc2421e0b10e7a3c4b4e084a 100644
--- a/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
+++ b/src/test/java/org/openepics/names/docker/ITUtilNames.java
@@ -53,14 +53,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*
* @author Lars Johansson
*/
-public class ITUtilNameElement {
+public class ITUtilNames {
static final ObjectMapper mapper = new ObjectMapper();
/**
* This class is not to be instantiated.
*/
- private ITUtilNameElement() {
+ private ITUtilNames() {
throw new IllegalStateException("Utility class");
}
diff --git a/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java b/src/test/java/org/openepics/names/docker/ITUtilStructures.java
similarity index 99%
rename from src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
rename to src/test/java/org/openepics/names/docker/ITUtilStructures.java
index 56389d08ff2519401beb1dc784db02e2c0133e73..a41fed3177a07681703fa4cf7bdc238ab0c29e6e 100644
--- a/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
+++ b/src/test/java/org/openepics/names/docker/ITUtilStructures.java
@@ -55,14 +55,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*
* @author Lars Johansson
*/
-public class ITUtilStructureElement {
+public class ITUtilStructures {
static final ObjectMapper mapper = new ObjectMapper();
/**
* This class is not to be instantiated.
*/
- private ITUtilStructureElement() {
+ private ITUtilStructures() {
throw new IllegalStateException("Utility class");
}
@@ -241,7 +241,6 @@ public class ITUtilStructureElement {
}
}
-
// ----------------------------------------------------------------------------------------------------
/**
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index dd49aa455c0d0707fd1d9a05a1f6b161cb6038bb..b9198f76af92386e98e2e1945b005ee501df11d6 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -102,70 +102,70 @@ class NamesIT {
Type.SYSTEMGROUP, null,
"Accelerator", "Acc",
"The ESS Linear Accelerator", "approved by alfio");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
"Radio Frequency Quadrupole", "RFQ",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"01 Phase Reference Line", "010PRL",
"empty", "Approved by Daniel Piso");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010PRL = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"RFQ-010", "010",
"empty", "Approved by Daniel Piso");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"Power switch board 01", "N1U1",
"Electrical power cabinets", "Approved by Daniel Piso");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystemN1U1 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Electromagnetic Resonators", "EMR",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
"Control", null,
"empty", "These names are needed now, so I am approving, but please add a description to these later.");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"Flow Switch", "FS",
"empty", "Approve names added from misc device group");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeFS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"RF Antenna", "RFA",
"empty", "Approve names added from misc device group");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeRFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"Temperature Transmitter", "TT",
"empty", "Approve names added from misc device group");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeTT = approvedStructureElement.getUuid();
}
@@ -177,7 +177,7 @@ class NamesIT {
// what
// read equivalence name
- ITUtilNameElement.assertEquivalence("A2T-010PRL:RFS-PRLTap-071", "A2T-10PR1:RFS-PR1TAP-71");
+ ITUtilNames.assertEquivalence("A2T-010PRL:RFS-PRLTap-071", "A2T-10PR1:RFS-PR1TAP-71");
}
@Test
@@ -188,7 +188,7 @@ class NamesIT {
// what
// read exists name
- ITUtilNameElement.assertExists("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertExists("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
}
@Test
@@ -219,126 +219,126 @@ class NamesIT {
nameElementCommandUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommand);
nameElementCommandConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommand);
- Long totalCount = ITUtilNameElement.assertRead("").getTotalCount();
+ Long totalCount = ITUtilNames.assertRead("").getTotalCount();
assertNotNull(totalCount);
- ITUtilNameElement.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
-
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- 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);
- 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);
+ ITUtilNames.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
+
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", 0);
+ ITUtilNames.assertRead("/legacy?name=RFQ%", 0);
+ ITUtilNames.assertRead("/legacy?name=%N1U1", 0);
+ ITUtilNames.assertRead("/legacy?name=%N1U1%", 0);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNames.assertRead("/legacy?name=%FS%", 0);
// create
- createdNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ createdNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandUpdate.setUuid(createdNameElement.getUuid());
nameElementCommandConfirm.setUuid(createdNameElement.getUuid());
- Long totalCount2 = ITUtilNameElement.assertRead("").getTotalCount();
+ Long totalCount2 = ITUtilNames.assertRead("").getTotalCount();
assertNotNull(totalCount2);
assertEquals(totalCount + 1, totalCount2);
- ITUtilNameElement.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
- ITUtilNameElement.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
-
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- 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);
- 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);
+ ITUtilNames.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
+ ITUtilNames.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
+
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", 0);
+ ITUtilNames.assertRead("/legacy?name=RFQ%", 0);
+ ITUtilNames.assertRead("/legacy?name=%N1U1", 0);
+ ITUtilNames.assertRead("/legacy?name=%N1U1%", 0);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNames.assertRead("/legacy?name=%FS%", 0);
// delete, approve
structureElementCommandConfirm = new StructureElementCommandConfirm(
subsystemN1U1, Type.SUBSYSTEM, "comment");
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilNameElement.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
- ITUtilNameElement.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
+ ITUtilNames.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ-N1U1", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
- 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);
+ ITUtilNames.assertRead("/legacy", 0);
+ ITUtilNames.assertRead("/legacy?name=RFQ%", 0);
+ ITUtilNames.assertRead("/legacy?name=%N1U1", 0);
+ ITUtilNames.assertRead("/legacy?name=%N1U1%", 0);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNames.assertRead("/legacy?name=%FS%", 0);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- totalCount = ITUtilNameElement.assertRead("").getTotalCount();
+ totalCount = ITUtilNames.assertRead("").getTotalCount();
assertNotNull(totalCount);
assertEquals(totalCount2, totalCount);
- ITUtilNameElement.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
- ITUtilNameElement.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
-
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- 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);
- 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);
-
- ITUtilNameElement.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
-
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- 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);
- 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);
+ ITUtilNames.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
+ ITUtilNames.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
+
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", 2);
+ ITUtilNames.assertRead("/legacy?name=RFQ%", 2);
+ ITUtilNames.assertRead("/legacy?name=%N1U1", 1);
+ ITUtilNames.assertRead("/legacy?name=%N1U1%", 2);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 1);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 1);
+ ITUtilNames.assertRead("/legacy?name=%FS%", 0);
+
+ ITUtilNames.assertDelete(nameElementCommandConfirm);
+
+ ITUtilNames.assertExists("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
+
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ-N1U1:EMR-RFA-071", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-071", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", 1);
+ ITUtilNames.assertRead("/legacy?name=RFQ%", 1);
+ ITUtilNames.assertRead("/legacy?name=%N1U1", 1);
+ ITUtilNames.assertRead("/legacy?name=%N1U1%", 1);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNames.assertRead("/legacy?name=%EMR%", 0);
+ ITUtilNames.assertRead("/legacy?name=%FS%", 0);
} catch (Exception e) {
fail();
}
@@ -352,7 +352,7 @@ class NamesIT {
// what
// read is valid to create name
- ITUtilNameElement.assertIsValidToCreate("RFQ-010PRL:EMR-RFA-071", Boolean.TRUE);
+ ITUtilNames.assertIsValidToCreate("RFQ-010PRL:EMR-RFA-071", Boolean.TRUE);
}
@Test
@@ -377,17 +377,17 @@ class NamesIT {
try {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
- ITUtilNameElement.assertExists("RFQ-010PRL:EMR-RFA-051", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-051", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ-010PRL:EMR-RFA-051", Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ-010PRL:EMR-RFA-051", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-051", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ-010PRL:EMR-RFA-051", Boolean.TRUE);
// validate create
- ITUtilNameElement.assertValidate("[{asdf]", NameCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilNameElement.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilNames.assertValidate("[{asdf]", NameCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilNames.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// ----------
// system structure
@@ -396,18 +396,18 @@ class NamesIT {
// comment
nameElementCommandCreate.setDescription("description");
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandCreate.setComment("comment");
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// convention name exists
// already exists since create subsystem was approved
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
// ----------
// system structure + device structure + index
@@ -416,11 +416,11 @@ class NamesIT {
// comment
nameElementCommandCreate.setIndex("051");
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandCreate.setParentDeviceStructure(deviceTypeRFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
// ----------
@@ -428,8 +428,8 @@ class NamesIT {
nameElementCommandCreate.setIndex(null);
nameElementCommandCreate.setParentDeviceStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// ----------
// system structure
@@ -440,8 +440,8 @@ class NamesIT {
// convention name exists
// already exists since create system was approved
nameElementCommandCreate.setParentSystemStructure(systemRFQ);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
// ----------
// system structure + device structure + index
@@ -450,11 +450,11 @@ class NamesIT {
// comment
nameElementCommandCreate.setIndex("051");
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandCreate.setParentDeviceStructure(deviceTypeRFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
// ----------
@@ -462,8 +462,8 @@ class NamesIT {
nameElementCommandCreate.setIndex(null);
nameElementCommandCreate.setParentDeviceStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// ----------
// system structure
@@ -474,7 +474,7 @@ class NamesIT {
// convention name exists
// already exists since create system group was approved
nameElementCommandCreate.setParentSystemStructure(systemGroupAcc);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
// ----------
// system structure + device structure + index
@@ -483,14 +483,14 @@ class NamesIT {
// comment
nameElementCommandCreate.setIndex("051");
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandCreate.setParentDeviceStructure(deviceTypeTT);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
nameElementCommandCreate.setParentDeviceStructure(deviceTypeRFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
// ----------
@@ -498,8 +498,8 @@ class NamesIT {
nameElementCommandCreate.setIndex(null);
nameElementCommandCreate.setParentDeviceStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// ----------
// system structure + device structure
@@ -510,27 +510,27 @@ class NamesIT {
// convention name exists
// already exists since create system was approved
nameElementCommandCreate.setParentSystemStructure(systemRFQ);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
nameElementCommandCreate.setParentDeviceStructure(deviceTypeRFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandCreate.setIndex("051");
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
// ----------
// random uuid
nameElementCommandCreate.setParentSystemStructure(UUID.randomUUID());
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_NOT_FOUND);
nameElementCommandCreate.setParentSystemStructure(systemRFQ);
nameElementCommandCreate.setParentDeviceStructure(UUID.randomUUID());
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_NOT_FOUND);
} catch (Exception e) {
fail();
}
@@ -565,26 +565,26 @@ class NamesIT {
subsystem010PRL, deviceTypeRFA, "061",
"description", "comment");
- ITUtilNameElement.assertExists("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ-010PRL:EMR-RFA-052", Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ-010PRL:EMR-RFA-052", Boolean.TRUE);
- ITUtilNameElement.assertValidate(
+ ITUtilNames.assertValidate(
"[" + mapper.writeValueAsString(nameElementCommandCreate) + "," + mapper.writeValueAsString(nameElementCommandCreate2) + "]",
NameCommand.CREATE, HttpURLConnection.HTTP_OK);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate2, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate2, NameCommand.CREATE, Boolean.TRUE);
// create
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
- ITUtilNameElement.assertExists("RFQ-010PRL:EMR-RFA-052", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
+ ITUtilNames.assertExists("RFQ-010PRL:EMR-RFA-052", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertCreate(nameElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
} catch (IOException e) {
fail();
} catch (Exception e) {
@@ -625,93 +625,93 @@ class NamesIT {
"description", "comment");
// create
- createdNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ createdNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElement);
// validate update
nameElementCommandUpdate.setUuid(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandUpdate.setUuid(createdNameElement.getUuid());
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setDescription(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandUpdate.setDescription("checkUpdate");
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setComment(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandUpdate.setComment("checkUpdate");
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
// ----------
nameElementCommandUpdate.setParentSystemStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandUpdate.setParentSystemStructure(systemGroupAcc);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setParentSystemStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandUpdate.setParentSystemStructure(systemRFQ);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setParentSystemStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// subsystemN1U1 used in isLegacyName but not here
// order of tests not guaranteed
nameElementCommandUpdate.setParentSystemStructure(subsystem010PRL);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
// ----------
nameElementCommandUpdate.setParentDeviceStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// convention name exists
// already exists since create subsystem was approved
nameElementCommandUpdate.setIndex(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
nameElementCommandUpdate.setIndex("053");
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandUpdate.setParentDeviceStructure(deviceGroupEMR);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
nameElementCommandUpdate.setParentDeviceStructure(deviceTypeFS);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setParentDeviceStructure(deviceTypeTT);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setParentDeviceStructure(deviceTypeRFA);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setIndex(null);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandUpdate.setIndex("053");
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
// system structure, device structure not used for validation
@@ -719,18 +719,18 @@ class NamesIT {
// random uuid
nameElementCommandUpdate.setUuid(UUID.randomUUID());
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
nameElementCommandUpdate.setUuid(createdNameElement.getUuid());
nameElementCommandUpdate.setParentSystemStructure(UUID.randomUUID());
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
nameElementCommandUpdate.setParentSystemStructure(subsystem010PRL);
nameElementCommandUpdate.setParentDeviceStructure(UUID.randomUUID());
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
} catch (Exception e) {
fail();
}
@@ -762,30 +762,30 @@ class NamesIT {
nameElementCommandCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommand);
nameElementCommandUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommand);
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
// create
- createdNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ createdNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
// status code
nameElementCommandUpdate.setUuid(UUID.randomUUID());
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
nameElementCommandUpdate.setUuid(createdNameElement.getUuid());
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setDescription("updated description");
nameElementCommandUpdate.setComment("updated comment");
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
// update
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate);
nameElementCommandUpdate.setDescription("another description");
nameElementCommandUpdate.setComment("another comment");
- ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -819,30 +819,30 @@ class NamesIT {
"description", "comment");
// create
- createdNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ createdNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElement);
// validate delete
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
nameElementCommandConfirm.setUuid(null);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
- ITUtilNameElement.assertDelete(nameElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertDelete(nameElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
- ITUtilNameElement.assertDelete(nameElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertDelete(nameElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
nameElementCommandConfirm.setUuid(createdNameElement.getUuid());
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
nameElementCommandConfirm.setComment(null);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
- ITUtilNameElement.assertDelete(nameElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertDelete(nameElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
nameElementCommandConfirm.setComment("checkDelete");
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -871,23 +871,23 @@ class NamesIT {
subsystem010PRL, deviceTypeRFA, "056",
"description", "comment");
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.DELETE, Boolean.FALSE);
// create
- createdNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ createdNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElement);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
nameElementCommandConfirm.setComment("deleted comment");
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
// delete
- ITUtilNameElement.assertDelete(nameElementCommandConfirm);
+ ITUtilNames.assertDelete(nameElementCommandConfirm);
- ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
- ITUtilNameElement.assertDelete(nameElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertDelete(nameElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
} catch (Exception e) {
fail();
}
@@ -919,62 +919,62 @@ class NamesIT {
"description", "comment");
// create
- nameElement1 = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ nameElement1 = ITUtilNames.assertCreate(nameElementCommandCreate);
uuid = nameElement1.getUuid();
nameElementCommandCreate = new NameElementCommandCreate(
subsystem010, deviceTypeFS, "002",
"description", "comment");
- responseNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ responseNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
uuid2 = responseNameElement.getUuid();
nameElementCommandCreate = new NameElementCommandCreate(
subsystem010, deviceTypeFS, "003",
"description", "comment");
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
subsystem010, deviceTypeFS, "004",
"description", "comment");
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
subsystem010, deviceTypeFS, "005",
"description", "comment");
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
subsystem010, deviceTypeFS, "006",
"description", "comment");
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
subsystem010, deviceTypeFS, "007",
"description", "comment");
- nameElement7 = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ nameElement7 = ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
subsystem010, deviceTypeFS, "008",
"description", "comment");
- nameElement8 = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ nameElement8 = ITUtilNames.assertCreate(nameElementCommandCreate);
// update element 1 twice
nameElementCommandUpdate = NameElementUtil.convertElement2CommandUpdate(nameElement1);
nameElementCommandUpdate.setDescription("updated description");
nameElementCommandUpdate.setComment("updated comment");
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate);
nameElementCommandUpdate.setDescription("updated description again");
nameElementCommandUpdate.setComment("updated comment again");
- ITUtilNameElement.assertUpdate(nameElementCommandUpdate);
+ ITUtilNames.assertUpdate(nameElementCommandUpdate);
// delete element 7, 8
nameElementCommandConfirm = NameElementUtil.convertElement2CommandConfirm(nameElement7);
- ITUtilNameElement.assertDelete(nameElementCommandConfirm);
+ ITUtilNames.assertDelete(nameElementCommandConfirm);
nameElementCommandConfirm = NameElementUtil.convertElement2CommandConfirm(nameElement8);
- ITUtilNameElement.assertDelete(nameElementCommandConfirm);
+ ITUtilNames.assertDelete(nameElementCommandConfirm);
try {
// read & search
@@ -990,134 +990,134 @@ class NamesIT {
// content for field in first and last items - always possible
// first and last items - not always possible
- ITUtilNameElement.assertRead("", 13, -1);
-
- ITUtilNameElement.assertRead("?deleted=false", 11, -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%", 10, -1);
- ITUtilNameElement.assertRead("?name=RFQ-10%", 0);
-
- ITUtilNameElement.assertRead("?nameEquivalence=RFQ-10%", 10, -1);
-
- ITUtilNameElement.assertRead("?systemStructure=RFQ-010", 9, -1);
- ITUtilNameElement.assertRead("?systemStructure=RFQ-0", 0);
- ITUtilNameElement.assertRead("?systemStructure=RFQ-0__", 9, -1);
- ITUtilNameElement.assertRead("?systemStructure=RFQ-N1U1", 1, -1);
-
- 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", 13, -1);
- ITUtilNameElement.assertRead("?who=test", 0);
- ITUtilNameElement.assertRead("?who=who", 0);
- ITUtilNameElement.assertRead("?who=test%", 13, -1);
- ITUtilNameElement.assertRead("?who=%who", 13, -1);
- ITUtilNameElement.assertRead("?who=%est%", 13, -1);
- ITUtilNameElement.assertRead("?who=%wh%", 13, -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);
-
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS&page=0&pageSize=100", 8);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS&page=1&pageSize=100", 0);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS&page=0&pageSize=8", 8);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS&page=1&pageSize=8", 0);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS&page=0&pageSize=3", 3);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS&page=1&pageSize=3", 3);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS&page=2&pageSize=3", 2);
- ITUtilNameElement.assertRead("?deviceStructure=EMR-FS&page=3&pageSize=3", 0);
-
- response = ITUtilNameElement.assertRead("?index=00_&page=0&pageSize=3&orderBy=WHEN&isAsc=true", 3);
- response2 = ITUtilNameElement.assertRead("?index=00_&page=2&pageSize=3&orderBy=WHEN&isAsc=false", 2);
+ ITUtilNames.assertRead("", 13, -1);
+
+ ITUtilNames.assertRead("?deleted=false", 11, -1);
+ ITUtilNames.assertRead("?deleted=true", 2, -1);
+
+ ITUtilNames.assertRead("?uuid=" + deviceTypeFS.toString(), 0);
+ ITUtilNames.assertRead("?uuid=" + uuid.toString(), 1);
+
+ ITUtilNames.assertRead("?name=RFQ-010:EMR-FS-005", 1);
+ ITUtilNames.assertRead("?name=RFQ-010%", 10, -1);
+ ITUtilNames.assertRead("?name=RFQ-10%", 0);
+
+ ITUtilNames.assertRead("?nameEquivalence=RFQ-10%", 10, -1);
+
+ ITUtilNames.assertRead("?systemStructure=RFQ-010", 9, -1);
+ ITUtilNames.assertRead("?systemStructure=RFQ-0", 0);
+ ITUtilNames.assertRead("?systemStructure=RFQ-0__", 9, -1);
+ ITUtilNames.assertRead("?systemStructure=RFQ-N1U1", 1, -1);
+
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS", 8);
+ ITUtilNames.assertRead("?deviceStructure=EMR-F", 0);
+ ITUtilNames.assertRead("?deviceStructure=EMR-F_", 8);
+ ITUtilNames.assertRead("?deviceStructure=EMR-TT", 0);
+
+ ITUtilNames.assertRead("?index=003", 1);
+
+ ITUtilNames.assertRead("?description=description", 7, -1);
+ ITUtilNames.assertRead("?description=%description%", 8, -1);
+ ITUtilNames.assertRead("?description=updated description", 0, -1);
+ ITUtilNames.assertRead("?description=updated description%", 1, -1);
+ ITUtilNames.assertRead("?description=updated description again", 1);
+
+ ITUtilNames.assertRead("?who=test who", 13, -1);
+ ITUtilNames.assertRead("?who=test", 0);
+ ITUtilNames.assertRead("?who=who", 0);
+ ITUtilNames.assertRead("?who=test%", 13, -1);
+ ITUtilNames.assertRead("?who=%who", 13, -1);
+ ITUtilNames.assertRead("?who=%est%", 13, -1);
+ ITUtilNames.assertRead("?who=%wh%", 13, -1);
+ ITUtilNames.assertRead("?who=wh%", 0);
+ ITUtilNames.assertRead("?who=asdf", 0);
+ ITUtilNames.assertRead("?who=%asdf%", 0);
+
+ ITUtilNames.assertRead("?nameEquivalence=RFQ-10%&deviceStructure=EMR-FS", 8);
+
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS&page=0&pageSize=100", 8);
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS&page=1&pageSize=100", 0);
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS&page=0&pageSize=8", 8);
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS&page=1&pageSize=8", 0);
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS&page=0&pageSize=3", 3);
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS&page=1&pageSize=3", 3);
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS&page=2&pageSize=3", 2);
+ ITUtilNames.assertRead("?deviceStructure=EMR-FS&page=3&pageSize=3", 0);
+
+ response = ITUtilNames.assertRead("?index=00_&page=0&pageSize=3&orderBy=WHEN&isAsc=true", 3);
+ response2 = ITUtilNames.assertRead("?index=00_&page=2&pageSize=3&orderBy=WHEN&isAsc=false", 2);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
- response = ITUtilNameElement.assertRead("?index=00_&page=0&pageSize=3&orderBy=WHEN&isAsc=false", 3);
- response2 = ITUtilNameElement.assertRead("?index=00_&page=2&pageSize=3&orderBy=WHEN&isAsc=true", 2);
+ response = ITUtilNames.assertRead("?index=00_&page=0&pageSize=3&orderBy=WHEN&isAsc=false", 3);
+ response2 = ITUtilNames.assertRead("?index=00_&page=2&pageSize=3&orderBy=WHEN&isAsc=true", 2);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
// 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);
- ITUtilNameElement.assertRead("/RFQ-010:EMR-FS-0%", 6);
+ ITUtilNames.assertRead("/" + systemGroupAcc.toString(), 0);
+ ITUtilNames.assertRead("/" + systemRFQ.toString(), 0);
+ ITUtilNames.assertRead("/" + subsystem010.toString(), 0);
+ ITUtilNames.assertRead("/" + disciplineEMR.toString(), 0);
+ ITUtilNames.assertRead("/" + deviceGroupEMR.toString(), 0);
+ ITUtilNames.assertRead("/" + deviceTypeFS.toString(), 0);
+ ITUtilNames.assertRead("/" + uuid.toString(), 1);
+ ITUtilNames.assertRead("/RFQ-010:EMR-FS-001", 1);
+ ITUtilNames.assertRead("/RFQ-010:EMR-FS-0", 0);
+ ITUtilNames.assertRead("/RFQ-010:EMR-FS-0__", 6);
+ ITUtilNames.assertRead("/RFQ-010:EMR-FS-0%", 6);
// system structure mnemonic path
// /systemStructure/{mnemonicPath}
- ITUtilNameElement.assertRead("/systemStructure/RFQ-010", 7, -1);
- ITUtilNameElement.assertRead("/systemStructure/RFQ-0", 0);
- ITUtilNameElement.assertRead("/systemStructure/RFQ-0__", 7, -1);
- ITUtilNameElement.assertRead("/systemStructure/RFQ-N1U1", 0, -1);
+ ITUtilNames.assertRead("/systemStructure/RFQ-010", 7, -1);
+ ITUtilNames.assertRead("/systemStructure/RFQ-0", 0);
+ ITUtilNames.assertRead("/systemStructure/RFQ-0__", 7, -1);
+ ITUtilNames.assertRead("/systemStructure/RFQ-N1U1", 0, -1);
// device structure mnemonic path
// /deviceStructure/{mnemonicPath}
- ITUtilNameElement.assertRead("/deviceStructure/EMR-FS", 6);
- ITUtilNameElement.assertRead("/deviceStructure/EMR-F", 0);
- ITUtilNameElement.assertRead("/deviceStructure/EMR-F_", 6);
- ITUtilNameElement.assertRead("/deviceStructure/EMR-TT", 0);
+ ITUtilNames.assertRead("/deviceStructure/EMR-FS", 6);
+ ITUtilNames.assertRead("/deviceStructure/EMR-F", 0);
+ ITUtilNames.assertRead("/deviceStructure/EMR-F_", 6);
+ ITUtilNames.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);
-
- // /history?parameter=value
+ // /history/names/{uuid}
+ ITUtilHistory.assertHistoryNames("/" + systemGroupAcc.toString(), 0);
+ ITUtilHistory.assertHistoryNames("/" + systemRFQ.toString(), 0);
+ ITUtilHistory.assertHistoryNames("/" + subsystem010.toString(), 0);
+ ITUtilHistory.assertHistoryNames("/" + disciplineEMR.toString(), 0);
+ ITUtilHistory.assertHistoryNames("/" + deviceGroupEMR.toString(), 0);
+ ITUtilHistory.assertHistoryNames("/" + deviceTypeFS.toString(), 0);
+ ITUtilHistory.assertHistoryNames("/" + uuid.toString(), 3);
+ ITUtilHistory.assertHistoryNames("/" + uuid2.toString(), 1);
+
+ // /history/names?parameter=value
// parameter must be available
- ITUtilNameElement.assertRead("/history?uuid=" + uuid.toString(), 3);
- ITUtilNameElement.assertRead("/history?uuid=" + uuid2.toString(), 1);
- 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);
- ITUtilNameElement.assertRead("/history?index=003", 1, -1);
- ITUtilNameElement.assertRead("/history?description=updated description%", 3, -1);
- ITUtilNameElement.assertRead("/history?who=test%", 17, -1);
-
- ITUtilNameElement.assertRead("/history?uuid=" + uuid.toString() + "&description=updated%", 3);
-
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=0&pageSize=100", 12);
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=1&pageSize=100", 0);
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=0&pageSize=12", 12);
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=1&pageSize=12", 0);
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=0&pageSize=5", 5);
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=1&pageSize=5", 5);
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=2&pageSize=5", 2);
- ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=3&pageSize=5", 0);
-
- response = ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=0&pageSize=5&orderBy=WHEN&isAsc=true", 5);
- response2 = ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=2&pageSize=5&orderBy=WHEN&isAsc=false", 2);
+ ITUtilHistory.assertHistoryNames("?uuid=" + uuid.toString(), 3);
+ ITUtilHistory.assertHistoryNames("?uuid=" + uuid2.toString(), 1);
+ ITUtilHistory.assertHistoryNames("?name=%010%", 14, -1);
+ ITUtilHistory.assertHistoryNames("?nameEquivalence=RFQ-10%", 14, -1);
+ ITUtilHistory.assertHistoryNames("?systemStructure=RFQ-0__", 13, -1);
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS", 12);
+ ITUtilHistory.assertHistoryNames("?index=003", 1, -1);
+ ITUtilHistory.assertHistoryNames("?description=updated description%", 3, -1);
+ ITUtilHistory.assertHistoryNames("?who=test%", 17, -1);
+
+ ITUtilHistory.assertHistoryNames("?uuid=" + uuid.toString() + "&description=updated%", 3);
+
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=0&pageSize=100", 12);
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=1&pageSize=100", 0);
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=0&pageSize=12", 12);
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=1&pageSize=12", 0);
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=0&pageSize=5", 5);
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=1&pageSize=5", 5);
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=2&pageSize=5", 2);
+ ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=3&pageSize=5", 0);
+
+ response = ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=0&pageSize=5&orderBy=WHEN&isAsc=true", 5);
+ response2 = ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=2&pageSize=5&orderBy=WHEN&isAsc=false", 2);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- response = ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=0&pageSize=5&orderBy=WHEN&isAsc=false", 5);
- response2 = ITUtilNameElement.assertRead("/history?deviceStructure=EMR-FS&page=2&pageSize=5&orderBy=WHEN&isAsc=true", 2);
+ response = ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=0&pageSize=5&orderBy=WHEN&isAsc=false", 5);
+ response2 = ITUtilHistory.assertHistoryNames("?deviceStructure=EMR-FS&page=2&pageSize=5&orderBy=WHEN&isAsc=true", 2);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
} catch (Exception e) {
fail();
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index ae18fec670fe867b8bc52113d22a8c8191d8b41e..1da25a6b49f39042f6eb8d33ddb8aa2f8bb12aee 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -106,14 +106,14 @@ class StructuresDeviceGroupIT {
Type.DISCIPLINE, null,
"name", "Di",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "Di2",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
discipline2Uuid = approvedStructureElement.getUuid();
}
@@ -125,7 +125,7 @@ class StructuresDeviceGroupIT {
// what
// read equivalence mnemonic
- ITUtilStructureElement.assertEquivalence("Dg", "DG");
+ ITUtilStructures.assertEquivalence("Dg", "DG");
}
@Test
@@ -150,44 +150,44 @@ class StructuresDeviceGroupIT {
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "CC", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "CC", Boolean.FALSE);
- ITUtilStructureElement.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setType(Type.DEVICEGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setParent(disciplineUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setType(Type.DEVICEGROUP);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -216,116 +216,116 @@ class StructuresDeviceGroupIT {
// mnemonic rules
structureElementCommandCreate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("C");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Ccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Ccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Ccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Ccccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// mnemonic rules (2)
structureElementCommandCreate.setMnemonic(" ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Grp ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Grp");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("000");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Grp0");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic(":");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Grp:");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Grp: ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("1");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("12");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("123");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("1234");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("12345");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("123456");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("1234567");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("12345678");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("123456789");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -358,39 +358,39 @@ class StructuresDeviceGroupIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(createdStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -423,39 +423,39 @@ class StructuresDeviceGroupIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -488,39 +488,39 @@ class StructuresDeviceGroupIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -563,70 +563,70 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate update
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setType(Type.SYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setType(Type.DEVICEGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setParent(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setParent(disciplineUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setName(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setMnemonic("Cu");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setDescription(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -659,34 +659,34 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -721,34 +721,34 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update cancel check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -783,34 +783,34 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -849,42 +849,42 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate delete
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setType(Type.SYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setType(Type.DEVICEGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -916,33 +916,33 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -976,33 +976,33 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment update delete check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1036,33 +1036,33 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1092,61 +1092,61 @@ class StructuresDeviceGroupIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rsha", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
// approve
- approvedStructureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ approvedStructureElement = ITUtilStructures.assertApprove(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + approvedStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED", 1, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + approvedStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rsha", 0);
- ITUtilStructureElement.assertRead("/history/" + approvedStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + approvedStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1176,61 +1176,61 @@ class StructuresDeviceGroupIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rshc", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
// cancel
- cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ cancelledStructureElement = ITUtilStructures.assertCancel(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED", 1, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rshc", 0);
- ITUtilStructureElement.assertRead("/history/" + cancelledStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + cancelledStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1260,61 +1260,61 @@ class StructuresDeviceGroupIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rshr", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
// reject
- rejectedStructureElement = ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ rejectedStructureElement = ITUtilStructures.assertReject(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED", 1, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rshr", 0);
- ITUtilStructureElement.assertRead("/history/" + rejectedStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + rejectedStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1359,7 +1359,7 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
@@ -1367,7 +1367,7 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
@@ -1375,7 +1375,7 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
@@ -1383,7 +1383,7 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
try {
@@ -1395,26 +1395,26 @@ class StructuresDeviceGroupIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid3.toString(), 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/C1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/R1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A1", 0);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di-P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di-C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di-R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di-A1", Boolean.FALSE);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid3.toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P1", 0);
+ ITUtilStructures.assertRead("/mnemonic/C1", 0);
+ ITUtilStructures.assertRead("/mnemonic/R1", 0);
+ ITUtilStructures.assertRead("/mnemonic/A1", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 2);
+
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di-P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di-C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di-R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di-A1", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1460,104 +1460,104 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ responseStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
uuid = responseStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ responseStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
uuid2 = responseStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ responseStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
uuid3 = responseStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ responseStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
uuid4 = responseStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
// from first structure element
@@ -1568,26 +1568,26 @@ class StructuresDeviceGroupIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P9", 0);
- ITUtilStructureElement.assertRead("/mnemonic/C9", 0);
- ITUtilStructureElement.assertRead("/mnemonic/R9", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A9", 0);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 17);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 18);
-
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di-P9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di-C9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di-R9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di-A9", Boolean.FALSE);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 2);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 2);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid3.toString(), 2);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P9", 0);
+ ITUtilStructures.assertRead("/mnemonic/C9", 0);
+ ITUtilStructures.assertRead("/mnemonic/R9", 0);
+ ITUtilStructures.assertRead("/mnemonic/A9", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 17);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 18);
+
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di-P9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di-C9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di-R9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di-A9", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1621,107 +1621,107 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
String description2 = "some other description";
String comment2 = "some other comment";
@@ -1732,162 +1732,162 @@ class StructuresDeviceGroupIT {
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, discipline2Uuid,
"name", null,
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
// 60 device group entries
@@ -1909,151 +1909,151 @@ class StructuresDeviceGroupIT {
// content for field in first and last items - always possible
// first and last items - not always possible
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2", 30);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonicPath=Di2", 5);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonicPath=Di2", 20);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonicPath=Di2", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonicPath=Di2", 5);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2", 25);
-
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=false&mnemonicPath=Di2", 15);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=false&statuses=PENDING&mnemonicPath=Di2", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=false&statuses=APPROVED&mnemonicPath=Di2", 15);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=false&statuses=CANCELLED&mnemonicPath=Di2", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=false&statuses=REJECTED&mnemonicPath=Di2", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2", 15);
-
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=true&mnemonicPath=Di2", 15);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=true&statuses=PENDING&mnemonicPath=Di2", 5);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=true&statuses=APPROVED&mnemonicPath=Di2", 5);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=true&statuses=CANCELLED&mnemonicPath=Di2", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=true&statuses=REJECTED&mnemonicPath=Di2", 5);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2", 10);
-
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + discipline2Uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 2);
-
- 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?mnemonicPath=Di2&page=0&pageSize=100", 30);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=30", 30);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=1&pageSize=30", 0);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=1&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=2&pageSize=12", 6);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=3&pageSize=12", 0);
-
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2&page=0&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2&page=1&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2&page=2&pageSize=12", 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2&page=3&pageSize=12", 0);
-
- response = ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=12&orderBy=WHEN&isAsc=true", 12);
- response2 = ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=2&pageSize=12&orderBy=WHEN&isAsc=false", 6);
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2", 30);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&mnemonicPath=Di2", 5);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonicPath=Di2", 20);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonicPath=Di2", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonicPath=Di2", 5);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2", 25);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=false&mnemonicPath=Di2", 15);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=false&statuses=PENDING&mnemonicPath=Di2", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=false&statuses=APPROVED&mnemonicPath=Di2", 15);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=false&statuses=CANCELLED&mnemonicPath=Di2", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=false&statuses=REJECTED&mnemonicPath=Di2", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2", 15);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=true&mnemonicPath=Di2", 15);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=true&statuses=PENDING&mnemonicPath=Di2", 5);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=true&statuses=APPROVED&mnemonicPath=Di2", 5);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=true&statuses=CANCELLED&mnemonicPath=Di2", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=true&statuses=REJECTED&mnemonicPath=Di2", 5);
+ ITUtilStructures.assertRead("/DEVICEGROUP?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2", 10);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + discipline2Uuid.toString(), 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 2);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?parent=" + discipline2Uuid.toString(), 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?parent=" + uuid.toString(), 0);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?name=na", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?name=na_", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?name=na__", 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?name=na___", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?name=na%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?name=name", 45, -1);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicEquivalence=A__", 0);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonic=A__", 0);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?description=desc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?description=desc%", 35, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?description=sc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?description=sc%", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?description=%sc", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?description=%sc%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?description=description", 35, -1);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=test who", 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=test", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=who", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=test%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=%who", 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=%est%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=%wh%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=wh%", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=asdf", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?who=%asdf%", 0);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=100", 30);
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=1&pageSize=100", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=30", 30);
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=1&pageSize=30", 0);
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=12", 12);
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=1&pageSize=12", 12);
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=2&pageSize=12", 6);
+ ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=3&pageSize=12", 0);
+
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2&page=0&pageSize=12", 12);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2&page=1&pageSize=12", 12);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2&page=2&pageSize=12", 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP?statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2&page=3&pageSize=12", 0);
+
+ response = ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=12&orderBy=WHEN&isAsc=true", 12);
+ response2 = ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=2&pageSize=12&orderBy=WHEN&isAsc=false", 6);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
- response = ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=12&orderBy=WHEN&isAsc=false", 12);
- response2 = ITUtilStructureElement.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=2&pageSize=12&orderBy=WHEN&isAsc=true", 6);
+ response = ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=0&pageSize=12&orderBy=WHEN&isAsc=false", 12);
+ response2 = ITUtilStructures.assertRead("/DEVICEGROUP?mnemonicPath=Di2&page=2&pageSize=12&orderBy=WHEN&isAsc=true", 6);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
// children
// /children/{uuid}
// uuid, type, statuses, deleted, name, mnemonic, mnemonicEquivalence, mnemonicPath, description
- ITUtilStructureElement.assertRead("/children/" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/children/" + discipline2Uuid.toString(), 15, -1);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=DEVICEGROUP", 0);
- ITUtilStructureElement.assertRead("/children/" + discipline2Uuid.toString() + "?type=DEVICEGROUP", 0);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=DISCIPLINE", 0);
- ITUtilStructureElement.assertRead("/children/" + discipline2Uuid.toString() + "?type=DISCIPLINE", 15, -1);
+ ITUtilStructures.assertRead("/children/" + uuid.toString(), 0);
+ ITUtilStructures.assertRead("/children/" + discipline2Uuid.toString(), 15, -1);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=DEVICEGROUP", 0);
+ ITUtilStructures.assertRead("/children/" + discipline2Uuid.toString() + "?type=DEVICEGROUP", 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=DISCIPLINE", 0);
+ ITUtilStructures.assertRead("/children/" + discipline2Uuid.toString() + "?type=DISCIPLINE", 15, -1);
// 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);
+ ITUtilStructures.assertRead("/mnemonic/A", 0);
+ ITUtilStructures.assertRead("/mnemonic/A__", 0);
+ ITUtilStructures.assertRead("/mnemonic/AG_", 0);
+ ITUtilStructures.assertRead("/mnemonic/AG1", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di2", 1);
// mnemonic path
// /mnemonicPath/{mnemonicPath}
- ITUtilStructureElement.assertRead("/mnemonicPath/D", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/D%", 17, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/D__", 16, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di_", 16, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di2", 16);
+ ITUtilStructures.assertRead("/mnemonicPath/D", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/D%", 17, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/D__", 16, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Di_", 16, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Di2", 16);
// history
- // /history/{uuid}
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + disciplineUuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + discipline2Uuid.toString(), 2);
+ // /history/structures/{uuid}
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + disciplineUuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + discipline2Uuid.toString(), 2);
- // /history?parameter=value
+ // /history/structures?parameter=value
// type 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=" + disciplineUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&uuid=" + discipline2Uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&parent=" + disciplineUuid.toString(), 0, -1);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&parent=" + discipline2Uuid.toString(), 100);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&name=na%", 100, -1);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&mnemonic=AF_", 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&mnemonicEquivalence=_A_", 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&who=%wh%", 100, -1);
-
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&uuid=" + uuid2.toString() + "&description=more%", 8);
-
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=0&pageSize=100", 40);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=0&pageSize=40", 40);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=1&pageSize=40", 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=0&pageSize=15", 15);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=1&pageSize=15", 15);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=2&pageSize=15", 10);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=3&pageSize=15", 0);
-
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=0&pageSize=15&orderBy=WHEN&isAsc=true", 15);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=2&pageSize=15&orderBy=WHEN&isAsc=false", 10);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&uuid=" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&uuid=" + uuid2.toString(), 8);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&uuid=" + disciplineUuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&uuid=" + discipline2Uuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&parent=" + uuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&parent=" + disciplineUuid.toString(), 0, -1);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&parent=" + discipline2Uuid.toString(), 100);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&name=na%", 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&mnemonic=AF_", 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&mnemonicEquivalence=_A_", 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%", 40);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&who=%wh%", 100, -1);
+
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&uuid=" + uuid2.toString() + "&description=more%", 8);
+
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=0&pageSize=100", 40);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=1&pageSize=100", 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=0&pageSize=40", 40);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=1&pageSize=40", 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=0&pageSize=15", 15);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=1&pageSize=15", 15);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=2&pageSize=15", 10);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=3&pageSize=15", 0);
+
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=0&pageSize=15&orderBy=WHEN&isAsc=true", 15);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=2&pageSize=15&orderBy=WHEN&isAsc=false", 10);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=0&pageSize=15&orderBy=WHEN&isAsc=false", 15);
- ITUtilStructureElement.assertRead("/history?type=DEVICEGROUP&description=%other%&page=2&pageSize=15&orderBy=WHEN&isAsc=true", 10);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=0&pageSize=15&orderBy=WHEN&isAsc=false", 15);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICEGROUP&description=%other%&page=2&pageSize=15&orderBy=WHEN&isAsc=true", 10);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Di2", Boolean.FALSE);
} catch (Exception e) {
fail();
}
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index 7a686552e6f85a9be603b96e73d5e664066ffb09..40e16ffa3a7f122e98a261d5a573ef0aea0554e7 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -106,14 +106,14 @@ class StructuresDeviceTypeIT {
Type.DISCIPLINE, null,
"name", "Di",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupUuid = approvedStructureElement.getUuid();
}
@@ -125,7 +125,7 @@ class StructuresDeviceTypeIT {
// what
// read equivalence mnemonic
- ITUtilStructureElement.assertEquivalence("Dt", "DT");
+ ITUtilStructures.assertEquivalence("Dt", "DT");
}
@Test
@@ -150,55 +150,55 @@ class StructuresDeviceTypeIT {
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "CC", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Db-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Db-CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "DB-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "DB-CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-CC", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "DI-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "DI-CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DI", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "DI-Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "DI-DI", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "CC", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
-
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "CC", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Db-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Db-CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "DB-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "DB-CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-CC", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "DI-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "DI-CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DI", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "DI-Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "DI-DI", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "CC", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
+
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setType(Type.DEVICETYPE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setParent(deviceGroupUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -227,103 +227,103 @@ class StructuresDeviceTypeIT {
// mnemonic rules
structureElementCommandCreate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("C");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Ccccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// mnemonic rules (2)
structureElementCommandCreate.setMnemonic(" ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Dev ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Dev");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("000");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Dev0");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic(":");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Dev:");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Dev: ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("1");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12345");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123456");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234567");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("12345678");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("123456789");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -356,35 +356,35 @@ class StructuresDeviceTypeIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(createdStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -417,40 +417,40 @@ class StructuresDeviceTypeIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -483,40 +483,40 @@ class StructuresDeviceTypeIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -559,70 +559,70 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "Cu",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate update
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setType(Type.SUBSYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setType(Type.DEVICETYPE);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setParent(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setParent(deviceGroupUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setName(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setMnemonic("Cu");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setDescription(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -655,34 +655,34 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "Ua",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -717,34 +717,34 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "Uc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update cancel check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -779,34 +779,34 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "Ur",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -845,42 +845,42 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "Cd",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate delete
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setType(Type.SUBSYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setType(Type.DEVICETYPE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -912,33 +912,33 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "Da",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -972,40 +972,40 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "Dc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment update delete check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1039,26 +1039,26 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "Dr",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1088,63 +1088,63 @@ class StructuresDeviceTypeIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rsha", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Rsha", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Rsha", Boolean.FALSE);
// approve
- approvedStructureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ approvedStructureElement = ITUtilStructures.assertApprove(structureElementCommandConfirm);
// 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&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + approvedStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rsha", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rsha", 1);
-
- ITUtilStructureElement.assertRead("/history/" + approvedStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Rsha", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Rsha", Boolean.TRUE);
+ assertEquals(length, ITUtilStructures.assertRead("/DEVICETYPE", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED", 1, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + approvedStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rsha", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rsha", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + approvedStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Rsha", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1174,63 +1174,63 @@ class StructuresDeviceTypeIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rshc", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Rshc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Rshc", Boolean.FALSE);
// cancel
- cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ cancelledStructureElement = ITUtilStructures.assertCancel(structureElementCommandConfirm);
// 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&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rshc", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rshc", 0);
-
- ITUtilStructureElement.assertRead("/history/" + cancelledStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Rshc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Rshc", Boolean.FALSE);
+ assertEquals(length, ITUtilStructures.assertRead("/DEVICETYPE", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED", 1, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rshc", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rshc", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + cancelledStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Rshc", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1260,63 +1260,63 @@ class StructuresDeviceTypeIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rshr", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Rshr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Rshr", Boolean.FALSE);
// reject
- rejectedStructureElement = ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ rejectedStructureElement = ITUtilStructures.assertReject(structureElementCommandConfirm);
// 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&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Di", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Di-Rshr", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Di", 1, -1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Di-Rshr", 0);
-
- ITUtilStructureElement.assertRead("/history/" + rejectedStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Rshr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Rshr", Boolean.FALSE);
+ assertEquals(length, ITUtilStructures.assertRead("/DEVICETYPE", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED", 1, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Di", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Di-Rshr", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Di", 1, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-Rshr", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + rejectedStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Rshr", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1361,7 +1361,7 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "P1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
@@ -1369,7 +1369,7 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "C1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
@@ -1377,7 +1377,7 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "R1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
@@ -1385,7 +1385,7 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "A1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
try {
@@ -1397,29 +1397,29 @@ class StructuresDeviceTypeIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid3.toString(), 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/C1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/R1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A1", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "A1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-A1", Boolean.TRUE);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid3.toString(), 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P1", 0);
+ ITUtilStructures.assertRead("/mnemonic/C1", 0);
+ ITUtilStructures.assertRead("/mnemonic/R1", 0);
+ ITUtilStructures.assertRead("/mnemonic/A1", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 2);
+
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "A1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-A1", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1465,104 +1465,104 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "P9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "C9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "R9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "A9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
// from first structure element
@@ -1573,29 +1573,29 @@ class StructuresDeviceTypeIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/C9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/R9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/A9", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 17);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 18);
-
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "P9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "C9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "R9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "A9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-P9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-C9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-R9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-A9", Boolean.TRUE);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 2);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 2);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid3.toString(), 2);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P9", 1);
+ ITUtilStructures.assertRead("/mnemonic/C9", 1);
+ ITUtilStructures.assertRead("/mnemonic/R9", 1);
+ ITUtilStructures.assertRead("/mnemonic/A9", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 17);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 18);
+
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "P9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "C9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "R9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "A9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-P9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-C9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-R9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-A9", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1629,107 +1629,107 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "AA1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AA2",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AA3",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AA4",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AA5",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AB1",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AB2",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AB3",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AB4",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AB5",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AC1",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AC2",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AC3",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AC4",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AC5",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AD1",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AD2",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AD3",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AD4",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AD5",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
String description2 = "some other description";
String comment2 = "some other comment";
@@ -1740,162 +1740,162 @@ class StructuresDeviceTypeIT {
Type.DEVICETYPE, deviceGroupUuid,
"name", "AE1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AE2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AE3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AE4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AE5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AF1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AF1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AF3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AF4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AF5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AG1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AG2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AG3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AG4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "AG5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
// 60 device type entries
@@ -1917,198 +1917,198 @@ class StructuresDeviceTypeIT {
// content for field in first and last items - always possible
// first and last items - not always possible
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__", 45);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=A__", 20);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=false&mnemonic=A__", 30);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=false&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=true&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=true&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DEVICETYPE?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + disciplineUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + deviceGroupUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 2);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?parent=" + disciplineUuid.toString(), 0);
- 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?mnemonic=A__&page=0&pageSize=100", 45);
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=45", 45);
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=1&pageSize=45", 0);
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=1&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=2&pageSize=20", 5);
- ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=3&pageSize=20", 0);
-
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
- ITUtilStructureElement.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
-
- response = ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
- response2 = ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__", 45);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=A__", 20);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=false&mnemonic=A__", 30);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=false&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=true&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=true&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + disciplineUuid.toString(), 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + deviceGroupUuid.toString(), 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 2);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?parent=" + disciplineUuid.toString(), 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?parent=" + deviceGroupUuid.toString(), 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?parent=" + uuid.toString(), 0);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?name=na", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?name=na_", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?name=na__", 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?name=na___", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?name=na%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?name=name", 45, -1);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonicEquivalence=A__", 45, -1);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonicPath=A__", 0);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?description=desc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?description=desc%", 35, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?description=sc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?description=sc%", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?description=%sc", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?description=%sc%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?description=description", 35, -1);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?who=test who", 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=test", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=who", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=test%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=%who", 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=%est%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=%wh%", 45, -1);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=wh%", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=asdf", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?who=%asdf%", 0);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=100", 45);
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=1&pageSize=100", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=45", 45);
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=1&pageSize=45", 0);
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=20", 20);
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=1&pageSize=20", 20);
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=2&pageSize=20", 5);
+ ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=3&pageSize=20", 0);
+
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
+ ITUtilStructures.assertRead("/DEVICETYPE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
+
+ response = ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
+ response2 = ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
- response = ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
- response2 = ITUtilStructureElement.assertRead("/DEVICETYPE?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
+ response = ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
+ response2 = ITUtilStructures.assertRead("/DEVICETYPE?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
// children
// /children/{uuid}
// uuid, type, statuses, deleted, name, mnemonic, mnemonicEquivalence, mnemonicPath, description
- ITUtilStructureElement.assertRead("/children/" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/children/" + deviceGroupUuid.toString(), 15, -1);
- ITUtilStructureElement.assertRead("/children/" + disciplineUuid.toString(), 1);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=DEVICETYPE", 0);
- ITUtilStructureElement.assertRead("/children/" + deviceGroupUuid.toString() + "?type=DEVICETYPE", 0);
- ITUtilStructureElement.assertRead("/children/" + disciplineUuid.toString() + "?type=DEVICETYPE", 0);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=DEVICEGROUP", 0);
- ITUtilStructureElement.assertRead("/children/" + deviceGroupUuid.toString() + "?type=DEVICEGROUP", 15, -1);
- ITUtilStructureElement.assertRead("/children/" + disciplineUuid.toString() + "?type=DEVICEGROUP", 0);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=DISCIPLINE", 0);
- ITUtilStructureElement.assertRead("/children/" + deviceGroupUuid.toString() + "?type=DISCIPLINE", 0);
- ITUtilStructureElement.assertRead("/children/" + disciplineUuid.toString() + "?type=DISCIPLINE", 1);
+ ITUtilStructures.assertRead("/children/" + uuid.toString(), 0);
+ ITUtilStructures.assertRead("/children/" + deviceGroupUuid.toString(), 15, -1);
+ ITUtilStructures.assertRead("/children/" + disciplineUuid.toString(), 1);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=DEVICETYPE", 0);
+ ITUtilStructures.assertRead("/children/" + deviceGroupUuid.toString() + "?type=DEVICETYPE", 0);
+ ITUtilStructures.assertRead("/children/" + disciplineUuid.toString() + "?type=DEVICETYPE", 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=DEVICEGROUP", 0);
+ ITUtilStructures.assertRead("/children/" + deviceGroupUuid.toString() + "?type=DEVICEGROUP", 15, -1);
+ ITUtilStructures.assertRead("/children/" + disciplineUuid.toString() + "?type=DEVICEGROUP", 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=DISCIPLINE", 0);
+ ITUtilStructures.assertRead("/children/" + deviceGroupUuid.toString() + "?type=DISCIPLINE", 0);
+ ITUtilStructures.assertRead("/children/" + disciplineUuid.toString() + "?type=DISCIPLINE", 1);
// 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);
+ ITUtilStructures.assertRead("/mnemonic/A", 0);
+ ITUtilStructures.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructures.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructures.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);
+ ITUtilStructures.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/A__", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/AG_", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/AG1", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-A%", 15, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Di-AG_", 5);
+ ITUtilStructures.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);
+ // /history/structures/{uuid}
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + deviceGroupUuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + disciplineUuid.toString(), 2);
- // /history?parameter=value
+ // /history/structures?parameter=value
// type 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?type=DEVICETYPE&uuid=" + disciplineUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&parent=" + uuid2.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&parent=" + deviceGroupUuid.toString(), 100, -1);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&parent=" + disciplineUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&name=na%", 100, -1);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&who=%wh%", 100, -1);
-
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&uuid=" + uuid2.toString() + "&description=more%", 8);
-
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=100", 20);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=1&pageSize=20", 0);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=1&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=2&pageSize=8", 4);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=3&pageSize=8", 0);
-
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&uuid=" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&uuid=" + uuid2.toString(), 8);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&uuid=" + deviceGroupUuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&uuid=" + disciplineUuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&parent=" + uuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&parent=" + uuid2.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&parent=" + deviceGroupUuid.toString(), 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&parent=" + disciplineUuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&name=na%", 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_", 20);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonicEquivalence=_A_", 10);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&description=%other%", 40);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&who=%wh%", 100, -1);
+
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&uuid=" + uuid2.toString() + "&description=more%", 8);
+
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=100", 20);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=1&pageSize=100", 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=20", 20);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=1&pageSize=20", 0);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=1&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=2&pageSize=8", 4);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=3&pageSize=8", 0);
+
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
- ITUtilStructureElement.assertRead("/history?type=DEVICETYPE&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
+ ITUtilHistory.assertHistoryStructures("?type=DEVICETYPE&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AA1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AA2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AA3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AA4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AA5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AB1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AB2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AB3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AB4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AB5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AC1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AC2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AC3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AC4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AC5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AD1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AD2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AD3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AD4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AD5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AE1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AE2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AE3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AE4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AE5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AF1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AF2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AF3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AF4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AF5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AG1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AG2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AG3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AG4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-AG5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AA1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AA2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AA3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AA4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AA5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AB1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AB2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AB3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AB4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AB5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AC1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AC2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AC3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AC4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AC5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AD1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AD2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AD3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AD4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AD5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AE1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AE2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AE3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AE4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AE5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AF1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AF2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AF3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AF4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AF5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AG1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AG2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AG3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AG4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-AG5", Boolean.TRUE);
} catch (Exception e) {
fail();
}
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index 109a74ce7182308935d1a593d961a573ea9c8f5f..37d50f5174fa7677562041d21ebfbc032ad6e171 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -99,7 +99,7 @@ class StructuresDisciplineIT {
// what
// read equivalence mnemonic
- ITUtilStructureElement.assertEquivalence("Di", "D1");
+ ITUtilStructures.assertEquivalence("Di", "D1");
}
@Test
@@ -123,39 +123,39 @@ class StructuresDisciplineIT {
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "CC", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "CC", Boolean.TRUE);
- ITUtilStructureElement.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setType(Type.DISCIPLINE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -183,90 +183,90 @@ class StructuresDisciplineIT {
// mnemonic rules
structureElementCommandCreate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("C");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("Cccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("Ccccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
// mnemonic rules (2)
structureElementCommandCreate.setMnemonic(" ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("Dis ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("Dis");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("000");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Dis0");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic(":");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("Dis:");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("Dis: ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("1");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12345");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123456");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234567");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("12345678");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandCreate.setMnemonic("123456789");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -299,35 +299,35 @@ class StructuresDisciplineIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(createdStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -360,40 +360,40 @@ class StructuresDisciplineIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -426,40 +426,40 @@ class StructuresDisciplineIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -501,63 +501,63 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "Cu",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate update
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setType(Type.SYSTEMGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setType(Type.DISCIPLINE);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setName(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setMnemonic("Cu");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setDescription(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -590,34 +590,34 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "Ua",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -652,34 +652,34 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "Uc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update cancel check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -714,34 +714,34 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "Ur",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -780,42 +780,42 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "Cd",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate delete
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setType(Type.SYSTEMGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setType(Type.DISCIPLINE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -847,33 +847,33 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "Da",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -907,33 +907,33 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "Dc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment update delete check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -967,33 +967,33 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "Dr",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1023,53 +1023,53 @@ class StructuresDisciplineIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Rsha", Boolean.FALSE);
// approve
- approvedStructureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ approvedStructureElement = ITUtilStructures.assertApprove(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + approvedStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED", 1, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + approvedStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 1);
- ITUtilStructureElement.assertRead("/history/" + approvedStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + approvedStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Rsha", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Rsha", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1099,53 +1099,53 @@ class StructuresDisciplineIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Rshc", Boolean.FALSE);
// cancel
- cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ cancelledStructureElement = ITUtilStructures.assertCancel(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED", 1, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/history/" + cancelledStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + cancelledStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Rshc", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1175,53 +1175,53 @@ class StructuresDisciplineIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Rshr", Boolean.FALSE);
// reject
- rejectedStructureElement = ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ rejectedStructureElement = ITUtilStructures.assertReject(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED", 1, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/history/" + rejectedStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + rejectedStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Rshr", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1266,7 +1266,7 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "P1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
@@ -1274,7 +1274,7 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "C1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
@@ -1282,7 +1282,7 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "R1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
@@ -1290,7 +1290,7 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "A1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
try {
@@ -1302,25 +1302,25 @@ class StructuresDisciplineIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid3.toString(), 1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/C1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/R1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A1", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "A1", Boolean.TRUE);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid3.toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P1", 0);
+ ITUtilStructures.assertRead("/mnemonic/C1", 0);
+ ITUtilStructures.assertRead("/mnemonic/R1", 0);
+ ITUtilStructures.assertRead("/mnemonic/A1", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 2);
+
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "A1", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1366,104 +1366,104 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "P9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "C9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "R9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "A9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
// from first structure element
@@ -1474,25 +1474,25 @@ class StructuresDisciplineIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/C9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/R9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/A9", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 17);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 18);
-
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "P9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "C9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "R9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "A9", Boolean.TRUE);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 2);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 2);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid3.toString(), 2);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P9", 1);
+ ITUtilStructures.assertRead("/mnemonic/C9", 1);
+ ITUtilStructures.assertRead("/mnemonic/R9", 1);
+ ITUtilStructures.assertRead("/mnemonic/A9", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 17);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 18);
+
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "P9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "C9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "R9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "A9", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1527,107 +1527,107 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "AA1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AA2",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AA3",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AA4",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AA5",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AB1",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AB2",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AB3",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AB4",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AB5",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AC1",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AC2",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AC3",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AC4",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AC5",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AD1",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AD2",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AD3",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AD4",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AD5",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
String description2 = "some other description";
String comment2 = "some other comment";
@@ -1638,162 +1638,162 @@ class StructuresDisciplineIT {
Type.DISCIPLINE, null,
"name", "AE1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AE2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AE3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AE4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AE5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AF1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AF2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AF3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AF4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AF5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AG1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AG2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AG3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AG4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "AG5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
// 60 discipline entries
@@ -1815,177 +1815,177 @@ class StructuresDisciplineIT {
// content for field in first and last items - always possible
// first and last items - not always possible
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__", 45);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=A__", 20);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
-
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=false&mnemonic=A__", 30);
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=false&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
-
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=true&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=true&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/DISCIPLINE?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
- 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?parent=" + uuid.toString(), 0);
-
- ITUtilStructureElement.assertRead("/DISCIPLINE?name=na", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?name=na_", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?name=na__", 45, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?name=na___", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?name=na%", 45, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?name=name", 45, -1);
-
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonicEquivalence=A__", 45, -1);
-
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonicPath=A__", 45, -1);
-
- ITUtilStructureElement.assertRead("/DISCIPLINE?description=desc", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?description=desc%", 35, -1);
- ITUtilStructureElement.assertRead("/DISCIPLINE?description=sc", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?description=sc%", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?description=%sc", 0);
- 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?mnemonic=A__&page=0&pageSize=100", 45);
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=45", 45);
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=1&pageSize=45", 0);
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=1&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=2&pageSize=20", 5);
- ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=3&pageSize=20", 0);
-
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
- ITUtilStructureElement.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
-
- response = ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
- response2 = ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__", 45);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=A__", 20);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=false&mnemonic=A__", 30);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=false&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=true&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=true&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 2);
+ ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuidRandom.toString(), 0);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?parent=" + uuid.toString(), 0);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?name=na", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?name=na_", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?name=na__", 45, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?name=na___", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?name=na%", 45, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?name=name", 45, -1);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonicEquivalence=A__", 45, -1);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonicPath=A__", 45, -1);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?description=desc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?description=desc%", 35, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?description=sc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?description=sc%", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?description=%sc", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?description=%sc%", 45, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?description=description", 35, -1);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?who=test who", 45, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=test", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=who", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=test%", 45, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=%who", 45, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=%est%", 45, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=%wh%", 45, -1);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=wh%", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=asdf", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?who=%asdf%", 0);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=100", 45);
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=1&pageSize=100", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=45", 45);
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=1&pageSize=45", 0);
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=20", 20);
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=1&pageSize=20", 20);
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=2&pageSize=20", 5);
+ ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=3&pageSize=20", 0);
+
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
+ ITUtilStructures.assertRead("/DISCIPLINE?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
+
+ response = ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
+ response2 = ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
- response = ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
- response2 = ITUtilStructureElement.assertRead("/DISCIPLINE?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
+ response = ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
+ response2 = ITUtilStructures.assertRead("/DISCIPLINE?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
// children
// /children/{uuid}
// uuid, type, statuses, deleted, name, mnemonic, mnemonicEquivalence, mnemonicPath, description
- ITUtilStructureElement.assertRead("/children/" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=DISCIPLINE", 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString(), 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=DISCIPLINE", 0);
// mnemonic
// /mnemonic/{mnemonic}
- ITUtilStructureElement.assertRead("/mnemonic/A", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructures.assertRead("/mnemonic/A", 0);
+ ITUtilStructures.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructures.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);
+ ITUtilStructures.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/AG_", 5);
+ ITUtilStructures.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);
+ // /history/structures/{uuid}
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 8);
+ ITUtilHistory.assertHistoryStructures("/" + uuidRandom.toString(), 0);
- // /history?parameter=value
+ // /history/structures?parameter=value
// type 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?type=DISCIPLINE&parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&parent=" + uuid2.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&parent=" + uuidRandom.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&name=na%", 100, -1);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&who=%wh%", 100, -1);
-
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&uuid=" + uuid2.toString() + "&description=more%", 8);
-
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=100", 20);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=1&pageSize=20", 0);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=1&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=2&pageSize=8", 4);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=3&pageSize=8", 0);
-
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&uuid=" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&uuid=" + uuid2.toString(), 8);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&uuid=" + uuidRandom.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&parent=" + uuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&parent=" + uuid2.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&parent=" + uuidRandom.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&name=na%", 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_", 20);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonicEquivalence=_A_", 10);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&description=%other%", 40);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&who=%wh%", 100, -1);
+
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&uuid=" + uuid2.toString() + "&description=more%", 8);
+
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=100", 20);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=1&pageSize=100", 0);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=20", 20);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=1&pageSize=20", 0);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=1&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=2&pageSize=8", 4);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=3&pageSize=8", 0);
+
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
- ITUtilStructureElement.assertRead("/history?type=DISCIPLINE&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
+ ITUtilHistory.assertHistoryStructures("?type=DISCIPLINE&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AA1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AA2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AA3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AA4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AA5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AB1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AB2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AB3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AB4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AB5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AC1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AC2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AC3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AC4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AC5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AD1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AD2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AD3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AD4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AD5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AE1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AE2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AE3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AE4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AE5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AF1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AF2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AF3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AF4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AF5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AG1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AG2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AG3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AG4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "AG5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AA1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AA2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AA3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AA4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AA5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AB1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AB2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AB3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AB4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AB5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AC1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AC2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AC3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AC4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AC5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AD1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AD2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AD3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AD4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AD5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AE1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AE2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AE3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AE4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AE5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AF1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AF2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AF3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AF4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AF5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AG1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AG2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AG3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AG4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "AG5", Boolean.TRUE);
} catch (Exception e) {
fail();
}
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index 32f8948e66f432cb4fb00b933db7230e1c6da395..78e2b088c16919369d762c2a8c425a1d4fe80c2d 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -106,14 +106,14 @@ class StructuresSubsystemIT {
Type.SYSTEMGROUP, null,
"name", "Sg",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "Sys",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemUuid = approvedStructureElement.getUuid();
}
@@ -125,7 +125,7 @@ class StructuresSubsystemIT {
// what
// read equivalence mnemonic
- ITUtilStructureElement.assertEquivalence("Sub", "SUB");
+ ITUtilStructures.assertEquivalence("Sub", "SUB");
}
@Test
@@ -151,56 +151,56 @@ class StructuresSubsystemIT {
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-Sys-Sg", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-Sys-Sys", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-Sys-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-CC", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "SYS-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "SYS-CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Sg", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SG", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Sys", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SYS", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "CC", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
-
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-Sys-Sg", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-Sys-Sys", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-Sys-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sg-CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-CC", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "SYS-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "SYS-CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Sg", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SG", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Sys", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SYS", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "CC", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
+
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setType(Type.SUBSYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setParent(systemUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -229,99 +229,99 @@ class StructuresSubsystemIT {
// mnemonic rules
structureElementCommandCreate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("C");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// mnemonic rules (2)
structureElementCommandCreate.setMnemonic(" ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sub ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sub");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("000");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Sub0");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic(":");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sub:");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sub: ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("1");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12345");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123456");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234567");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12345678");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123456789");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -354,35 +354,35 @@ class StructuresSubsystemIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(createdStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -415,40 +415,40 @@ class StructuresSubsystemIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -481,40 +481,40 @@ class StructuresSubsystemIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -557,70 +557,70 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "Cu",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate update
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setType(Type.DEVICETYPE);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setType(Type.SUBSYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setParent(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setParent(systemUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setName(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setMnemonic("Cu");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setDescription(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -653,34 +653,34 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "Ua",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -715,34 +715,34 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "Uc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update cancel check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -777,34 +777,34 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "Ur",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -843,42 +843,42 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "Cd",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate delete
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setType(Type.DEVICETYPE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setType(Type.SUBSYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -910,33 +910,33 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "Da",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -970,33 +970,33 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "Dc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment update delete check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1030,33 +1030,33 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "Dr",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1086,77 +1086,77 @@ class StructuresSubsystemIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// 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&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sys-Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys-Rsha", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys-Rsha", 0);
-
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Rsha", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Rsha", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rsha", Boolean.FALSE);
+ length = ITUtilStructures.assertRead("/SUBSYSTEM", 1, -1).getListSize();
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sys-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys-Rsha", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys-Rsha", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rsha", Boolean.FALSE);
// approve
- approvedStructureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ approvedStructureElement = ITUtilStructures.assertApprove(structureElementCommandConfirm);
// 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&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + approvedStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sys-Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys-Rsha", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-Rsha", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys-Rsha", 0);
-
- ITUtilStructureElement.assertRead("/history/" + approvedStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Rsha", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Rsha", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rsha", Boolean.FALSE);
+ assertEquals(length, ITUtilStructures.assertRead("/SUBSYSTEM", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED", 1, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + approvedStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sys-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys-Rsha", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys-Rsha", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + approvedStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Rsha", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rsha", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1186,77 +1186,77 @@ class StructuresSubsystemIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// 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&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sys-Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys-Rshc", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys-Rshc", 0);
-
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Rshc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Rshc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rshc", Boolean.FALSE);
+ length = ITUtilStructures.assertRead("/SUBSYSTEM", 1, -1).getListSize();
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sys-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys-Rshc", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys-Rshc", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rshc", Boolean.FALSE);
// cancel
- cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ cancelledStructureElement = ITUtilStructures.assertCancel(structureElementCommandConfirm);
// 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&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sys-Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys-Rshc", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys-Rshc", 0);
-
- ITUtilStructureElement.assertRead("/history/" + cancelledStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Rshc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Rshc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rshc", Boolean.FALSE);
+ assertEquals(length, ITUtilStructures.assertRead("/SUBSYSTEM", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED", 1, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sys-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys-Rshc", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys-Rshc", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + cancelledStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rshc", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1286,77 +1286,77 @@ class StructuresSubsystemIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// 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&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sys-Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys-Rshr", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys-Rshr", 0);
-
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Rshr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Rshr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rshr", Boolean.FALSE);
+ length = ITUtilStructures.assertRead("/SUBSYSTEM", 1, -1).getListSize();
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sys-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys-Rshr", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys-Rshr", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rshr", Boolean.FALSE);
// reject
- rejectedStructureElement = ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ rejectedStructureElement = ITUtilStructures.assertReject(structureElementCommandConfirm);
// 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&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sys-Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Sys-Rshr", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sys-Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Sys-Rshr", 0);
-
- ITUtilStructureElement.assertRead("/history/" + rejectedStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Rshr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Rshr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rshr", Boolean.FALSE);
+ assertEquals(length, ITUtilStructures.assertRead("/SUBSYSTEM", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED", 1, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sys-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Sys-Rshr", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys-Rshr", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + rejectedStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-Rshr", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1401,7 +1401,7 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "P1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
@@ -1409,7 +1409,7 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "C1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
@@ -1417,7 +1417,7 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "R1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
@@ -1425,7 +1425,7 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "A1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
try {
@@ -1437,33 +1437,33 @@ class StructuresSubsystemIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid3.toString(), 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/C1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/R1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A1", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "A1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-A1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-A1", Boolean.FALSE);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid3.toString(), 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P1", 0);
+ ITUtilStructures.assertRead("/mnemonic/C1", 0);
+ ITUtilStructures.assertRead("/mnemonic/R1", 0);
+ ITUtilStructures.assertRead("/mnemonic/A1", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "A1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-A1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-A1", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1509,104 +1509,104 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "P9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "C9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "R9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "A9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
// from first structure element
@@ -1617,33 +1617,33 @@ class StructuresSubsystemIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/C9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/R9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/A9", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 17);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 18);
-
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "P9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "C9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "R9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "A9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-P9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-C9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-R9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-A9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-P9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-C9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-R9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sg-Sys-A9", Boolean.FALSE);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 2);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 2);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid3.toString(), 2);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P9", 1);
+ ITUtilStructures.assertRead("/mnemonic/C9", 1);
+ ITUtilStructures.assertRead("/mnemonic/R9", 1);
+ ITUtilStructures.assertRead("/mnemonic/A9", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 17);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 18);
+
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "P9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "C9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "R9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "A9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-P9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-C9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-R9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-A9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-P9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-C9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-R9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sg-Sys-A9", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1677,107 +1677,107 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "AA1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AA2",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AA3",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AA4",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AA5",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AB1",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AB2",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AB3",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AB4",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AB5",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AC1",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AC2",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AC3",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AC4",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AC5",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AD1",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AD2",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AD3",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AD4",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AD5",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
String description2 = "some other description";
String comment2 = "some other comment";
@@ -1788,162 +1788,162 @@ class StructuresSubsystemIT {
Type.SUBSYSTEM, systemUuid,
"name", "AE1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AE2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AE3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AE4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AE5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AF1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AF2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AF3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AF4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AF5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AG1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AG2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AG3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AG4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "AG5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
// 60 subsystem entries
@@ -1965,208 +1965,208 @@ class StructuresSubsystemIT {
// content for field in first and last items - always possible
// first and last items - not always possible
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__", 45);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=A__", 20);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=false&mnemonic=A__", 30);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=false&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=true&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=true&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + systemGroupUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + systemUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 2);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?parent=" + systemGroupUuid.toString(), 0);
- 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?mnemonic=A__&page=0&pageSize=100", 45);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=45", 45);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=1&pageSize=45", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=1&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=2&pageSize=20", 5);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=3&pageSize=20", 0);
-
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
-
- response = ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
- response2 = ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__", 45);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=A__", 20);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=false&mnemonic=A__", 30);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=false&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=true&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=true&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + systemGroupUuid.toString(), 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + systemUuid.toString(), 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 2);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?parent=" + systemGroupUuid.toString(), 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?parent=" + systemUuid.toString(), 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?parent=" + uuid.toString(), 0);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?name=na", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?name=na_", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?name=na__", 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?name=na___", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?name=na%", 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?name=name", 45, -1);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonicEquivalence=A__", 45, -1);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonicPath=A__", 0);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?description=desc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?description=desc%", 35, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?description=sc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?description=sc%", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?description=%sc", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?description=%sc%", 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?description=description", 35, -1);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=test who", 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=test", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=who", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=test%", 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=%who", 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=%est%", 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=%wh%", 45, -1);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=wh%", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=asdf", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?who=%asdf%", 0);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=100", 45);
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=1&pageSize=100", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=45", 45);
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=1&pageSize=45", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=20", 20);
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=1&pageSize=20", 20);
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=2&pageSize=20", 5);
+ ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=3&pageSize=20", 0);
+
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
+
+ response = ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
+ response2 = ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
- response = ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
- response2 = ITUtilStructureElement.assertRead("/SUBSYSTEM?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
+ response = ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
+ response2 = ITUtilStructures.assertRead("/SUBSYSTEM?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
// children
// /children/{uuid}
// uuid, type, statuses, deleted, name, mnemonic, mnemonicEquivalence, mnemonicPath, description
- ITUtilStructureElement.assertRead("/children/" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/children/" + systemUuid.toString(), 15, -1);
- ITUtilStructureElement.assertRead("/children/" + systemGroupUuid.toString(), 1);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=SUBSYSTEM", 0);
- ITUtilStructureElement.assertRead("/children/" + systemUuid.toString() + "?type=SUBSYSTEM", 0);
- ITUtilStructureElement.assertRead("/children/" + systemGroupUuid.toString() + "?type=SUBSYSTEM", 0);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=SYSTEM", 0);
- ITUtilStructureElement.assertRead("/children/" + systemUuid.toString() + "?type=SYSTEM", 15, -1);
- ITUtilStructureElement.assertRead("/children/" + systemGroupUuid.toString() + "?type=SYSTEM", 0);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=SYSTEMGROUP", 0);
- ITUtilStructureElement.assertRead("/children/" + systemUuid.toString() + "?type=SYSTEMGROUP", 0);
- ITUtilStructureElement.assertRead("/children/" + systemGroupUuid.toString() + "?type=SYSTEMGROUP", 1);
+ ITUtilStructures.assertRead("/children/" + uuid.toString(), 0);
+ ITUtilStructures.assertRead("/children/" + systemUuid.toString(), 15, -1);
+ ITUtilStructures.assertRead("/children/" + systemGroupUuid.toString(), 1);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=SUBSYSTEM", 0);
+ ITUtilStructures.assertRead("/children/" + systemUuid.toString() + "?type=SUBSYSTEM", 0);
+ ITUtilStructures.assertRead("/children/" + systemGroupUuid.toString() + "?type=SUBSYSTEM", 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=SYSTEM", 0);
+ ITUtilStructures.assertRead("/children/" + systemUuid.toString() + "?type=SYSTEM", 15, -1);
+ ITUtilStructures.assertRead("/children/" + systemGroupUuid.toString() + "?type=SYSTEM", 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=SYSTEMGROUP", 0);
+ ITUtilStructures.assertRead("/children/" + systemUuid.toString() + "?type=SYSTEMGROUP", 0);
+ ITUtilStructures.assertRead("/children/" + systemGroupUuid.toString() + "?type=SYSTEMGROUP", 1);
// 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);
+ ITUtilStructures.assertRead("/mnemonic/A", 0);
+ ITUtilStructures.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructures.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructures.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);
+ ITUtilStructures.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/A__", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/AG_", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/AG1", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-A%", 15, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-AG_", 5);
+ ITUtilStructures.assertRead("/mnemonicPath/Sys-AG1", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-A%", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-A__", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-AG_", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-AG1", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys%", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys__", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Sys_", 0);
+ ITUtilStructures.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);
+ // /history/structures/{uuid}
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + systemUuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + systemGroupUuid.toString(), 2);
- // /history?parameter=value
+ // /history/structures?parameter=value
// type 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?type=SUBSYSTEM&uuid=" + systemGroupUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&parent=" + uuid2.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&parent=" + systemUuid.toString(), 100, -1);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&parent=" + systemGroupUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&name=na%", 100, -1);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&who=%wh%", 100, -1);
-
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&uuid=" + uuid2.toString() + "&description=more%", 8);
-
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=100", 20);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=1&pageSize=20", 0);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=1&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=2&pageSize=8", 4);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=3&pageSize=8", 0);
-
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&uuid=" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&uuid=" + uuid2.toString(), 8);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&uuid=" + systemUuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&uuid=" + systemGroupUuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&parent=" + uuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&parent=" + uuid2.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&parent=" + systemUuid.toString(), 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&parent=" + systemGroupUuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&name=na%", 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonicEquivalence=_A_", 10);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&description=%other%", 40);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&who=%wh%", 100, -1);
+
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&uuid=" + uuid2.toString() + "&description=more%", 8);
+
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=100", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=1&pageSize=100", 0);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=20", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=1&pageSize=20", 0);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=1&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=2&pageSize=8", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=3&pageSize=8", 0);
+
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
- ITUtilStructureElement.assertRead("/history?type=SUBSYSTEM&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SUBSYSTEM&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AA1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AA2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AA3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AA4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AA5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AB1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AB2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AB3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AB4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AB5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AC1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AC2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AC3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AC4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AC5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AD1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AD2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AD3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AD4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AD5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AE1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AE2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AE3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AE4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AE5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AF1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AF2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AF3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AF4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AF5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AG1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AG2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AG3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AG4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-AG5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AA1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AA2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AA3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AA4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AA5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AB1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AB2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AB3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AB4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AB5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AC1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AC2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AC3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AC4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AC5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AD1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AD2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AD3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AD4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AD5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AE1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AE2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AE3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AE4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AE5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AF1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AF2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AF3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AF4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AF5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AG1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AG2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AG3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AG4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-AG5", Boolean.TRUE);
} catch (Exception e) {
fail();
}
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index ffb14091d5ac4ca3df114d10765bb5f290745036..ccdee52f0d3197ae70e1711ca6f9a96b6e7d5724 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -98,7 +98,7 @@ class StructuresSystemGroupIT {
// what
// read equivalence mnemonic
- ITUtilStructureElement.assertEquivalence("Sg", "SG");
+ ITUtilStructures.assertEquivalence("Sg", "SG");
}
@Test
@@ -125,47 +125,47 @@ class StructuresSystemGroupIT {
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "CC", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "CC", Boolean.TRUE);
// validate create
- ITUtilStructureElement.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setType(Type.SYSTEMGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -193,107 +193,107 @@ class StructuresSystemGroupIT {
// mnemonic rules
structureElementCommandCreate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("C");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Ccccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// mnemonic rules (2)
structureElementCommandCreate.setMnemonic(" ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sys ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sys");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("000");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Sys0");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic(":");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sys:");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sys: ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("1");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12345");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123456");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234567");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("12345678");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("123456789");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Ac1");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Acc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -328,43 +328,43 @@ class StructuresSystemGroupIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
uuid = createdStructureElement.getUuid();
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// create
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name2", null,
"description2", "comment2");
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// create
@@ -372,7 +372,7 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name3", null,
"description3", "comment3");
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
assertNotEquals(uuid, uuid2);
@@ -410,50 +410,50 @@ class StructuresSystemGroupIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
structureElementCommandConfirm.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setType(Type.SYSTEMGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
structureElementCommandConfirm.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setComment("comment");
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -486,40 +486,40 @@ class StructuresSystemGroupIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -561,62 +561,62 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "Cu",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate update
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setType(Type.DISCIPLINE);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setType(Type.SYSTEMGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setName(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setMnemonic("Cu");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setDescription(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -649,35 +649,35 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "Ua",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setDescription("description update approve check");
structureElementCommandUpdate.setComment("comment update approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -712,35 +712,35 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "Uc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setDescription("description update cancel check");
structureElementCommandUpdate.setComment("comment update cancel check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -775,35 +775,35 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "Ur",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setDescription("description update reject check");
structureElementCommandUpdate.setComment("comment update reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -842,42 +842,42 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "Cd",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate delete
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setType(Type.DISCIPLINE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setType(Type.SYSTEMGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -909,33 +909,33 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "Da",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -969,33 +969,33 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "Dc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment update delete check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1029,33 +1029,33 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "Dr",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1085,53 +1085,53 @@ class StructuresSystemGroupIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Rsha", Boolean.FALSE);
// approve
- approvedStructureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ approvedStructureElement = ITUtilStructures.assertApprove(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + approvedStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + approvedStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 1);
- ITUtilStructureElement.assertRead("/history/" + approvedStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + approvedStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Rsha", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Rsha", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1161,53 +1161,53 @@ class StructuresSystemGroupIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Rshc", Boolean.FALSE);
// cancel
- cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ cancelledStructureElement = ITUtilStructures.assertCancel(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/history/" + cancelledStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + cancelledStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Rshc", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1237,53 +1237,53 @@ class StructuresSystemGroupIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Rshr", Boolean.FALSE);
// reject
- rejectedStructureElement = ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ rejectedStructureElement = ITUtilStructures.assertReject(structureElementCommandConfirm);
// read (2)
- assertEquals(length, ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize());
+ assertEquals(length, ITUtilStructures.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&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/history/" + rejectedStructureElement.getUuid().toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + rejectedStructureElement.getUuid().toString(), 2);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Rshr", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1328,7 +1328,7 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "P1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
@@ -1336,7 +1336,7 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "C1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
@@ -1344,7 +1344,7 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "R1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
@@ -1352,7 +1352,7 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "A1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
try {
@@ -1364,25 +1364,25 @@ class StructuresSystemGroupIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid3.toString(), 1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/C1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/R1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A1", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "A1", Boolean.TRUE);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid3.toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P1", 0);
+ ITUtilStructures.assertRead("/mnemonic/C1", 0);
+ ITUtilStructures.assertRead("/mnemonic/R1", 0);
+ ITUtilStructures.assertRead("/mnemonic/A1", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "A1", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1428,104 +1428,104 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "P9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "C9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "R9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "A9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
// from first structure element
@@ -1536,25 +1536,25 @@ class StructuresSystemGroupIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/C9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/R9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/A9", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 17);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 18);
-
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "P9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "C9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "R9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "A9", Boolean.TRUE);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 2);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 2);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid3.toString(), 2);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P9", 1);
+ ITUtilStructures.assertRead("/mnemonic/C9", 1);
+ ITUtilStructures.assertRead("/mnemonic/R9", 1);
+ ITUtilStructures.assertRead("/mnemonic/A9", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 17);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 18);
+
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "P9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "C9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "R9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "A9", Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1589,107 +1589,107 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "AA1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AA2",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AA3",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AA4",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AA5",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AB1",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AB2",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AB3",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AB4",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AB5",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AC1",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AC2",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AC3",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AC4",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AC5",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AD1",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AD2",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AD3",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AD4",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AD5",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
String description2 = "some other description";
String comment2 = "some other comment";
@@ -1700,162 +1700,162 @@ class StructuresSystemGroupIT {
Type.SYSTEMGROUP, null,
"name", "AE1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AE2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AE3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AE4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AE5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AF1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AF2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AF3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AF4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AF5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AG1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AG2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AG3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AG4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
"name", "AG5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
// 60 system group entries
@@ -1877,177 +1877,177 @@ class StructuresSystemGroupIT {
// content for field in first and last items - always possible
// first and last items - not always possible
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__", 45);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=A__", 20);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
-
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=false&mnemonic=A__", 30);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=false&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
-
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=true&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=true&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
- 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?parent=" + uuid.toString(), 0);
-
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?name=na", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?name=na_", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?name=na__", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?name=na___", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?name=na%", 45, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?name=name", 45, -1);
-
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonicEquivalence=A__", 45, -1);
-
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonicPath=A__", 45, -1);
-
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?description=desc", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?description=desc%", 35, -1);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?description=sc", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?description=sc%", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?description=%sc", 0);
- 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?mnemonic=A__&page=0&pageSize=100", 45);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=45", 45);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=1&pageSize=45", 0);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=1&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=2&pageSize=20", 5);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=3&pageSize=20", 0);
-
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
-
- response = ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
- response2 = ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__", 45);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=A__", 20);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=false&mnemonic=A__", 30);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=false&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=true&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=true&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 2);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuidRandom.toString(), 0);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?parent=" + uuid.toString(), 0);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?name=na", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?name=na_", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?name=na__", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?name=na___", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?name=na%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?name=name", 45, -1);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonicEquivalence=A__", 45, -1);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonicPath=A__", 45, -1);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?description=desc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?description=desc%", 35, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?description=sc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?description=sc%", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?description=%sc", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?description=%sc%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?description=description", 35, -1);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=test who", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=test", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=who", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=test%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=%who", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=%est%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=%wh%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=wh%", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=asdf", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?who=%asdf%", 0);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=100", 45);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=1&pageSize=100", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=45", 45);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=1&pageSize=45", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=20", 20);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=1&pageSize=20", 20);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=2&pageSize=20", 5);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=3&pageSize=20", 0);
+
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
+ ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
+
+ response = ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
+ response2 = ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
- response = ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
- response2 = ITUtilStructureElement.assertRead("/SYSTEMGROUP?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
+ response = ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
+ response2 = ITUtilStructures.assertRead("/SYSTEMGROUP?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
// children
// /children/{uuid}
// uuid, type, statuses, deleted, name, mnemonic, mnemonicEquivalence, mnemonicPath, description
- ITUtilStructureElement.assertRead("/children/" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=SYSTEMGROUP", 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString(), 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=SYSTEMGROUP", 0);
// mnemonic
// /mnemonic/{mnemonic}
- ITUtilStructureElement.assertRead("/mnemonic/A", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A__", 15, -1);
- ITUtilStructureElement.assertRead("/mnemonic/AG_", 5);
- ITUtilStructureElement.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructures.assertRead("/mnemonic/A", 0);
+ ITUtilStructures.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructures.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);
+ ITUtilStructures.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/AG_", 5);
+ ITUtilStructures.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);
+ // /history/structures/{uuid}
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 8);
+ ITUtilHistory.assertHistoryStructures("/" + uuidRandom.toString(), 0);
- // /history?parameter=value
+ // /history/structures?parameter=value
// type 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?type=SYSTEMGROUP&parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&parent=" + uuid2.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&parent=" + uuidRandom.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&name=na%", 100, -1);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&who=%wh%", 100, -1);
-
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&uuid=" + uuid2.toString() + "&description=more%", 8);
-
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=100", 20);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=1&pageSize=20", 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=1&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=2&pageSize=8", 4);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=3&pageSize=8", 0);
-
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&uuid=" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&uuid=" + uuid2.toString(), 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&uuid=" + uuidRandom.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&parent=" + uuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&parent=" + uuid2.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&parent=" + uuidRandom.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&name=na%", 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonicEquivalence=_A_", 10);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&description=%other%", 40);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&who=%wh%", 100, -1);
+
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&uuid=" + uuid2.toString() + "&description=more%", 8);
+
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=100", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=1&pageSize=100", 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=20", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=1&pageSize=20", 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=1&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=2&pageSize=8", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=3&pageSize=8", 0);
+
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
- ITUtilStructureElement.assertRead("/history?type=SYSTEMGROUP&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEMGROUP&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AA1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AA2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AA3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AA4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AA5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AB1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AB2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AB3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AB4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AB5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AC1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AC2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AC3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AC4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AC5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AD1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AD2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AD3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AD4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AD5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AE1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AE2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AE3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AE4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AE5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AF1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AF2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AF3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AF4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AF5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AG1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AG2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AG3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AG4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "AG5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AA1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AA2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AA3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AA4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AA5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AB1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AB2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AB3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AB4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AB5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AC1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AC2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AC3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AC4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AC5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AD1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AD2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AD3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AD4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AD5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AE1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AE2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AE3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AE4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AE5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AF1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AF2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AF3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AF4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AF5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AG1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AG2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AG3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AG4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "AG5", Boolean.TRUE);
} catch (Exception e) {
fail();
}
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index bcfb360b621b38496b4638ec7ecfb8323ac76459..a98174ffcb69978f884133b3edeef73698224f54 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -105,7 +105,7 @@ class StructuresSystemIT {
Type.SYSTEMGROUP, null,
"name", "Sg",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupUuid = approvedStructureElement.getUuid();
}
@@ -117,7 +117,7 @@ class StructuresSystemIT {
// what
// read equivalence mnemonic
- ITUtilStructureElement.assertEquivalence("Sys", "SYS");
+ ITUtilStructures.assertEquivalence("Sys", "SYS");
}
@Test
@@ -142,49 +142,49 @@ class StructuresSystemIT {
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "CC", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Sg", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SG", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Sg-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SG-Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Sg-Sg", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Sg-SG", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "CC", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "CC", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Sg", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SG", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Sg-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SG-Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Sg-Sg", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Sg-SG", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "CC", Boolean.TRUE);
- ITUtilStructureElement.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertValidate("[{asdf]", StructureCommand.CREATE, HttpURLConnection.HTTP_BAD_REQUEST);
+ ITUtilStructures.assertCreate("[{asdf]", HttpURLConnection.HTTP_BAD_REQUEST);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setType(Type.SYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setParent(systemGroupUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -213,98 +213,98 @@ class StructuresSystemIT {
// mnemonic rules
structureElementCommandCreate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("C");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Cccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Ccccccccc");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
// mnemonic rules (2)
structureElementCommandCreate.setMnemonic(" ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sys ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sys");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("000");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("Sys0");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic(":");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sys:");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("Sys: ");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setMnemonic("1");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12345");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123456");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("1234567");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("12345678");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("123456789");
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
} catch (Exception e) {
fail();
}
@@ -337,35 +337,35 @@ class StructuresSystemIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Ca", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Ca", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(createdStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -398,40 +398,40 @@ class StructuresSystemIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -464,40 +464,40 @@ class StructuresSystemIT {
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
UUID uuid = structureElementCommandConfirm.getUuid();
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertCreate(structureElementCommandCreate, HttpURLConnection.HTTP_CONFLICT);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(uuid);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -540,70 +540,70 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "Cu",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate update
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandUpdate.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setType(Type.DEVICEGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setType(Type.SYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setParent(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setParent(systemGroupUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setName(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setName("name");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setMnemonic(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setMnemonic("Cu");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setDescription(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setDescription("description");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandUpdate.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandUpdate.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -636,34 +636,34 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "Ua",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -698,34 +698,34 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "Uc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update cancel check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -760,34 +760,34 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "Ur",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setComment("comment update reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// update
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -826,42 +826,42 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "Cd",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
// validate delete
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setType(Type.DEVICEGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setType(Type.SYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
structureElementCommandConfirm.setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setComment("comment");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -893,33 +893,33 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "Da",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete approve check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// approve
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertApprove(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -953,33 +953,33 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "Dc",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment update delete check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// cancel
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertCancel(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1013,33 +1013,33 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "Dr",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandConfirm.setComment("comment delete reject check");
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
// delete
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
// reject
- ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ ITUtilStructures.assertReject(structureElementCommandConfirm);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandConfirm.setUuid(null);
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandConfirm.setUuid(UUID.randomUUID());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_NOT_FOUND);
structureElementCommandConfirm.setUuid(approvedStructureElement.getUuid());
- ITUtilStructureElement.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
+ ITUtilStructures.assertReject(structureElementCommandConfirm, HttpURLConnection.HTTP_CONFLICT);
} catch (Exception e) {
fail();
}
@@ -1069,63 +1069,63 @@ class StructuresSystemIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Rsha", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Rsha", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Rsha", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-Rsha", Boolean.FALSE);
// approve
- approvedStructureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+ approvedStructureElement = ITUtilStructures.assertApprove(structureElementCommandConfirm);
// 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&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rsha", 1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + approvedStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rsha", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Rsha", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rsha", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Rsha", 0);
-
- ITUtilStructureElement.assertRead("/history/" + approvedStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Rsha", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-Rsha", Boolean.FALSE);
+ assertEquals(length, ITUtilStructures.assertRead("/SYSTEM", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rsha", 1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + approvedStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Rsha", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rsha", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Rsha", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + approvedStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SYSTEM, "Rsha", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-Rsha", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1155,63 +1155,63 @@ class StructuresSystemIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshc", 1, -1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rshc", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Rshc", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Rshc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-Rshc", Boolean.FALSE);
// cancel
- cancelledStructureElement = ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
+ cancelledStructureElement = ITUtilStructures.assertCancel(structureElementCommandConfirm);
// 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&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshc", 1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Rshc", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshc", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Rshc", 0);
-
- ITUtilStructureElement.assertRead("/history/" + cancelledStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Rshc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-Rshc", Boolean.FALSE);
+ assertEquals(length, ITUtilStructures.assertRead("/SYSTEM", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshc", 1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Rshc", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshc", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Rshc", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + cancelledStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SYSTEM, "Rshc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-Rshc", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1241,63 +1241,63 @@ class StructuresSystemIT {
"description", "comment");
// create
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
// read (1)
- length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
+ length = ITUtilStructures.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&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Rshr", 0);
- ITUtilStructureElement.assertRead("/history/" + createdStructureElement.getUuid().toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + createdStructureElement.getUuid().toString(), 1);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Rshr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-Rshr", Boolean.FALSE);
// reject
- rejectedStructureElement = ITUtilStructureElement.assertReject(structureElementCommandConfirm);
+ rejectedStructureElement = ITUtilStructures.assertReject(structureElementCommandConfirm);
// 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&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonic/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonic/Sg-Rshr", 0);
-
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg", 1);
- ITUtilStructureElement.assertRead("/mnemonicPath/Rshr", 0);
- ITUtilStructureElement.assertRead("/mnemonicPath/Sg-Rshr", 0);
-
- ITUtilStructureElement.assertRead("/history/" + rejectedStructureElement.getUuid().toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Rshr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-Rshr", Boolean.FALSE);
+ assertEquals(length, ITUtilStructures.assertRead("/SYSTEM", 1, -1).getListSize());
+
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED", 0, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED", 1, -1);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshr", 1);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonic/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonic/Sg-Rshr", 0);
+
+ ITUtilStructures.assertRead("/mnemonicPath/Sg", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Rshr", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-Rshr", 0);
+
+ ITUtilHistory.assertHistoryStructures("/" + rejectedStructureElement.getUuid().toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SYSTEM, "Rshr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-Rshr", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1342,7 +1342,7 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "P1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
@@ -1350,7 +1350,7 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "C1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
@@ -1358,7 +1358,7 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "R1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
@@ -1366,7 +1366,7 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "A1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
try {
@@ -1378,29 +1378,29 @@ class StructuresSystemIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 1);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid3.toString(), 1);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/C1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/R1", 0);
- ITUtilStructureElement.assertRead("/mnemonic/A1", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 1);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 2);
-
- ITUtilStructureElement.assertExists(Type.SYSTEM, "P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "A1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-P1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-C1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-R1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-A1", Boolean.FALSE);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid3.toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P1", 0);
+ ITUtilStructures.assertRead("/mnemonic/C1", 0);
+ ITUtilStructures.assertRead("/mnemonic/R1", 0);
+ ITUtilStructures.assertRead("/mnemonic/A1", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 1);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 2);
+
+ ITUtilStructures.assertExists(Type.SYSTEM, "P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "A1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-P1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-C1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-R1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-A1", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1446,104 +1446,104 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "P9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "C9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "R9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "A9",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
structureElementCommandUpdate.setComment("comment 2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 3");
- ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 4");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 5");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 6");
- ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 7");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 8");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate.setComment("comment 9");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
// from first structure element
@@ -1554,29 +1554,29 @@ class StructuresSystemIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 2);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid3.toString(), 2);
- ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + uuid4.toString(), 1);
-
- ITUtilStructureElement.assertRead("/mnemonic/P9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/C9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/R9", 1);
- ITUtilStructureElement.assertRead("/mnemonic/A9", 1);
-
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 17);
- ITUtilStructureElement.assertRead("/history/" + uuid2.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid3.toString(), 18);
- ITUtilStructureElement.assertRead("/history/" + uuid4.toString(), 18);
-
- ITUtilStructureElement.assertExists(Type.SYSTEM, "P9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "C9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "R9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "A9", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-P9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-C9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-R9", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sg-A9", Boolean.FALSE);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid.toString(), 2);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 2);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid3.toString(), 2);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid4.toString(), 1);
+
+ ITUtilStructures.assertRead("/mnemonic/P9", 1);
+ ITUtilStructures.assertRead("/mnemonic/C9", 1);
+ ITUtilStructures.assertRead("/mnemonic/R9", 1);
+ ITUtilStructures.assertRead("/mnemonic/A9", 1);
+
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 17);
+ ITUtilHistory.assertHistoryStructures("/" + uuid2.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid3.toString(), 18);
+ ITUtilHistory.assertHistoryStructures("/" + uuid4.toString(), 18);
+
+ ITUtilStructures.assertExists(Type.SYSTEM, "P9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "C9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "R9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "A9", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-P9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-C9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-R9", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sg-A9", Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1610,107 +1610,107 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "AA1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AA2",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AA3",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AA4",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AA5",
"description", "comment");
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AB1",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AB2",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AB3",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AB4",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AB5",
"description", "comment");
- ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+ ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AC1",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AC2",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AC3",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AC4",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AC5",
"description", "comment");
- ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+ ITUtilStructures.assertCreateReject(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AD1",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AD2",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AD3",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AD4",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AD5",
"description", "comment");
- ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ ITUtilStructures.assertCreate(structureElementCommandCreate);
String description2 = "some other description";
String comment2 = "some other comment";
@@ -1721,162 +1721,162 @@ class StructuresSystemIT {
Type.SYSTEM, systemGroupUuid,
"name", "AE1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AE2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AE3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AE4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AE5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description2);
structureElementCommandUpdate.setComment(comment2);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
structureElementCommandUpdate.setDescription(description3);
structureElementCommandUpdate.setComment(comment3);
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteReject(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AF1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AF2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AF3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AF4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AF5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AG1",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AG2",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AG3",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AG4",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "AG5",
"description", "comment");
- createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
// 60 system entries
@@ -1898,187 +1898,187 @@ class StructuresSystemIT {
// content for field in first and last items - always possible
// first and last items - not always possible
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__", 45);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=A__", 20);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=A__", 10);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
-
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=false&mnemonic=A__", 30);
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=false&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
-
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=true&mnemonic=A__", 15);
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=true&statuses=PENDING&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
- ITUtilStructureElement.assertRead("/SYSTEM?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
- 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?mnemonic=A__&page=0&pageSize=100", 45);
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=45", 45);
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=1&pageSize=45", 0);
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=1&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=2&pageSize=20", 5);
- ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=3&pageSize=20", 0);
-
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
- ITUtilStructureElement.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
-
- response = ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
- response2 = ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__", 45);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=A__", 20);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=A__", 10);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__", 30);
+
+ ITUtilStructures.assertRead("/SYSTEM?deleted=false&mnemonic=A__", 30);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=false&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=false&statuses=APPROVED&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=false&statuses=CANCELLED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=false&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=false&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 20);
+
+ ITUtilStructures.assertRead("/SYSTEM?deleted=true&mnemonic=A__", 15);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=true&statuses=PENDING&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=true&statuses=APPROVED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=true&statuses=CANCELLED&mnemonic=A__", 0);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
+ ITUtilStructures.assertRead("/SYSTEM?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
+
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + systemGroupUuid.toString(), 0);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid.toString(), 1);
+ ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 2);
+
+ ITUtilStructures.assertRead("/SYSTEM?parent=" + systemGroupUuid.toString(), 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?parent=" + uuid.toString(), 0);
+
+ ITUtilStructures.assertRead("/SYSTEM?name=na", 0);
+ ITUtilStructures.assertRead("/SYSTEM?name=na_", 0);
+ ITUtilStructures.assertRead("/SYSTEM?name=na__", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?name=na___", 0);
+ ITUtilStructures.assertRead("/SYSTEM?name=na%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?name=name", 45, -1);
+
+ ITUtilStructures.assertRead("/SYSTEM?mnemonicEquivalence=A__", 45, -1);
+
+ ITUtilStructures.assertRead("/SYSTEM?mnemonicPath=A__", 30);
+
+ ITUtilStructures.assertRead("/SYSTEM?description=desc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?description=desc%", 35, -1);
+ ITUtilStructures.assertRead("/SYSTEM?description=sc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?description=sc%", 0);
+ ITUtilStructures.assertRead("/SYSTEM?description=%sc", 0);
+ ITUtilStructures.assertRead("/SYSTEM?description=%sc%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?description=description", 35, -1);
+
+ ITUtilStructures.assertRead("/SYSTEM?who=test who", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?who=test", 0);
+ ITUtilStructures.assertRead("/SYSTEM?who=who", 0);
+ ITUtilStructures.assertRead("/SYSTEM?who=test%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?who=%who", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?who=%est%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?who=%wh%", 45, -1);
+ ITUtilStructures.assertRead("/SYSTEM?who=wh%", 0);
+ ITUtilStructures.assertRead("/SYSTEM?who=asdf", 0);
+ ITUtilStructures.assertRead("/SYSTEM?who=%asdf%", 0);
+
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=100", 45);
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=1&pageSize=100", 0);
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=45", 45);
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=1&pageSize=45", 0);
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=20", 20);
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=1&pageSize=20", 20);
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=2&pageSize=20", 5);
+ ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=3&pageSize=20", 0);
+
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=0&pageSize=12", 12);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=1&pageSize=12", 12);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=2&pageSize=12", 6);
+ ITUtilStructures.assertRead("/SYSTEM?statuses=PENDING&statuses=APPROVED&mnemonic=A__&page=3&pageSize=12", 0);
+
+ response = ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=true", 20);
+ response2 = ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=false", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
- response = ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
- response2 = ITUtilStructureElement.assertRead("/SYSTEM?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
+ response = ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=0&pageSize=20&orderBy=WHEN&isAsc=false", 20);
+ response2 = ITUtilStructures.assertRead("/SYSTEM?mnemonic=A__&page=2&pageSize=20&orderBy=WHEN&isAsc=true", 5);
assertEquals(response.getList().get(0), response2.getList().get(response2.getList().size()-1));
// children
// /children/{uuid}
// uuid, type, statuses, deleted, name, mnemonic, mnemonicEquivalence, mnemonicPath, description
- ITUtilStructureElement.assertRead("/children/" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/children/" + systemGroupUuid.toString(), 15, -1);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=SYSTEM", 0);
- ITUtilStructureElement.assertRead("/children/" + systemGroupUuid.toString() + "?type=SYSTEM", 0);
- ITUtilStructureElement.assertRead("/children/" + uuid.toString() + "?type=SYSTEMGROUP", 0);
- ITUtilStructureElement.assertRead("/children/" + systemGroupUuid.toString() + "?type=SYSTEMGROUP", 15, -1);
+ ITUtilStructures.assertRead("/children/" + uuid.toString(), 0);
+ ITUtilStructures.assertRead("/children/" + systemGroupUuid.toString(), 15, -1);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=SYSTEM", 0);
+ ITUtilStructures.assertRead("/children/" + systemGroupUuid.toString() + "?type=SYSTEM", 0);
+ ITUtilStructures.assertRead("/children/" + uuid.toString() + "?type=SYSTEMGROUP", 0);
+ ITUtilStructures.assertRead("/children/" + systemGroupUuid.toString() + "?type=SYSTEMGROUP", 15, -1);
// 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);
+ ITUtilStructures.assertRead("/mnemonic/A", 0);
+ ITUtilStructures.assertRead("/mnemonic/A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonic/AG_", 5);
+ ITUtilStructures.assertRead("/mnemonic/AG1", 1);
+ ITUtilStructures.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);
+ ITUtilStructures.assertRead("/mnemonicPath/A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/A__", 15, -1);
+ ITUtilStructures.assertRead("/mnemonicPath/AG_", 5);
+ ITUtilStructures.assertRead("/mnemonicPath/AG1", 1);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-A%", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-A", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-A__", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-AG_", 0);
+ ITUtilStructures.assertRead("/mnemonicPath/Sg-AG1", 0);
// history
- // /history/{uuid}
- ITUtilStructureElement.assertRead("/history/" + uuid.toString(), 2);
- ITUtilStructureElement.assertRead("/history/" + systemGroupUuid.toString(), 2);
+ // /history/structures/{uuid}
+ ITUtilHistory.assertHistoryStructures("/" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("/" + systemGroupUuid.toString(), 2);
- // /history?parameter=value
+ // /history/structures?parameter=value
// type 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=" + systemGroupUuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&parent=" + uuid.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&parent=" + uuid2.toString(), 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&parent=" + systemGroupUuid.toString(), 100, -1);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&name=na%", 100, -1);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_", 20);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonicEquivalence=_A_", 10);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&description=%other%", 40);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&who=%wh%", 100, -1);
-
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&uuid=" + uuid2.toString() + "&description=more%", 8);
-
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=0&pageSize=100", 20);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=1&pageSize=100", 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=0&pageSize=20", 20);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=1&pageSize=20", 0);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=0&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=1&pageSize=8", 8);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=2&pageSize=8", 4);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=3&pageSize=8", 0);
-
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&uuid=" + uuid.toString(), 2);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&uuid=" + uuid2.toString(), 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&uuid=" + systemGroupUuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&parent=" + uuid.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&parent=" + uuid2.toString(), 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&parent=" + systemGroupUuid.toString(), 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&name=na%", 100, -1);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonicEquivalence=_A_", 10);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&description=%other%", 40);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&who=%wh%", 100, -1);
+
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&uuid=" + uuid2.toString() + "&description=more%", 8);
+
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=0&pageSize=100", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=1&pageSize=100", 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=0&pageSize=20", 20);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=1&pageSize=20", 0);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=0&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=1&pageSize=8", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=2&pageSize=8", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=3&pageSize=8", 0);
+
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=true", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=false", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
- ITUtilStructureElement.assertRead("/history?type=SYSTEM&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=0&pageSize=8&orderBy=WHEN&isAsc=false", 8);
+ ITUtilHistory.assertHistoryStructures("?type=SYSTEM&mnemonic=AF_&page=2&pageSize=8&orderBy=WHEN&isAsc=true", 4);
assertEquals(response.getList().get(0).getWhen(), response2.getList().get(response2.getList().size()-1).getWhen());
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AA1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AA2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AA3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AA4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AA5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AB1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AB2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AB3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AB4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AB5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AC1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AC2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AC3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AC4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AC5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AD1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AD2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AD3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AD4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AD5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AE1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AE2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AE3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AE4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AE5", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AF1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AF2", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AF3", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AF4", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AF5", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AG1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AG2", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AG3", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AG4", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "AG5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AA1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AA2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AA3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AA4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AA5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AB1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AB2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AB3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AB4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AB5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AC1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AC2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AC3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AC4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AC5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AD1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AD2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AD3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AD4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AD5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AE1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AE2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AE3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AE4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AE5", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AF1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AF2", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AF3", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AF4", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AF5", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AG1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AG2", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AG3", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AG4", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "AG5", Boolean.TRUE);
} catch (Exception e) {
fail();
}
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 c8357ffd88eaafde5d5b7242a436a350256d8b4c..0d7d24446981ae7405f4974eba701675a4b233e2 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
@@ -24,8 +24,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.docker.ITUtil;
-import org.openepics.names.docker.ITUtilNameElement;
-import org.openepics.names.docker.ITUtilStructureElement;
+import org.openepics.names.docker.ITUtilNames;
+import org.openepics.names.docker.ITUtilStructures;
import org.openepics.names.rest.beans.Status;
import org.openepics.names.rest.beans.Type;
import org.openepics.names.rest.beans.element.NameElementCommand;
@@ -148,35 +148,35 @@ class NamesInstanceIndexIT {
Type.SYSTEMGROUP, null,
"Accelerator", "Acc",
"The ESS Linear Accelerator", "approved by alfio");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
"Radio Frequency Quadrupole", "RFQ",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"01 Phase Reference Line", "010PRL",
"empty", "Approved by Daniel Piso");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010PRL = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"RFQ-010", "010",
"empty", "Approved by Daniel Piso");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"Power switch board 01", "N1U1",
"Electrical power cabinets", "Approved by Daniel Piso");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystemN1U1 = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -185,56 +185,56 @@ class NamesInstanceIndexIT {
Type.DISCIPLINE, null,
"Cryogenics", "Cryo",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Electromagnetic Resonators", "EMR",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Heating, Cooling and Air Conditioning", "HVAC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineHVAC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"General Process Control", "Proc",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineProc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Software Controllers", "SC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineSC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Vacuum", "Vac",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineVac = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Water Cooling", "WtrC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineWtrC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Beam Magnets and Deflectors", "BMD",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineBMD = approvedStructureElement.getUuid();
@@ -244,56 +244,56 @@ class NamesInstanceIndexIT {
Type.DEVICEGROUP, disciplineCryo,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineHVAC,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupHVAC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineProc,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupProc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineSC,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupSC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineVac,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupVac = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineWtrC,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupWtrC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineBMD,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupBMD = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -302,28 +302,28 @@ class NamesInstanceIndexIT {
Type.DEVICETYPE, deviceGroupCryo,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
"Input Output Controller", "IOC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
"RF Antenna", "RFA",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
"Temperature Transmitter", "TT",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_TT = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -332,28 +332,28 @@ class NamesInstanceIndexIT {
Type.DEVICETYPE, deviceGroupEMR,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_EMR_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"Input Output Controller", "IOC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_EMR_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"RF Antenna", "RFA",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_EMR_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"Temperature Transmitter", "TT",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_EMR_TT = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -362,28 +362,28 @@ class NamesInstanceIndexIT {
Type.DEVICETYPE, deviceGroupHVAC,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_HVAC_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
"Input Output Controller", "IOC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_HVAC_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
"RF Antenna", "RFA",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_HVAC_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
"Temperature Transmitter", "TT",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_HVAC_TT = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -392,28 +392,28 @@ class NamesInstanceIndexIT {
Type.DEVICETYPE, deviceGroupProc,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Proc_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
"Input Output Controller", "IOC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Proc_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
"RF Antenna", "RFA",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Proc_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
"Temperature Transmitter", "TT",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Proc_TT = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -422,28 +422,28 @@ class NamesInstanceIndexIT {
Type.DEVICETYPE, deviceGroupSC,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_SC_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
"Input Output Controller", "IOC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_SC_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
"RF Antenna", "RFA",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_SC_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
"Temperature Transmitter", "TT",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_SC_TT = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -452,28 +452,28 @@ class NamesInstanceIndexIT {
Type.DEVICETYPE, deviceGroupVac,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Vac_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
"Input Output Controller", "IOC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Vac_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
"RF Antenna", "RFA",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Vac_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
"Temperature Transmitter", "TT",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Vac_TT = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -482,28 +482,28 @@ class NamesInstanceIndexIT {
Type.DEVICETYPE, deviceGroupWtrC,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_WtrC_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
"Input Output Controller", "IOC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_WtrC_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
"RF Antenna", "RFA",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_WtrC_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
"Temperature Transmitter", "TT",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_WtrC_TT = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -512,28 +512,28 @@ class NamesInstanceIndexIT {
Type.DEVICETYPE, deviceGroupBMD,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_BMD_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
"Input Output Controller", "IOC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_BMD_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
"RF Antenna", "RFA",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_BMD_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
"Temperature Transmitter", "TT",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_BMD_TT = approvedStructureElement.getUuid();
}
@@ -559,121 +559,121 @@ class NamesInstanceIndexIT {
nameElementCommandCreate.setParentDeviceStructure(deviceType_Cryo_IOC);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
nameElementCommandCreate.setParentDeviceStructure(deviceType_Cryo_RFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
}
@Test
@@ -698,121 +698,121 @@ class NamesInstanceIndexIT {
nameElementCommandCreate.setParentDeviceStructure(deviceType_EMR_IOC);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
nameElementCommandCreate.setParentDeviceStructure(deviceType_EMR_RFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
}
@Test
@@ -837,121 +837,121 @@ class NamesInstanceIndexIT {
nameElementCommandCreate.setParentDeviceStructure(deviceType_HVAC_IOC);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
nameElementCommandCreate.setParentDeviceStructure(deviceType_HVAC_RFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
}
@Test
@@ -976,121 +976,121 @@ class NamesInstanceIndexIT {
nameElementCommandCreate.setParentDeviceStructure(deviceType_Proc_IOC);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
nameElementCommandCreate.setParentDeviceStructure(deviceType_Proc_RFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
}
@Test
@@ -1115,121 +1115,121 @@ class NamesInstanceIndexIT {
nameElementCommandCreate.setParentDeviceStructure(deviceType_SC_IOC);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
nameElementCommandCreate.setParentDeviceStructure(deviceType_SC_RFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
}
@Test
@@ -1254,121 +1254,121 @@ class NamesInstanceIndexIT {
nameElementCommandCreate.setParentDeviceStructure(deviceType_Vac_IOC);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
nameElementCommandCreate.setParentDeviceStructure(deviceType_Vac_RFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
}
@Test
@@ -1393,121 +1393,121 @@ class NamesInstanceIndexIT {
nameElementCommandCreate.setParentDeviceStructure(deviceType_WtrC_IOC);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
nameElementCommandCreate.setParentDeviceStructure(deviceType_WtrC_RFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
}
@Test
@@ -1532,121 +1532,121 @@ class NamesInstanceIndexIT {
nameElementCommandCreate.setParentDeviceStructure(deviceType_BMD_IOC);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
nameElementCommandCreate.setParentDeviceStructure(deviceType_BMD_RFA);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
-
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "051", Boolean.TRUE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "00000000", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000000000", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1234567", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "12345678", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123456789", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000a", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ab", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abc", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "000ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123a", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ab", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abc", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123abcd", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123A", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123AB", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABC", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "123ABCD", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "01", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0001", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "0110", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "100", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "1000", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "10001", Boolean.FALSE);
+
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, " ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "Idx", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abcdef", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "abc123", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, "a!", Boolean.FALSE);
}
}
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
index 0c9a1cb1a1ac839dd0369153aea15bb13a099ad3..72f6813e9283328fb0cdec2b8bef41d3448dc82f 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
@@ -28,8 +28,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.docker.ITUtil;
-import org.openepics.names.docker.ITUtilNameElement;
-import org.openepics.names.docker.ITUtilStructureElement;
+import org.openepics.names.docker.ITUtilNames;
+import org.openepics.names.docker.ITUtilStructures;
import org.openepics.names.rest.beans.Type;
import org.openepics.names.rest.beans.element.NameElement;
import org.openepics.names.rest.beans.element.NameElementCommand;
@@ -91,42 +91,42 @@ class NamesMultipleIT {
Type.SYSTEMGROUP, null,
"Accelerator", "Acc",
"The ESS Linear Accelerator", "approved by alfio");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
"Radio Frequency Quadrupole", "RFQ",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"01 Phase Reference Line", "010PRL",
"empty", "Approved by Daniel Piso");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010PRL = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Cryogenics", "Cryo",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineCryo,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
"Flow Switch", "FS",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_FS = approvedStructureElement.getUuid();
}
@@ -168,42 +168,42 @@ class NamesMultipleIT {
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
- ITUtilNameElement.assertExists("RFQ:Cryo-FS-011", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-011", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-011", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertExists("RFQ:Cryo-FS-011", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ:Cryo-FS-011", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ:Cryo-FS-011", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
uuid = nameElementCommandsCreate[3].getParentSystemStructure();
nameElementCommandsCreate[3].setParentSystemStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
nameElementCommandsCreate[3].setParentSystemStructure(uuid);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
uuid = nameElementCommandsCreate[3].getParentDeviceStructure();
nameElementCommandsCreate[3].setParentDeviceStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
nameElementCommandsCreate[3].setParentDeviceStructure(uuid);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
value = nameElementCommandsCreate[3].getIndex();
nameElementCommandsCreate[3].setIndex(null);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
nameElementCommandsCreate[3].setIndex(value);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
value = nameElementCommandsCreate[3].getDescription();
nameElementCommandsCreate[3].setDescription(null);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
nameElementCommandsCreate[3].setDescription(value);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
value = nameElementCommandsCreate[3].getComment();
nameElementCommandsCreate[3].setComment(null);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
nameElementCommandsCreate[3].setComment(value);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -248,9 +248,9 @@ class NamesMultipleIT {
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
nameElementCommandsCreate = new NameElementCommandCreate[] {
nameElementCommandsCreate[1],
@@ -264,30 +264,30 @@ class NamesMultipleIT {
nameElementCommandsCreate[9]
};
- ITUtilNameElement.assertExists("Acc:Cryo-FS-023", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Acc:Cryo-FS-023", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("Acc:Cryo-FS-023", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertExists("Acc:Cryo-FS-023", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Acc:Cryo-FS-023", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("Acc:Cryo-FS-023", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
- nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
+ nbrNames = ITUtilNames.assertRead("?deleted=false").getListSize();
- createdNameElements = ITUtilNameElement.assertCreate(nameElementCommandsCreate);
+ createdNameElements = ITUtilNames.assertCreate(nameElementCommandsCreate);
assertNotNull(createdNameElements);
assertEquals(9, createdNameElements.length);
- assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
+ assertEquals(nbrNames + 9, ITUtilNames.assertRead("?deleted=false").getListSize());
nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElements);
nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElements);
- ITUtilNameElement.assertExists("Acc:Cryo-FS-023", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Acc:Cryo-FS-023", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("Acc:Cryo-FS-023", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertExists("Acc:Cryo-FS-023", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Acc:Cryo-FS-023", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("Acc:Cryo-FS-023", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -335,66 +335,66 @@ class NamesMultipleIT {
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
- ITUtilNameElement.assertExists("RFQ:Cryo-FS-031", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-031", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-031", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertExists("RFQ:Cryo-FS-031", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ:Cryo-FS-031", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ:Cryo-FS-031", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
- nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
+ nbrNames = ITUtilNames.assertRead("?deleted=false").getListSize();
- createdNameElements = ITUtilNameElement.assertCreate(nameElementCommandsCreate);
+ createdNameElements = ITUtilNames.assertCreate(nameElementCommandsCreate);
assertNotNull(createdNameElements);
assertEquals(9, createdNameElements.length);
- assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
+ assertEquals(nbrNames + 9, ITUtilNames.assertRead("?deleted=false").getListSize());
nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElements);
nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElements);
- ITUtilNameElement.assertExists("RFQ:Cryo-FS-031", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-031", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-031", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ:Cryo-FS-031", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ:Cryo-FS-031", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ:Cryo-FS-031", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
uuid = nameElementCommandsUpdate[3].getUuid();
nameElementCommandsUpdate[3].setUuid(null);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
nameElementCommandsUpdate[3].setUuid(uuid);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
uuid = nameElementCommandsUpdate[3].getParentSystemStructure();
nameElementCommandsUpdate[3].setParentSystemStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
nameElementCommandsUpdate[3].setParentSystemStructure(uuid);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
uuid = nameElementCommandsUpdate[3].getParentDeviceStructure();
nameElementCommandsUpdate[3].setParentDeviceStructure(null);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
nameElementCommandsUpdate[3].setParentDeviceStructure(uuid);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
value = nameElementCommandsUpdate[3].getIndex();
nameElementCommandsUpdate[3].setIndex(null);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
nameElementCommandsUpdate[3].setIndex(value);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
value = nameElementCommandsUpdate[3].getDescription();
nameElementCommandsUpdate[3].setDescription(null);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
nameElementCommandsUpdate[3].setDescription(value);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
value = nameElementCommandsUpdate[3].getComment();
nameElementCommandsUpdate[3].setComment(null);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
nameElementCommandsUpdate[3].setComment(value);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
}
@Test
@@ -438,9 +438,9 @@ class NamesMultipleIT {
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
nameElementCommands = new NameElementCommand[] {
nameElementCommands[0],
@@ -457,30 +457,30 @@ class NamesMultipleIT {
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
- ITUtilNameElement.assertExists("RFQ", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertExists("RFQ", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
- nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
+ nbrNames = ITUtilNames.assertRead("?deleted=false").getListSize();
- createdNameElements = ITUtilNameElement.assertCreate(nameElementCommandsCreate);
+ createdNameElements = ITUtilNames.assertCreate(nameElementCommandsCreate);
assertNotNull(createdNameElements);
assertEquals(9, createdNameElements.length);
- assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
+ assertEquals(nbrNames + 9, ITUtilNames.assertRead("?deleted=false").getListSize());
nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElements);
nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElements);
- ITUtilNameElement.assertExists("RFQ", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
nameElementCommandsUpdate[0].setDescription("0");
nameElementCommandsUpdate[1].setDescription("1");
@@ -492,25 +492,25 @@ class NamesMultipleIT {
nameElementCommandsUpdate[7].setDescription("7");
nameElementCommandsUpdate[8].setDescription("8");
- ITUtilNameElement.assertExists("RFQ", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
- updatedNameElements = ITUtilNameElement.assertUpdate(nameElementCommandsUpdate);
+ updatedNameElements = ITUtilNames.assertUpdate(nameElementCommandsUpdate);
assertNotNull(updatedNameElements);
assertEquals(9, updatedNameElements.length);
- assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
+ assertEquals(nbrNames + 9, ITUtilNames.assertRead("?deleted=false").getListSize());
- ITUtilNameElement.assertExists("RFQ", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
}
@Test
@@ -557,43 +557,43 @@ class NamesMultipleIT {
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
- ITUtilNameElement.assertExists("RFQ:Cryo-FS-051", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-051", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-051", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertExists("RFQ:Cryo-FS-051", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ:Cryo-FS-051", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ:Cryo-FS-051", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
- nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
+ nbrNames = ITUtilNames.assertRead("?deleted=false").getListSize();
- createdNameElements = ITUtilNameElement.assertCreate(nameElementCommandsCreate);
+ createdNameElements = ITUtilNames.assertCreate(nameElementCommandsCreate);
assertNotNull(createdNameElements);
assertEquals(9, createdNameElements.length);
- assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
+ assertEquals(nbrNames + 9, ITUtilNames.assertRead("?deleted=false").getListSize());
nameElementCommandsCreate = NameElementUtil.convertElement2CommandCreate(createdNameElements);
nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElements);
nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElements);
- ITUtilNameElement.assertExists("RFQ:Cryo-FS-051", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-051", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-051", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ:Cryo-FS-051", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ:Cryo-FS-051", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ:Cryo-FS-051", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
uuid = nameElementCommandsConfirm[3].getUuid();
nameElementCommandsConfirm[3].setUuid(null);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
nameElementCommandsConfirm[3].setUuid(uuid);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
value = nameElementCommandsConfirm[3].getComment();
nameElementCommandsConfirm[3].setComment(null);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
nameElementCommandsConfirm[3].setComment(value);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
}
@Test
@@ -645,9 +645,9 @@ class NamesMultipleIT {
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
nameElementCommands = new NameElementCommand[] {
nameElementCommands[0],
@@ -664,44 +664,44 @@ class NamesMultipleIT {
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
- ITUtilNameElement.assertExists("RFQ:Cryo-FS-061", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertExists("RFQ:Cryo-FS-061", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
- nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
+ nbrNames = ITUtilNames.assertRead("?deleted=false").getListSize();
- createdNameElements = ITUtilNameElement.assertCreate(nameElementCommandsCreate);
+ createdNameElements = ITUtilNames.assertCreate(nameElementCommandsCreate);
assertNotNull(createdNameElements);
assertEquals(9, createdNameElements.length);
- assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
+ assertEquals(nbrNames + 9, ITUtilNames.assertRead("?deleted=false").getListSize());
nameElementCommandsCreate = NameElementUtil.convertElement2CommandCreate(createdNameElements);
nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElements);
nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElements);
- ITUtilNameElement.assertExists("RFQ:Cryo-FS-061", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
+ ITUtilNames.assertExists("RFQ:Cryo-FS-061", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
- deletedNameElements = ITUtilNameElement.assertDelete(nameElementCommandsConfirm);
+ deletedNameElements = ITUtilNames.assertDelete(nameElementCommandsConfirm);
assertNotNull(deletedNameElements);
assertEquals(9, deletedNameElements.length);
- assertEquals(nbrNames, ITUtilNameElement.assertRead("?deleted=false").getListSize());
+ assertEquals(nbrNames, ITUtilNames.assertRead("?deleted=false").getListSize());
- ITUtilNameElement.assertExists("RFQ:Cryo-FS-061", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
- ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
- ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
+ ITUtilNames.assertExists("RFQ:Cryo-FS-061", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
+ ITUtilNames.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+ ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+ ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
}
}
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
index ecf7cc5f9639a18bafde3139765a06a9a5281785..18965cfd88763b057cc8abb497a1dc414b786abc 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
@@ -24,8 +24,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.docker.ITUtil;
-import org.openepics.names.docker.ITUtilNameElement;
-import org.openepics.names.docker.ITUtilStructureElement;
+import org.openepics.names.docker.ITUtilNames;
+import org.openepics.names.docker.ITUtilStructures;
import org.openepics.names.rest.beans.Type;
import org.openepics.names.rest.beans.element.NameElementCommandCreate;
import org.openepics.names.rest.beans.element.StructureElement;
@@ -128,65 +128,65 @@ class StructuresCUDDeleteIT {
// sg0
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, null, description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1);
- ITUtilStructureElement.assertRead("/SYSTEM", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 0);
- ITUtilNameElement.assertRead("", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 1);
+ ITUtilStructures.assertRead("/SYSTEM", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 0);
+ ITUtilNames.assertRead("", 0);
// at this point
// system group
// sg0 - no mnemonic
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, "Sg1", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg1 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys11", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys11 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys12", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys12 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys13", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys13 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub111", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub112", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub113", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub121", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub122", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub123", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub131", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub132", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub132 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub133", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 2);
- ITUtilStructureElement.assertRead("/SYSTEM", 3);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 9);
- ITUtilNameElement.assertRead("", 13);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 2);
+ ITUtilStructures.assertRead("/SYSTEM", 3);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 9);
+ ITUtilNames.assertRead("", 13);
// at this point
// above
@@ -207,55 +207,55 @@ class StructuresCUDDeleteIT {
// Sys13-Sub131, Sys13-Sub132, Sys13-Sub133
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, "Sg2", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg2 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys21", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys21 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys22", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys22 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys23", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys23 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub211", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub212", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub213", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub221", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub222", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub223", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub231", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub231 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub232", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub232 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub233", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub233 = approvedStructureElement.getUuid();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilNameElement.assertRead("", 26);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilNames.assertRead("", 26);
// at this point
// above
@@ -276,64 +276,64 @@ class StructuresCUDDeleteIT {
// Sys23-Sub231, Sys23-Sub232, Sys23-Sub233
structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, name, "Di2", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
di2 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg21 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg22 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg23 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt211", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt211 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt212", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt212 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt213", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt213 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt221", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt221 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt222", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt222 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt223", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt223 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt231", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt231 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt232", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt232 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt233", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt233 = approvedStructureElement.getUuid();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
- ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
- ITUtilNameElement.assertRead("", 26);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilStructures.assertRead("/DISCIPLINE", 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP", 3);
+ ITUtilStructures.assertRead("/DEVICETYPE", 9);
+ ITUtilNames.assertRead("", 26);
// at this point
// above
@@ -348,39 +348,39 @@ class StructuresCUDDeleteIT {
// Dt231, Dt232, Dt233
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
- ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
- ITUtilNameElement.assertRead("", 35);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilStructures.assertRead("/DISCIPLINE", 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP", 3);
+ ITUtilStructures.assertRead("/DEVICETYPE", 9);
+ ITUtilNames.assertRead("", 35);
// at this point
// above
@@ -396,43 +396,43 @@ class StructuresCUDDeleteIT {
// Sys23-Sub232:Di2-Dt232-232
// Sys23-Sub233:Di2-Dt233-233
- ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub111", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub112", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub113", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub131", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub133", Boolean.TRUE);
-
- ITUtilNameElement.assertExists("Sg2", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys21", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys21-Sub211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys21-Sub212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys21-Sub213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22-Sub221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22-Sub222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22-Sub223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233", Boolean.TRUE);
-
- ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg1", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub111", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub112", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub113", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub131", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub133", Boolean.TRUE);
+
+ ITUtilNames.assertExists("Sg2", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys21", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys21-Sub211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys21-Sub212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys21-Sub213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22-Sub221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22-Sub222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22-Sub223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233", Boolean.TRUE);
+
+ ITUtilNames.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
}
@Test
@@ -443,75 +443,75 @@ class StructuresCUDDeleteIT {
ResponsePageStructureElements responsePage = null;
StructureElementCommandConfirm structureElementCommandConfirm = null;
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub132", Boolean.TRUE);
- responsePage = ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
+ responsePage = ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys13-Sub132", Boolean.TRUE);
// ----------------------------------------
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys12", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys12", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub123", Boolean.TRUE);
- responsePage = ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + sys12, 1);
+ responsePage = ITUtilStructures.assertRead("/SYSTEM?uuid=" + sys12, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys12", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub123", Boolean.TRUE);
// ----------------------------------------
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Sg1", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys11", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys13", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub111", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub112", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub113", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub131", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub133", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
-
- responsePage = ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Sg1", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys11", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys13", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys11-Sub111", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys11-Sub112", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys11-Sub113", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub131", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub133", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg1", Boolean.TRUE);
+
+ responsePage = ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
-
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Sg1", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys11", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys13", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub111", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub112", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub113", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub131", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub133", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
+
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Sg1", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys11", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys13", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys11-Sub111", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys11-Sub112", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys11-Sub113", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub131", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub133", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg1", Boolean.TRUE);
}
@Test
@@ -522,79 +522,79 @@ class StructuresCUDDeleteIT {
ResponsePageStructureElements responsePage = null;
StructureElementCommandConfirm structureElementCommandConfirm = null;
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- responsePage = ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
+ responsePage = ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
// ----------------------------------------
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- responsePage = ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
+ responsePage = ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt223", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt223", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
// ----------------------------------------
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt211", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt212", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt213", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt223", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt231", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt233", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
-
- responsePage = ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + di2, 1);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt211", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt212", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt213", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt223", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt231", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt233", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
+
+ responsePage = ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + di2, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
-
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt211", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt212", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt213", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt223", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt231", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt233", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
+ ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
+
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt211", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt212", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt213", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt223", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt231", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt233", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
}
}
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
index 00819c06081f3a6af21c7791db933299a21b3986..9b18fb1045abee716241e4dfe6796f9292d65ad2 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
@@ -26,8 +26,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.docker.ITUtil;
-import org.openepics.names.docker.ITUtilNameElement;
-import org.openepics.names.docker.ITUtilStructureElement;
+import org.openepics.names.docker.ITUtilNames;
+import org.openepics.names.docker.ITUtilStructures;
import org.openepics.names.rest.beans.Type;
import org.openepics.names.rest.beans.element.NameElementCommandCreate;
import org.openepics.names.rest.beans.element.StructureElement;
@@ -130,65 +130,65 @@ class StructuresCUDNamesLegacyIT {
// sg0
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, null, description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1);
- ITUtilStructureElement.assertRead("/SYSTEM", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 0);
- ITUtilNameElement.assertRead("", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 1);
+ ITUtilStructures.assertRead("/SYSTEM", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 0);
+ ITUtilNames.assertRead("", 0);
// at this point
// system group
// sg0 - no mnemonic
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, "Sg1", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg1 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys11", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys11 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys12", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys12 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys13", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys13 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub111", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub112", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub113", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub121", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub122", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub123", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub131", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub132", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub132 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub133", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 2);
- ITUtilStructureElement.assertRead("/SYSTEM", 3);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 9);
- ITUtilNameElement.assertRead("", 13);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 2);
+ ITUtilStructures.assertRead("/SYSTEM", 3);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 9);
+ ITUtilNames.assertRead("", 13);
// at this point
// above
@@ -209,55 +209,55 @@ class StructuresCUDNamesLegacyIT {
// Sys13-Sub131, Sys13-Sub132, Sys13-Sub133
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, "Sg2", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg2 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys21", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys21 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys22", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys22 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys23", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys23 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub211", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub212", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub213", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub221", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub222", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub223", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub231", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub231 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub232", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub232 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub233", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub233 = approvedStructureElement.getUuid();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilNameElement.assertRead("", 26);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilNames.assertRead("", 26);
// at this point
// above
@@ -278,64 +278,64 @@ class StructuresCUDNamesLegacyIT {
// Sys23-Sub231, Sys23-Sub232, Sys23-Sub233
structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, name, "Di2", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
di2 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg21 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg22 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg23 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt211", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt211 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt212", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt212 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt213", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt213 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt221", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt221 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt222", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt222 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt223", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt223 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt231", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt231 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt232", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt232 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt233", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt233 = approvedStructureElement.getUuid();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
- ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
- ITUtilNameElement.assertRead("", 26);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilStructures.assertRead("/DISCIPLINE", 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP", 3);
+ ITUtilStructures.assertRead("/DEVICETYPE", 9);
+ ITUtilNames.assertRead("", 26);
// at this point
// above
@@ -350,39 +350,39 @@ class StructuresCUDNamesLegacyIT {
// Dt231, Dt232, Dt233
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
- ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
- ITUtilNameElement.assertRead("", 35);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilStructures.assertRead("/DISCIPLINE", 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP", 3);
+ ITUtilStructures.assertRead("/DEVICETYPE", 9);
+ ITUtilNames.assertRead("", 35);
// at this point
// above
@@ -417,159 +417,159 @@ class StructuresCUDNamesLegacyIT {
// delete system
// delete system group
- Long legacyTotalCount = ITUtilNameElement.assertRead("/legacy").getTotalCount();
+ Long legacyTotalCount = ITUtilNames.assertRead("/legacy").getTotalCount();
assertNotNull(legacyTotalCount);
int legacyCount = legacyTotalCount.intValue();
ResponsePageStructureElements responsePage = null;
StructureElementCommandConfirm structureElementCommandConfirm = null;
- ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub111", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub112", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub113", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub131", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub133", Boolean.TRUE);
-
- ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub121", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub122", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub123", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount, legacyCount);
-
- responsePage = ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
+ ITUtilNames.assertExists("Sg1", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub111", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub112", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub113", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub131", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub133", Boolean.TRUE);
+
+ ITUtilNames.assertIsLegacy("Sg1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub121", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub122", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub123", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub132", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount, legacyCount);
+
+ responsePage = ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub121", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub122", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub123", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount, legacyCount);
-
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub121", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub122", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub123", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
-
- responsePage = ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + sys12, 1);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub121", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub122", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub123", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub132", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount, legacyCount);
+
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub121", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub122", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub123", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
+
+ responsePage = ITUtilStructures.assertRead("/SYSTEM?uuid=" + sys12, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub121", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub122", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub123", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
-
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub123", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 5, legacyCount + 5);
-
- responsePage = ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub121", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub122", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub123", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
+
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 5, legacyCount + 5);
+
+ responsePage = ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub123", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 5, legacyCount + 5);
-
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg1", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys11", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub111", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub112", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys11-Sub113", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys12-Sub123", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.TRUE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 13, legacyCount + 13);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg1", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub111", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub112", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub113", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 5, legacyCount + 5);
+
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg1", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys11", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys12", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub111", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub112", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys11-Sub113", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub131", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys13-Sub133", Boolean.TRUE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 13, legacyCount + 13);
}
@Test
@@ -590,134 +590,134 @@ class StructuresCUDNamesLegacyIT {
// delete device group
// delete discipline
- Long legacyTotalCount = ITUtilNameElement.assertRead("/legacy").getTotalCount();
+ Long legacyTotalCount = ITUtilNames.assertRead("/legacy").getTotalCount();
assertNotNull(legacyTotalCount);
int legacyCount = legacyTotalCount.intValue();
ResponsePageStructureElements responsePage = null;
StructureElementCommandConfirm structureElementCommandConfirm = null;
- ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
-
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount, legacyCount);
- ITUtilNameElement.assertRead("/legacy?name=%D%", 0, 0);
-
- responsePage = ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
+ ITUtilNames.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
+
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount, legacyCount);
+ ITUtilNames.assertRead("/legacy?name=%D%", 0, 0);
+
+ responsePage = ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount, legacyCount);
- ITUtilNameElement.assertRead("/legacy?name=%D%", 0, 0);
-
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
- ITUtilNameElement.assertRead("/legacy?name=%D%", 1, 1);
-
- responsePage = ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount, legacyCount);
+ ITUtilNames.assertRead("/legacy?name=%D%", 0, 0);
+
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
+ ITUtilNames.assertRead("/legacy?name=%D%", 1, 1);
+
+ responsePage = ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
- ITUtilNameElement.assertRead("/legacy?name=%D%", 1, 1);
-
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 4, legacyCount + 4);
- ITUtilNameElement.assertRead("/legacy?name=%D%", 4, 4);
-
- responsePage = ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + di2, 1);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
+ ITUtilNames.assertRead("/legacy?name=%D%", 1, 1);
+
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 4, legacyCount + 4);
+ ITUtilNames.assertRead("/legacy?name=%D%", 4, 4);
+
+ responsePage = ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + di2, 1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
- ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 4, legacyCount + 4);
- ITUtilNameElement.assertRead("/legacy?name=%D%", 4, 4);
-
- ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
-
- ITUtilNameElement.assertRead("/legacy", legacyCount + 9, legacyCount + 9);
- ITUtilNameElement.assertRead("/legacy?name=%D%", 9, 9);
+ ITUtilStructures.assertDelete(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 4, legacyCount + 4);
+ ITUtilNames.assertRead("/legacy?name=%D%", 4, 4);
+
+ ITUtilStructures.assertApprove(structureElementCommandConfirm);
+
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
+
+ ITUtilNames.assertRead("/legacy", legacyCount + 9, legacyCount + 9);
+ ITUtilNames.assertRead("/legacy?name=%D%", 9, 9);
}
}
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
index 35079ea061fb1e150111c0aed40f259c1120d034..6059fda759fd8fe00a1a8ae34b40e1e5172121c6 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
@@ -24,8 +24,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.docker.ITUtil;
-import org.openepics.names.docker.ITUtilNameElement;
-import org.openepics.names.docker.ITUtilStructureElement;
+import org.openepics.names.docker.ITUtilNames;
+import org.openepics.names.docker.ITUtilStructures;
import org.openepics.names.rest.beans.Type;
import org.openepics.names.rest.beans.element.NameElementCommandCreate;
import org.openepics.names.rest.beans.element.StructureElement;
@@ -128,65 +128,65 @@ class StructuresCUDUpdateIT {
// sg0
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, null, description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1);
- ITUtilStructureElement.assertRead("/SYSTEM", 0);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 0);
- ITUtilNameElement.assertRead("", 0);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 1);
+ ITUtilStructures.assertRead("/SYSTEM", 0);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 0);
+ ITUtilNames.assertRead("", 0);
// at this point
// system group
// sg0 - no mnemonic
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, "Sg1", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg1 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys11", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys11 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys12", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys12 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, name, "Sys13", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys13 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub111", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub112", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub113", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub121", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub122", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub123", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub131", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub132", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub132 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub133", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 2);
- ITUtilStructureElement.assertRead("/SYSTEM", 3);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 9);
- ITUtilNameElement.assertRead("", 13);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 2);
+ ITUtilStructures.assertRead("/SYSTEM", 3);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 9);
+ ITUtilNames.assertRead("", 13);
// at this point
@@ -208,55 +208,55 @@ class StructuresCUDUpdateIT {
// Sys13-Sub131, Sys13-Sub132, Sys13-Sub133
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, "Sg2", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg2 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys21", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys21 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys22", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys22 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, name, "Sys23", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys23 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub211", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub212", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub213", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub221", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub222", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub223", description, comment);
- ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub231", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub231 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub232", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub232 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub233", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub233 = approvedStructureElement.getUuid();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilNameElement.assertRead("", 26);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilNames.assertRead("", 26);
// at this point
// above
@@ -277,64 +277,64 @@ class StructuresCUDUpdateIT {
// Sys23-Sub231, Sys23-Sub232, Sys23-Sub233
structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, name, "Di2", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
di2 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg21 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg22 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, name, "", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg23 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt211", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt211 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt212", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt212 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, name, "Dt213", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt213 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt221", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt221 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt222", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt222 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, name, "Dt223", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt223 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt231", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt231 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt232", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt232 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, name, "Dt233", description, comment);
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt233 = approvedStructureElement.getUuid();
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
- ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
- ITUtilNameElement.assertRead("", 26);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilStructures.assertRead("/DISCIPLINE", 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP", 3);
+ ITUtilStructures.assertRead("/DEVICETYPE", 9);
+ ITUtilNames.assertRead("", 26);
// at this point
// above
@@ -349,39 +349,39 @@ class StructuresCUDUpdateIT {
// Dt231, Dt232, Dt233
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
- ITUtilNameElement.assertCreate(nameElementCommandCreate);
+ ITUtilNames.assertCreate(nameElementCommandCreate);
- ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
- ITUtilStructureElement.assertRead("/SYSTEM", 6);
- ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
- ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
- ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
- ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
- ITUtilNameElement.assertRead("", 35);
+ ITUtilStructures.assertRead("/SYSTEMGROUP", 3);
+ ITUtilStructures.assertRead("/SYSTEM", 6);
+ ITUtilStructures.assertRead("/SUBSYSTEM", 18);
+ ITUtilStructures.assertRead("/DISCIPLINE", 1);
+ ITUtilStructures.assertRead("/DEVICEGROUP", 3);
+ ITUtilStructures.assertRead("/DEVICETYPE", 9);
+ ITUtilNames.assertRead("", 35);
// at this point
// above
@@ -397,43 +397,43 @@ class StructuresCUDUpdateIT {
// Sys23-Sub232:Di2-Dt232-232
// Sys23-Sub233:Di2-Dt233-233
- ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub111", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub112", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys11-Sub113", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub131", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Sub133", Boolean.TRUE);
-
- ITUtilNameElement.assertExists("Sg2", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys21", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys21-Sub211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys21-Sub212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys21-Sub213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22-Sub221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22-Sub222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22-Sub223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233", Boolean.TRUE);
-
- ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg1", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub111", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub112", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys11-Sub113", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub131", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub133", Boolean.TRUE);
+
+ ITUtilNames.assertExists("Sg2", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys21", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys21-Sub211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys21-Sub212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys21-Sub213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22-Sub221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22-Sub222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22-Sub223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233", Boolean.TRUE);
+
+ ITUtilNames.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
}
@Test
@@ -444,63 +444,63 @@ class StructuresCUDUpdateIT {
ResponsePageStructureElements responsePage = null;
StructureElementCommandUpdate structureElementCommandUpdate = null;
- responsePage = ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
+ responsePage = ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys13-Su132", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys13-Sub132", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Su132", Boolean.FALSE);
structureElementCommandUpdate.setMnemonic("Su132");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys13-Su132", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys13-Sub132", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys13-Su132", Boolean.TRUE);
// ----------------------------------------
- responsePage = ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + sys12, 1);
+ responsePage = ITUtilStructures.assertRead("/SYSTEM?uuid=" + sys12, 1);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sy12", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sy12-Sub121", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sy12-Sub122", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sy12-Sub123", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys12", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertExists("Sy12", Boolean.FALSE);
+ ITUtilNames.assertExists("Sy12-Sub121", Boolean.FALSE);
+ ITUtilNames.assertExists("Sy12-Sub122", Boolean.FALSE);
+ ITUtilNames.assertExists("Sy12-Sub123", Boolean.FALSE);
structureElementCommandUpdate.setMnemonic("Sy12");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- ITUtilNameElement.assertExists("Sys12", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sy12", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sy12-Sub121", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sy12-Sub122", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sy12-Sub123", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys12", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys12-Sub121", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys12-Sub122", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys12-Sub123", Boolean.FALSE);
+ ITUtilNames.assertExists("Sy12", Boolean.TRUE);
+ ITUtilNames.assertExists("Sy12-Sub121", Boolean.TRUE);
+ ITUtilNames.assertExists("Sy12-Sub122", Boolean.TRUE);
+ ITUtilNames.assertExists("Sy12-Sub123", Boolean.TRUE);
// ----------------------------------------
- responsePage = ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
+ responsePage = ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
- ITUtilNameElement.assertExists("S1", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg1", Boolean.TRUE);
+ ITUtilNames.assertExists("S1", Boolean.FALSE);
structureElementCommandUpdate.setMnemonic("S1");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- ITUtilNameElement.assertExists("Sg1", Boolean.FALSE);
- ITUtilNameElement.assertExists("S1", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg1", Boolean.FALSE);
+ ITUtilNames.assertExists("S1", Boolean.TRUE);
}
@Test
@@ -511,96 +511,96 @@ class StructuresCUDUpdateIT {
ResponsePageStructureElements responsePage = null;
StructureElementCommandUpdate structureElementCommandUpdate = null;
- responsePage = ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
+ responsePage = ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.FALSE);
structureElementCommandUpdate.setMnemonic("D232");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.TRUE);
// ----------------------------------------
- responsePage = ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
+ responsePage = ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-
- ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
-
- ITUtilNameElement.assertExists("Sg2:D2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sg2:D2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sg2:D2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt221-221", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt222-222", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt223-223", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub231:D2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub232:D2-D232-232", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub233:D2-Dt233-233", Boolean.FALSE);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
+
+ ITUtilNames.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
+
+ ITUtilNames.assertExists("Sg2:D2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg2:D2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg2:D2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:D2-Dt221-221", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:D2-Dt222-222", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:D2-Dt223-223", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub231:D2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub232:D2-D232-232", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub233:D2-Dt233-233", Boolean.FALSE);
// ----------------------------------------
- responsePage = ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + di2, 1);
+ responsePage = ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + di2, 1);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-
- ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
-
- ITUtilNameElement.assertExists("Sg2:D2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sg2:D2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sg2:D2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt221-221", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt222-222", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt223-223", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub231:D2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub232:D2-D232-232", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub233:D2-Dt233-233", Boolean.FALSE);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
+
+ ITUtilNames.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
+
+ ITUtilNames.assertExists("Sg2:D2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg2:D2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg2:D2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:D2-Dt221-221", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:D2-Dt222-222", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:D2-Dt223-223", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub231:D2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub232:D2-D232-232", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub233:D2-Dt233-233", Boolean.FALSE);
structureElementCommandUpdate.setMnemonic("D2");
- ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-
- ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sg2:Di2-Dt213-213", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt221-221", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt222-222", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.FALSE);
- ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-
- ITUtilNameElement.assertExists("Sg2:D2-Dt211-211", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:D2-Dt212-212", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sg2:D2-Dt213-213", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt221-221", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt222-222", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys22:D2-Dt223-223", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub231:D2-Dt231-231", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub232:D2-D232-232", Boolean.TRUE);
- ITUtilNameElement.assertExists("Sys23-Sub233:D2-Dt233-233", Boolean.TRUE);
+ ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
+
+ ITUtilNames.assertExists("Sg2:Di2-Dt211-211", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt212-212", Boolean.FALSE);
+ ITUtilNames.assertExists("Sg2:Di2-Dt213-213", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt221-221", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub232:Di2-D232-232", Boolean.FALSE);
+ ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
+
+ ITUtilNames.assertExists("Sg2:D2-Dt211-211", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:D2-Dt212-212", Boolean.TRUE);
+ ITUtilNames.assertExists("Sg2:D2-Dt213-213", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:D2-Dt221-221", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:D2-Dt222-222", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys22:D2-Dt223-223", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub231:D2-Dt231-231", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub232:D2-D232-232", Boolean.TRUE);
+ ITUtilNames.assertExists("Sys23-Sub233:D2-Dt233-233", Boolean.TRUE);
}
}
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java b/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
index 1cb46a3cde8725662d274b78ee6d99f8fbe31522..49fc48d2d71745e811008c13f907bb32f7e73109 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
@@ -27,7 +27,7 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.docker.ITUtil;
-import org.openepics.names.docker.ITUtilStructureElement;
+import org.openepics.names.docker.ITUtilStructures;
import org.openepics.names.rest.beans.Type;
import org.openepics.names.rest.beans.element.StructureElement;
import org.openepics.names.rest.beans.element.StructureElementCommandCreate;
@@ -139,14 +139,14 @@ class StructuresLevel3IT {
Type.SYSTEMGROUP, null,
"Accelerator", "Acc",
"The ESS Linear Accelerator", "approved by alfio");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
"Radio Frequency Quadrupole", "RFQ",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -155,56 +155,56 @@ class StructuresLevel3IT {
Type.DISCIPLINE, null,
"Cryogenics", "Cryo",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Electromagnetic Resonators", "EMR",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Heating, Cooling and Air Conditioning", "HVAC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineHVAC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"General Process Control", "Proc",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineProc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Software Controllers", "SC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineSC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Vacuum", "Vac",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineVac = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Water Cooling", "WtrC",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineWtrC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"Beam Magnets and Deflectors", "BMD",
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineBMD = approvedStructureElement.getUuid();
// ----------------------------------------------------------------------------------------------------
@@ -213,56 +213,56 @@ class StructuresLevel3IT {
Type.DEVICEGROUP, disciplineCryo,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineHVAC,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupHVAC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineProc,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupProc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineSC,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupSC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineVac,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupVac = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineWtrC,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupWtrC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineBMD,
"empty", null,
"empty", "empty");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupBMD = approvedStructureElement.getUuid();
}
@@ -293,27 +293,27 @@ class StructuresLevel3IT {
Type.SUBSYSTEM, systemRFQ,
"01 Phase Reference Line", "010PRL",
"empty", "Approved by Daniel Piso");
- createdStructureElement_010PRL = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_010PRL = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"RFQ-010", "010",
"empty", "Approved by Daniel Piso");
- createdStructureElement_010 = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_010 = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
"Power switch board 01", "N1U1",
"Electrical power cabinets", "Approved by Daniel Piso");
- createdStructureElement_N1U1 = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_N1U1 = ITUtilStructures.assertCreate(structureElementCommandCreate);
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_010PRL));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_010PRL));
subsystem010PRL = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_010));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_010));
subsystem010 = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_N1U1));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_N1U1));
subsystemN1U1 = approvedStructureElement.getUuid();
assertNotNull(subsystem010PRL);
@@ -391,25 +391,25 @@ class StructuresLevel3IT {
Type.DEVICETYPE, deviceGroupCryo,
"Flow Switch", "FS",
"empty", "empty");
- createdStructureElement_Cryo_FS = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Cryo_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
"Input Output Controller", "IOC",
"empty", "empty");
- createdStructureElement_Cryo_IOC = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Cryo_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
"RF Antenna", "RFA",
"empty", "empty");
- createdStructureElement_Cryo_RFA = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Cryo_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
"Temperature Transmitter", "TT",
"empty", "empty");
- createdStructureElement_Cryo_TT = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Cryo_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
@@ -417,25 +417,25 @@ class StructuresLevel3IT {
Type.DEVICETYPE, deviceGroupEMR,
"Flow Switch", "FS",
"empty", "empty");
- createdStructureElement_EMR_FS = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_EMR_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"Input Output Controller", "IOC",
"empty", "empty");
- createdStructureElement_EMR_IOC = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_EMR_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"RF Antenna", "RFA",
"empty", "empty");
- createdStructureElement_EMR_RFA = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_EMR_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"Temperature Transmitter", "TT",
"empty", "empty");
- createdStructureElement_EMR_TT = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_EMR_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
@@ -443,25 +443,25 @@ class StructuresLevel3IT {
Type.DEVICETYPE, deviceGroupHVAC,
"Flow Switch", "FS",
"empty", "empty");
- createdStructureElement_HVAC_FS = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_HVAC_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
"Input Output Controller", "IOC",
"empty", "empty");
- createdStructureElement_HVAC_IOC = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_HVAC_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
"RF Antenna", "RFA",
"empty", "empty");
- createdStructureElement_HVAC_RFA = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_HVAC_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
"Temperature Transmitter", "TT",
"empty", "empty");
- createdStructureElement_HVAC_TT = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_HVAC_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
@@ -469,25 +469,25 @@ class StructuresLevel3IT {
Type.DEVICETYPE, deviceGroupProc,
"Flow Switch", "FS",
"empty", "empty");
- createdStructureElement_Proc_FS = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Proc_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
"Input Output Controller", "IOC",
"empty", "empty");
- createdStructureElement_Proc_IOC = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Proc_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
"RF Antenna", "RFA",
"empty", "empty");
- createdStructureElement_Proc_RFA = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Proc_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
"Temperature Transmitter", "TT",
"empty", "empty");
- createdStructureElement_Proc_TT = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Proc_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
@@ -495,25 +495,25 @@ class StructuresLevel3IT {
Type.DEVICETYPE, deviceGroupSC,
"Flow Switch", "FS",
"empty", "empty");
- createdStructureElement_SC_FS = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_SC_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
"Input Output Controller", "IOC",
"empty", "empty");
- createdStructureElement_SC_IOC = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_SC_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
"RF Antenna", "RFA",
"empty", "empty");
- createdStructureElement_SC_RFA = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_SC_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
"Temperature Transmitter", "TT",
"empty", "empty");
- createdStructureElement_SC_TT = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_SC_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
@@ -521,25 +521,25 @@ class StructuresLevel3IT {
Type.DEVICETYPE, deviceGroupVac,
"Flow Switch", "FS",
"empty", "empty");
- createdStructureElement_Vac_FS = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Vac_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
"Input Output Controller", "IOC",
"empty", "empty");
- createdStructureElement_Vac_IOC = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Vac_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
"RF Antenna", "RFA",
"empty", "empty");
- createdStructureElement_Vac_RFA = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Vac_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
"Temperature Transmitter", "TT",
"empty", "empty");
- createdStructureElement_Vac_TT = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_Vac_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
@@ -547,25 +547,25 @@ class StructuresLevel3IT {
Type.DEVICETYPE, deviceGroupWtrC,
"Flow Switch", "FS",
"empty", "empty");
- createdStructureElement_WtrC_FS = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_WtrC_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
"Input Output Controller", "IOC",
"empty", "empty");
- createdStructureElement_WtrC_IOC = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_WtrC_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
"RF Antenna", "RFA",
"empty", "empty");
- createdStructureElement_WtrC_RFA = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_WtrC_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
"Temperature Transmitter", "TT",
"empty", "empty");
- createdStructureElement_WtrC_TT = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_WtrC_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
@@ -573,35 +573,35 @@ class StructuresLevel3IT {
Type.DEVICETYPE, deviceGroupBMD,
"Flow Switch", "FS",
"empty", "empty");
- createdStructureElement_BMD_FS = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_BMD_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
"Input Output Controller", "IOC",
"empty", "empty");
- createdStructureElement_BMD_IOC = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_BMD_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
"RF Antenna", "RFA",
"empty", "empty");
- createdStructureElement_BMD_RFA = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_BMD_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
"Temperature Transmitter", "TT",
"empty", "empty");
- createdStructureElement_BMD_TT = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+ createdStructureElement_BMD_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Cryo_FS));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Cryo_FS));
deviceType_Cryo_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Cryo_IOC));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Cryo_IOC));
deviceType_Cryo_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Cryo_RFA));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Cryo_RFA));
deviceType_Cryo_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Cryo_TT));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Cryo_TT));
deviceType_Cryo_TT = approvedStructureElement.getUuid();
assertNotNull(deviceType_Cryo_FS);
@@ -609,13 +609,13 @@ class StructuresLevel3IT {
assertNotNull(deviceType_Cryo_RFA);
assertNotNull(deviceType_Cryo_TT);
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_EMR_FS));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_EMR_FS));
deviceType_EMR_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_EMR_IOC));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_EMR_IOC));
deviceType_EMR_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_EMR_RFA));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_EMR_RFA));
deviceType_EMR_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_EMR_TT));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_EMR_TT));
deviceType_EMR_TT = approvedStructureElement.getUuid();
assertNotNull(deviceType_EMR_FS);
@@ -623,13 +623,13 @@ class StructuresLevel3IT {
assertNotNull(deviceType_EMR_RFA);
assertNotNull(deviceType_EMR_TT);
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_HVAC_FS));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_HVAC_FS));
deviceType_HVAC_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_HVAC_IOC));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_HVAC_IOC));
deviceType_HVAC_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_HVAC_RFA));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_HVAC_RFA));
deviceType_HVAC_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_HVAC_TT));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_HVAC_TT));
deviceType_HVAC_TT = approvedStructureElement.getUuid();
assertNotNull(deviceType_HVAC_FS);
@@ -637,13 +637,13 @@ class StructuresLevel3IT {
assertNotNull(deviceType_HVAC_RFA);
assertNotNull(deviceType_HVAC_TT);
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Proc_FS));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Proc_FS));
deviceType_Proc_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Proc_IOC));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Proc_IOC));
deviceType_Proc_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Proc_RFA));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Proc_RFA));
deviceType_Proc_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Proc_TT));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Proc_TT));
deviceType_Proc_TT = approvedStructureElement.getUuid();
assertNotNull(deviceType_Proc_FS);
@@ -651,13 +651,13 @@ class StructuresLevel3IT {
assertNotNull(deviceType_Proc_RFA);
assertNotNull(deviceType_Proc_TT);
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_SC_FS));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_SC_FS));
deviceType_SC_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_SC_IOC));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_SC_IOC));
deviceType_SC_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_SC_RFA));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_SC_RFA));
deviceType_SC_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_SC_TT));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_SC_TT));
deviceType_SC_TT = approvedStructureElement.getUuid();
assertNotNull(deviceType_SC_FS);
@@ -665,13 +665,13 @@ class StructuresLevel3IT {
assertNotNull(deviceType_SC_RFA);
assertNotNull(deviceType_SC_TT);
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Vac_FS));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Vac_FS));
deviceType_Vac_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Vac_IOC));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Vac_IOC));
deviceType_Vac_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Vac_RFA));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Vac_RFA));
deviceType_Vac_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Vac_TT));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_Vac_TT));
deviceType_Vac_TT = approvedStructureElement.getUuid();
assertNotNull(deviceType_Vac_FS);
@@ -679,13 +679,13 @@ class StructuresLevel3IT {
assertNotNull(deviceType_Vac_RFA);
assertNotNull(deviceType_Vac_TT);
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_WtrC_FS));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_WtrC_FS));
deviceType_WtrC_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_WtrC_IOC));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_WtrC_IOC));
deviceType_WtrC_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_WtrC_RFA));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_WtrC_RFA));
deviceType_WtrC_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_WtrC_TT));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_WtrC_TT));
deviceType_WtrC_TT = approvedStructureElement.getUuid();
assertNotNull(deviceType_WtrC_FS);
@@ -693,13 +693,13 @@ class StructuresLevel3IT {
assertNotNull(deviceType_WtrC_RFA);
assertNotNull(deviceType_WtrC_TT);
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_BMD_FS));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_BMD_FS));
deviceType_BMD_FS = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_BMD_IOC));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_BMD_IOC));
deviceType_BMD_IOC = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_BMD_RFA));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_BMD_RFA));
deviceType_BMD_RFA = approvedStructureElement.getUuid();
- approvedStructureElement = ITUtilStructureElement.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_BMD_TT));
+ approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_BMD_TT));
deviceType_BMD_TT = approvedStructureElement.getUuid();
assertNotNull(deviceType_BMD_FS);
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
index e2e747fd946c7615611f346e498591e2f447d482..15689f5c585bc083fc430dedc99837c090a18fce 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
@@ -28,7 +28,7 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.docker.ITUtil;
-import org.openepics.names.docker.ITUtilStructureElement;
+import org.openepics.names.docker.ITUtilStructures;
import org.openepics.names.rest.beans.Type;
import org.openepics.names.rest.beans.element.StructureElement;
import org.openepics.names.rest.beans.element.StructureElementCommand;
@@ -81,42 +81,42 @@ class StructuresMultipleIT {
Type.SYSTEMGROUP, null,
"name", "Sg",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
"name", "Sys",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
"name", "Sub",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystemUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
"name", "Di",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
"name", null,
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
"name", "Dt",
"description", "comment");
- approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+ approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeUuid = approvedStructureElement.getUuid();
}
@@ -147,35 +147,35 @@ class StructuresMultipleIT {
StructureElementCommand[] structureElementCommands = null;
String value = null;
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Sg", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgChc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Sg", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgChc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "Sg", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgChc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "Sg", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgChc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysChc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Sys", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysChc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "Sys", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysChc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "Sys", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysChc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Sub", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubChc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Sub", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubChc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-Sub", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubChc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Sub", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubChc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Di", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiChc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Di", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiChc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "Di", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiChc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "Di", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiChc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Grp", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpChc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Grp", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpChc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "Grp", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpChc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "Grp", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpChc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Dt", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtChc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Dt", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtChc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-Dt", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtChc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-Dt", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtChc", Boolean.TRUE);
structureElementCommands = new StructureElementCommand[] {
new StructureElementCommand(null, Type.SYSTEMGROUP, null, "name", "SgChc", "description", "comment"),
@@ -189,48 +189,48 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandsCreate[1].setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setType(Type.SYSTEMGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setType(Type.SUBSYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setType(Type.SYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandsCreate[1].setParent(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setParent(systemUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setParent(subsystemUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setParent(systemGroupUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
value = structureElementCommandsCreate[1].getName();
structureElementCommandsCreate[1].setName(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setName(value);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
value = structureElementCommandsCreate[1].getDescription();
structureElementCommandsCreate[1].setDescription(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setDescription(value);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
value = structureElementCommandsCreate[1].getComment();
structureElementCommandsCreate[1].setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setComment(value);
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -272,76 +272,76 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCa", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- createdStructureElements = ITUtilStructureElement.assertCreate(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCa", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ createdStructureElements = ITUtilStructures.assertCreate(structureElementCommandsCreate);
assertNotNull(createdStructureElements);
assertEquals(6, createdStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCa", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- approvedStructureElements = ITUtilStructureElement.assertApprove(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCa", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ approvedStructureElements = ITUtilStructures.assertApprove(structureElementCommandsConfirm);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCa", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCa", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -383,76 +383,76 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCc", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- createdStructureElements = ITUtilStructureElement.assertCreate(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCc", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ createdStructureElements = ITUtilStructures.assertCreate(structureElementCommandsCreate);
assertNotNull(createdStructureElements);
assertEquals(6, createdStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCc", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- cancelledStructureElements = ITUtilStructureElement.assertCancel(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCc", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ cancelledStructureElements = ITUtilStructures.assertCancel(structureElementCommandsConfirm);
assertNotNull(cancelledStructureElements);
assertEquals(6, cancelledStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCc", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCc", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -492,76 +492,76 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCr", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- createdStructureElements = ITUtilStructureElement.assertCreate(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCr", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ createdStructureElements = ITUtilStructures.assertCreate(structureElementCommandsCreate);
assertNotNull(createdStructureElements);
assertEquals(6, createdStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCr", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- rejectedStructureElements = ITUtilStructureElement.assertReject(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCr", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ rejectedStructureElements = ITUtilStructures.assertReject(structureElementCommandsConfirm);
assertNotNull(rejectedStructureElements);
assertEquals(6, rejectedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCr", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCr", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -615,94 +615,94 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCu", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCu", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCu", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCu", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCu", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCu", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCu", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCu", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCu", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCu", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCu", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCu", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- approvedStructureElements = ITUtilStructureElement.assertCreateApprove(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCu", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCu", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCu", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCu", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCu", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCu", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCu", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCu", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCu", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCu", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCu", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCu", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCu", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCu", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCu", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCu", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCu", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCu", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCu", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCu", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCu", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCu", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCu", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCu", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCu", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCu", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCu", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCu", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCu", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCu", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCu", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCu", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCu", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCu", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCu", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCu", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
uuid = approvedStructureElements[1].getUuid();
structureElementCommandsUpdate[1].setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandsUpdate[1].setType(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setType(Type.SYSTEMGROUP);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setType(Type.SUBSYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setType(Type.SYSTEM);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
structureElementCommandsUpdate[1].setParent(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setParent(systemUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setParent(subsystemUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setParent(systemGroupUuid);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
value = structureElementCommandsUpdate[1].getName();
structureElementCommandsUpdate[1].setName(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setName(value);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
value = structureElementCommandsUpdate[1].getDescription();
structureElementCommandsUpdate[1].setDescription(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setDescription(value);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
value = structureElementCommandsUpdate[1].getComment();
structureElementCommandsUpdate[1].setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setComment(value);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -746,52 +746,52 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- approvedStructureElements = ITUtilStructureElement.assertCreateApprove(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandsUpdate[0].setDescription("0");
structureElementCommandsUpdate[1].setDescription("1");
@@ -800,73 +800,73 @@ class StructuresMultipleIT {
structureElementCommandsUpdate[4].setDescription("4");
structureElementCommandsUpdate[5].setDescription("5");
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- updatedStructureElements = ITUtilStructureElement.assertUpdate(structureElementCommandsUpdate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ updatedStructureElements = ITUtilStructures.assertUpdate(structureElementCommandsUpdate);
assertNotNull(updatedStructureElements);
assertEquals(6, updatedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- approvedStructureElements = ITUtilStructureElement.assertApprove(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ approvedStructureElements = ITUtilStructures.assertApprove(structureElementCommandsConfirm);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUa", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -913,52 +913,52 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- approvedStructureElements = ITUtilStructureElement.assertCreateApprove(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandsUpdate[0].setDescription("0");
structureElementCommandsUpdate[1].setDescription("1");
@@ -967,73 +967,73 @@ class StructuresMultipleIT {
structureElementCommandsUpdate[4].setDescription("4");
structureElementCommandsUpdate[5].setDescription("5");
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- updatedStructureElements = ITUtilStructureElement.assertUpdate(structureElementCommandsUpdate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ updatedStructureElements = ITUtilStructures.assertUpdate(structureElementCommandsUpdate);
assertNotNull(updatedStructureElements);
assertEquals(6, updatedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- cancelledStructureElements = ITUtilStructureElement.assertCancel(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ cancelledStructureElements = ITUtilStructures.assertCancel(structureElementCommandsConfirm);
assertNotNull(cancelledStructureElements);
assertEquals(6, cancelledStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUc", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1080,52 +1080,52 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- approvedStructureElements = ITUtilStructureElement.assertCreateApprove(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
structureElementCommandsUpdate[0].setDescription("0");
structureElementCommandsUpdate[1].setDescription("1");
@@ -1134,73 +1134,73 @@ class StructuresMultipleIT {
structureElementCommandsUpdate[4].setDescription("4");
structureElementCommandsUpdate[5].setDescription("5");
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- updatedStructureElements = ITUtilStructureElement.assertUpdate(structureElementCommandsUpdate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ updatedStructureElements = ITUtilStructures.assertUpdate(structureElementCommandsUpdate);
assertNotNull(updatedStructureElements);
assertEquals(6, updatedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- rejectedStructureElements = ITUtilStructureElement.assertReject(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ rejectedStructureElements = ITUtilStructures.assertReject(structureElementCommandsConfirm);
assertNotNull(rejectedStructureElements);
assertEquals(6, rejectedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiUr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtUr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpUr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtUr", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1248,64 +1248,64 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCd", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCd", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCd", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCd", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCd", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCd", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCd", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCd", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCd", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCd", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCd", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCd", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- approvedStructureElements = ITUtilStructureElement.assertCreateApprove(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCd", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCd", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCd", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCd", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCd", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCd", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCd", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCd", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCd", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCd", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCd", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCd", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCd", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysCd", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubCd", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiCd", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpCd", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtCd", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCd", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysCd", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCd", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiCd", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCd", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCd", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgCd", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysCd", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubCd", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiCd", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpCd", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtCd", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgCd", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysCd", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubCd", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiCd", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCd", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtCd", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
uuid = structureElementCommandsConfirm[1].getUuid();
structureElementCommandsConfirm[1].setUuid(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
structureElementCommandsConfirm[1].setUuid(uuid);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
value = structureElementCommandsConfirm[1].getComment();
structureElementCommandsConfirm[1].setComment(null);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
structureElementCommandsConfirm[1].setComment(value);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1349,100 +1349,100 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDa", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- approvedStructureElements = ITUtilStructureElement.assertCreateApprove(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDa", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDa", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- deletedStructureElements = ITUtilStructureElement.assertDelete(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDa", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ deletedStructureElements = ITUtilStructures.assertDelete(structureElementCommandsConfirm);
assertNotNull(deletedStructureElements);
assertEquals(6, deletedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDa", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDa", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- approvedStructureElements = ITUtilStructureElement.assertApprove(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDa", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDa", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ approvedStructureElements = ITUtilStructures.assertApprove(structureElementCommandsConfirm);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDa", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDa", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDa", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDa", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1489,100 +1489,100 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDc", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- approvedStructureElements = ITUtilStructureElement.assertCreateApprove(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDc", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDc", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- deletedStructureElements = ITUtilStructureElement.assertDelete(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDc", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ deletedStructureElements = ITUtilStructures.assertDelete(structureElementCommandsConfirm);
assertNotNull(deletedStructureElements);
assertEquals(6, deletedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDc", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- cancelledStructureElements = ITUtilStructureElement.assertCancel(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDc", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ cancelledStructureElements = ITUtilStructures.assertCancel(structureElementCommandsConfirm);
assertNotNull(cancelledStructureElements);
assertEquals(6, cancelledStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDc", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDc", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDc", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDc", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDc", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDc", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDc", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}
@@ -1629,100 +1629,100 @@ class StructuresMultipleIT {
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
structureElementCommandsConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommands);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDr", Boolean.TRUE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- approvedStructureElements = ITUtilStructureElement.assertCreateApprove(structureElementCommandsCreate);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDr", Boolean.TRUE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
assertNotNull(approvedStructureElements);
assertEquals(6, approvedStructureElements.length);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDr", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
-
- deletedStructureElements = ITUtilStructureElement.assertDelete(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDr", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+
+ deletedStructureElements = ITUtilStructures.assertDelete(structureElementCommandsConfirm);
assertNotNull(deletedStructureElements);
assertEquals(6, deletedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDr", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
-
- rejectedStructureElements = ITUtilStructureElement.assertReject(structureElementCommandsConfirm);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDr", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.TRUE);
+
+ rejectedStructureElements = ITUtilStructures.assertReject(structureElementCommandsConfirm);
assertNotNull(rejectedStructureElements);
assertEquals(6, rejectedStructureElements.length);
- ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SYSTEM, "SysDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-SubDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DISCIPLINE, "DiDr", Boolean.TRUE);
- ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
- ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-DtDr", Boolean.TRUE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "SysDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "DiDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
- ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDr", Boolean.FALSE);
-
- ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.SYSTEMGROUP, "SgDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SYSTEM, "SysDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys-SubDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DISCIPLINE, "DiDr", Boolean.TRUE);
+ ITUtilStructures.assertExists(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
+ ITUtilStructures.assertExists(Type.DEVICETYPE, "Di-DtDr", Boolean.TRUE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEMGROUP, "SgDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SYSTEM, "SysDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-SubDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DISCIPLINE, "DiDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDr", Boolean.FALSE);
+ ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtDr", Boolean.FALSE);
+
+ ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL, Boolean.FALSE);
+ ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT, Boolean.FALSE);
} catch (Exception e) {
fail();
}