From 9ee6b80cf99b6ba5134093b9dce5e35564e11b4a Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Thu, 5 May 2022 10:06:18 +0200
Subject: [PATCH] Fix issues as noted by SonarLint
Declarations should use Java collection interfaces such as "List" rather than specific implementation classes such as "LinkedList"
Empty statements should be removed
JUnit assertTrue/assertFalse should be simplified to the corresponding dedicated assertion
JUnit5 test classes and methods should have default package visibility
Methods and field names should not be the same or differ only by capitalization
Nested "enum"s should not be declared static
---
.../GlobalControllerExceptionHandler.java | 7 --
.../org/openepics/names/util/EnumUtil.java | 4 +-
.../names/util/HolderIRepositories.java | 14 +--
.../names/util/HolderRepositories.java | 14 +--
.../util/HolderSystemDeviceStructure.java | 14 +--
.../org/openepics/names/util/NameUtil.java | 2 +-
.../names/util/StructureElementUtil.java | 2 +-
.../openepics/names/util/ValidateUtil.java | 6 +-
.../openepics/names/docker/HealthcheckIT.java | 4 +-
.../org/openepics/names/docker/NamesIT.java | 24 ++---
.../names/docker/StructuresDeviceGroupIT.java | 42 ++++-----
.../names/docker/StructuresDeviceTypeIT.java | 42 ++++-----
.../names/docker/StructuresDisciplineIT.java | 42 ++++-----
.../names/docker/StructuresSubsystemIT.java | 42 ++++-----
.../names/docker/StructuresSystemGroupIT.java | 42 ++++-----
.../names/docker/StructuresSystemIT.java | 42 ++++-----
.../docker/complex/NamesInstanceIndexIT.java | 18 ++--
.../complex/StructuresCreateLevel3IT.java | 6 +-
.../names/util/EssNamingConventionTest.java | 87 ++++++++++---------
.../names/util/ExceptionUtilTest.java | 22 ++---
.../names/util/NameElementUtilTest.java | 6 +-
.../openepics/names/util/NameUtilTest.java | 6 +-
.../names/util/NamingConventionUtilTest.java | 30 +++----
.../names/util/StructureElementUtilTest.java | 6 +-
.../names/util/ValidateUtilTest.java | 60 ++++++-------
25 files changed, 290 insertions(+), 294 deletions(-)
diff --git a/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java b/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
index 67116228..5aaf9bdd 100644
--- a/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
+++ b/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
@@ -18,9 +18,6 @@
package org.openepics.names.rest.controller;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.apache.commons.lang3.StringUtils;
import org.openepics.names.rest.beans.response.Response;
import org.openepics.names.service.exception.DataConflictException;
@@ -62,12 +59,8 @@ public class GlobalControllerExceptionHandler extends ResponseEntityExceptionHan
// note
// no logging here
- private static final Logger LOGGER = Logger.getLogger(GlobalControllerExceptionHandler.class.getName());
-
@ExceptionHandler
protected ResponseEntity<Response> handleConflict(RuntimeException ex, WebRequest request) {
- LOGGER.log(Level.INFO, "handleConflict, ex.getMessage: " + ex.getMessage());
-
Response response = new Response("", "", "");
response.setMessage(TextUtil.OPERATION_COULD_NOT_BE_PERFORMED);
diff --git a/src/main/java/org/openepics/names/util/EnumUtil.java b/src/main/java/org/openepics/names/util/EnumUtil.java
index e8423086..ae1e9771 100644
--- a/src/main/java/org/openepics/names/util/EnumUtil.java
+++ b/src/main/java/org/openepics/names/util/EnumUtil.java
@@ -25,8 +25,8 @@ package org.openepics.names.util;
*/
public class EnumUtil {
- public static enum NameChoice {CREATE, UPDATE, DELETE};
- public static enum StructureChoice {CREATE, UPDATE, DELETE, APPROVE, REJECT, CANCEL};
+ public enum NameChoice {CREATE, UPDATE, DELETE}
+ public enum StructureChoice {CREATE, UPDATE, DELETE, APPROVE, REJECT, CANCEL}
/**
* This class is not to be instantiated.
diff --git a/src/main/java/org/openepics/names/util/HolderIRepositories.java b/src/main/java/org/openepics/names/util/HolderIRepositories.java
index d0b8e5fd..f168c141 100644
--- a/src/main/java/org/openepics/names/util/HolderIRepositories.java
+++ b/src/main/java/org/openepics/names/util/HolderIRepositories.java
@@ -78,7 +78,7 @@ public class HolderIRepositories {
*/
public INameRepository getNameRepository() {
return nameRepository;
- };
+ }
/**
* Return reference to system group repository.
@@ -87,7 +87,7 @@ public class HolderIRepositories {
*/
public ISystemGroupRepository getSystemGroupRepository() {
return systemGroupRepository;
- };
+ }
/**
* Return reference to system repository.
*
@@ -95,7 +95,7 @@ public class HolderIRepositories {
*/
public ISystemRepository getSystemRepository() {
return systemRepository;
- };
+ }
/**
* Return reference to subsystem repository.
*
@@ -103,7 +103,7 @@ public class HolderIRepositories {
*/
public ISubsystemRepository getSubsystemRepository() {
return subsystemRepository;
- };
+ }
/**
* Return reference to discipline repository.
@@ -112,7 +112,7 @@ public class HolderIRepositories {
*/
public IDisciplineRepository getDisciplineRepository() {
return disciplineRepository;
- };
+ }
/**
* Return reference to device group repository.
*
@@ -120,7 +120,7 @@ public class HolderIRepositories {
*/
public IDeviceGroupRepository getDeviceGroupRepository() {
return deviceGroupRepository;
- };
+ }
/**
* Return reference to device type repository.
*
@@ -128,6 +128,6 @@ public class HolderIRepositories {
*/
public IDeviceTypeRepository getDeviceTypeRepository() {
return deviceTypeRepository;
- };
+ }
}
diff --git a/src/main/java/org/openepics/names/util/HolderRepositories.java b/src/main/java/org/openepics/names/util/HolderRepositories.java
index 0fcd1dfe..3d73915a 100644
--- a/src/main/java/org/openepics/names/util/HolderRepositories.java
+++ b/src/main/java/org/openepics/names/util/HolderRepositories.java
@@ -78,7 +78,7 @@ public class HolderRepositories {
*/
public NameRepository getNameRepository() {
return nameRepository;
- };
+ }
/**
* Return reference to system group repository.
@@ -87,7 +87,7 @@ public class HolderRepositories {
*/
public SystemGroupRepository getSystemGroupRepository() {
return systemGroupRepository;
- };
+ }
/**
* Return reference to system repository.
*
@@ -95,7 +95,7 @@ public class HolderRepositories {
*/
public SystemRepository getSystemRepository() {
return systemRepository;
- };
+ }
/**
* Return reference to subsystem repository.
*
@@ -103,7 +103,7 @@ public class HolderRepositories {
*/
public SubsystemRepository getSubsystemRepository() {
return subsystemRepository;
- };
+ }
/**
* Return reference to discipline repository.
@@ -112,7 +112,7 @@ public class HolderRepositories {
*/
public DisciplineRepository getDisciplineRepository() {
return disciplineRepository;
- };
+ }
/**
* Return reference to device group repository.
*
@@ -120,7 +120,7 @@ public class HolderRepositories {
*/
public DeviceGroupRepository getDeviceGroupRepository() {
return deviceGroupRepository;
- };
+ }
/**
* Return reference to device type repository.
*
@@ -128,6 +128,6 @@ public class HolderRepositories {
*/
public DeviceTypeRepository getDeviceTypeRepository() {
return deviceTypeRepository;
- };
+ }
}
diff --git a/src/main/java/org/openepics/names/util/HolderSystemDeviceStructure.java b/src/main/java/org/openepics/names/util/HolderSystemDeviceStructure.java
index 456c4c42..9ae0ee09 100644
--- a/src/main/java/org/openepics/names/util/HolderSystemDeviceStructure.java
+++ b/src/main/java/org/openepics/names/util/HolderSystemDeviceStructure.java
@@ -20,6 +20,7 @@ package org.openepics.names.util;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
import org.openepics.names.repository.model.DeviceGroup;
@@ -190,7 +191,7 @@ public class HolderSystemDeviceStructure {
*
* @return map with key-value pairs (uuid and system group)
*/
- public HashMap<UUID, SystemGroup> getUuidSystemGroups() {
+ public Map<UUID, SystemGroup> getUuidSystemGroups() {
return systemGroups;
}
@@ -199,7 +200,7 @@ public class HolderSystemDeviceStructure {
*
* @return map with key-value pairs (uuid and system)
*/
- public HashMap<UUID, System> getUuidSystems() {
+ public Map<UUID, System> getUuidSystems() {
return systems;
}
@@ -208,7 +209,7 @@ public class HolderSystemDeviceStructure {
*
* @return map with key-value pairs (uuid and subsystem)
*/
- public HashMap<UUID, Subsystem> getUuidSubsystems() {
+ public Map<UUID, Subsystem> getUuidSubsystems() {
return subsystems;
}
@@ -217,7 +218,7 @@ public class HolderSystemDeviceStructure {
*
* @return map with key-value pairs (uuid and discipline)
*/
- public HashMap<UUID, Discipline> getUuidDisciplines() {
+ public Map<UUID, Discipline> getUuidDisciplines() {
return disciplines;
}
@@ -226,7 +227,7 @@ public class HolderSystemDeviceStructure {
*
* @return map with key-value pairs (uuid and device group)
*/
- public HashMap<UUID, DeviceGroup> getUuidDeviceGroups() {
+ public Map<UUID, DeviceGroup> getUuidDeviceGroups() {
return deviceGroups;
}
@@ -235,7 +236,8 @@ public class HolderSystemDeviceStructure {
*
* @return map with key-value pairs (uuid and device type)
*/
- public HashMap<UUID, DeviceType> getUuidDeviceTypes() {
+ public Map<UUID, DeviceType> getUuidDeviceTypes() {
return deviceTypes;
}
+
}
diff --git a/src/main/java/org/openepics/names/util/NameUtil.java b/src/main/java/org/openepics/names/util/NameUtil.java
index 94752439..e8153db8 100644
--- a/src/main/java/org/openepics/names/util/NameUtil.java
+++ b/src/main/java/org/openepics/names/util/NameUtil.java
@@ -59,7 +59,7 @@ public class NameUtil {
int count = 0;
if (name.getSystemgroupUuid() != null) {
count++;
- };
+ }
if (name.getSystemUuid() != null) {
count++;
}
diff --git a/src/main/java/org/openepics/names/util/StructureElementUtil.java b/src/main/java/org/openepics/names/util/StructureElementUtil.java
index f26e2aca..bfaf0498 100644
--- a/src/main/java/org/openepics/names/util/StructureElementUtil.java
+++ b/src/main/java/org/openepics/names/util/StructureElementUtil.java
@@ -43,7 +43,7 @@ import com.google.common.collect.Lists;
*/
public class StructureElementUtil {
- public static enum StructureChoice {HISTORY, STRUCTURE};
+ public enum StructureChoice {HISTORY, STRUCTURE}
private static final long THOUSAND_MILLISECONDS = 1000;
diff --git a/src/main/java/org/openepics/names/util/ValidateUtil.java b/src/main/java/org/openepics/names/util/ValidateUtil.java
index 7afc513e..323aa70c 100644
--- a/src/main/java/org/openepics/names/util/ValidateUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateUtil.java
@@ -69,8 +69,8 @@ public class ValidateUtil {
// update - uuid, type, parent, name, mnemonic, description, comment
// delete - uuid, type comment
- private static enum NameChoice {CREATE, UPDATE, DELETE};
- private static enum StructureChoice {CREATE, UPDATE, DELETE, APPROVE, REJECT, CANCEL};
+ private enum NameChoice {CREATE, UPDATE, DELETE}
+ private enum StructureChoice {CREATE, UPDATE, DELETE, APPROVE, REJECT, CANCEL}
/**
* This class is not to be instantiated.
@@ -530,7 +530,7 @@ public class ValidateUtil {
int count = 0;
if (sg != null) {
count++;
- };
+ }
if (sys != null) {
count++;
}
diff --git a/src/test/java/org/openepics/names/docker/HealthcheckIT.java b/src/test/java/org/openepics/names/docker/HealthcheckIT.java
index 868d3996..ed799e03 100644
--- a/src/test/java/org/openepics/names/docker/HealthcheckIT.java
+++ b/src/test/java/org/openepics/names/docker/HealthcheckIT.java
@@ -43,7 +43,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Lars Johansson
*/
@Testcontainers
-public class HealthcheckIT {
+class HealthcheckIT {
@Container
public static final DockerComposeContainer<?> ENVIRONMENT =
@@ -51,7 +51,7 @@ public class HealthcheckIT {
.waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1));
@Test
- public void readHealthcheck() {
+ void readHealthcheck() {
try {
String address = ITUtil.HTTP_IP_PORT_NAMING + "/healthcheck";
int responseCode = ITUtil.doGet(address);
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index dccd7cde..740fcea5 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -51,7 +51,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author Lars Johansson
*/
@Testcontainers
-public class NamesIT {
+class NamesIT {
// note
// NameElement extends NameElementCommand, StructureElement extends StructureElementCommand
@@ -155,7 +155,7 @@ public class NamesIT {
}
@Test
- public void equivalenceName() {
+ void equivalenceName() {
// purpose
// test name equivalence
//
@@ -166,7 +166,7 @@ public class NamesIT {
}
@Test
- public void existsName() {
+ void existsName() {
// purpose
// test if name exists
//
@@ -177,7 +177,7 @@ public class NamesIT {
}
@Test
- public void isLegacyName() {
+ void isLegacyName() {
// purpose
// test if name is legacy name
//
@@ -188,7 +188,7 @@ public class NamesIT {
}
@Test
- public void isValidToCreateName() {
+ void isValidToCreateName() {
// purpose
// test if name is valid to create
//
@@ -199,7 +199,7 @@ public class NamesIT {
}
@Test
- public void checkCreate() {
+ void checkCreate() {
// purpose
// test conditions for create name
// not create itself
@@ -358,7 +358,7 @@ public class NamesIT {
}
@Test
- public void create() {
+ void create() {
// purpose
// test create name
//
@@ -413,7 +413,7 @@ public class NamesIT {
}
@Test
- public void checkUpdate() {
+ void checkUpdate() {
// purpose
// test conditions for update name
// not update
@@ -525,7 +525,7 @@ public class NamesIT {
}
@Test
- public void update() {
+ void update() {
// purpose
// test update name
//
@@ -569,7 +569,7 @@ public class NamesIT {
}
@Test
- public void checkDelete() {
+ void checkDelete() {
// purpose
// test conditions for delete name
// not delete
@@ -647,7 +647,7 @@ public class NamesIT {
}
@Test
- public void delete() {
+ void delete() {
// purpose
// test delete name
//
@@ -693,7 +693,7 @@ public class NamesIT {
}
@Test
- public void readSearchHistoryDeleted() {
+ void readSearchHistoryDeleted() {
// purpose
// test read names in various ways for create
// search
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index d55e71dc..c3c204b2 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -49,7 +49,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Lars Johansson
*/
@Testcontainers
-public class StructuresDeviceGroupIT {
+class StructuresDeviceGroupIT {
// note
// StructureElement - when, who, comment - depend on requested or processed
@@ -104,7 +104,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void equivalenceMnemonic() {
+ void equivalenceMnemonic() {
// purpose
// test mnemonic equivalence
//
@@ -115,7 +115,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void checkCreate() {
+ void checkCreate() {
// purpose
// test conditions for create device group
// not create itself
@@ -180,7 +180,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void checkCreateMnemonic() {
+ void checkCreateMnemonic() {
// purpose
// test conditions for create device group
// not create itself
@@ -292,7 +292,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void createApprove() {
+ void createApprove() {
// purpose
// test create and approve system
//
@@ -342,7 +342,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void createCancel() {
+ void createCancel() {
// purpose
// test create and cancel system
//
@@ -392,7 +392,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void createReject() {
+ void createReject() {
// purpose
// test create and reject system
//
@@ -442,7 +442,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void checkUpdate() {
+ void checkUpdate() {
// purpose
// test conditions for update device group
// not update
@@ -534,7 +534,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void updateApprove() {
+ void updateApprove() {
// purpose
// test update and approve device group
//
@@ -581,7 +581,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void updateCancel() {
+ void updateCancel() {
// purpose
// test update and cancel device group
//
@@ -630,7 +630,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void updateReject() {
+ void updateReject() {
// purpose
// test update and reject device group
//
@@ -679,7 +679,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void checkDelete() {
+ void checkDelete() {
// purpose
// test conditions for delete device group
// not delete
@@ -767,7 +767,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void deleteApprove() {
+ void deleteApprove() {
// purpose
// test delete and approve device group
//
@@ -814,7 +814,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void deleteCancel() {
+ void deleteCancel() {
// purpose
// test delete and cancel device group
//
@@ -863,7 +863,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void deleteReject() {
+ void deleteReject() {
// purpose
// test delete and reject device group
//
@@ -912,7 +912,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void readSearchHistoryApprove() {
+ void readSearchHistoryApprove() {
// purpose
// test read device group in various ways for create, approve
// search
@@ -994,7 +994,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void readSearchHistoryCancel() {
+ void readSearchHistoryCancel() {
// purpose
// test read device group in various ways for create, cancel
// search
@@ -1076,7 +1076,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void readSearchHistoryReject() {
+ void readSearchHistoryReject() {
// purpose
// test read device group in various ways for create, reject
// search
@@ -1158,7 +1158,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void readSearchHistoryStatusLatest1() {
+ void readSearchHistoryStatusLatest1() {
// purpose
// test read device type in various ways
// status
@@ -1260,7 +1260,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void readSearchHistoryStatusLatest9() {
+ void readSearchHistoryStatusLatest9() {
// purpose
// test read device type in various ways
// status
@@ -1430,7 +1430,7 @@ public class StructuresDeviceGroupIT {
}
@Test
- public void readSearchStatusDeletedChildren() {
+ void readSearchStatusDeletedChildren() {
// purpose
// test read device group in various ways
// status
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index 2c43e23b..e12710bd 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -49,7 +49,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Lars Johansson
*/
@Testcontainers
-public class StructuresDeviceTypeIT {
+class StructuresDeviceTypeIT {
// note
// StructureElement - when, who, comment - depend on requested or processed
@@ -104,7 +104,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void equivalenceMnemonic() {
+ void equivalenceMnemonic() {
// purpose
// test mnemonic equivalence
//
@@ -115,7 +115,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void checkCreate() {
+ void checkCreate() {
// purpose
// test conditions for create device type
// not create itself
@@ -192,7 +192,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void checkCreateMnemonic() {
+ void checkCreateMnemonic() {
// purpose
// test conditions for create device type
// not create itself
@@ -304,7 +304,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void createApprove() {
+ void createApprove() {
// purpose
// test create and approve system
//
@@ -354,7 +354,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void createCancel() {
+ void createCancel() {
// purpose
// test create and cancel system
//
@@ -404,7 +404,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void createReject() {
+ void createReject() {
// purpose
// test create and reject system
//
@@ -454,7 +454,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void checkUpdate() {
+ void checkUpdate() {
// purpose
// test conditions for update device type
// not update
@@ -546,7 +546,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void updateApprove() {
+ void updateApprove() {
// purpose
// test update and approve device type
//
@@ -593,7 +593,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void updateCancel() {
+ void updateCancel() {
// purpose
// test update and cancel device type
//
@@ -642,7 +642,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void updateReject() {
+ void updateReject() {
// purpose
// test update and reject device type
//
@@ -691,7 +691,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void checkDelete() {
+ void checkDelete() {
// purpose
// test conditions for delete device type
// not delete
@@ -779,7 +779,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void deleteApprove() {
+ void deleteApprove() {
// purpose
// test delete and approve device type
//
@@ -826,7 +826,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void deleteCancel() {
+ void deleteCancel() {
// purpose
// test delete and cancel device type
//
@@ -875,7 +875,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void deleteReject() {
+ void deleteReject() {
// purpose
// test delete and reject device type
//
@@ -924,7 +924,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void readSearchHistoryApprove() {
+ void readSearchHistoryApprove() {
// purpose
// test read device type in various ways for create, approve
// search
@@ -1008,7 +1008,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void readSearchHistoryCancel() {
+ void readSearchHistoryCancel() {
// purpose
// test read device type in various ways for create, cancel
// search
@@ -1092,7 +1092,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void readSearchHistoryReject() {
+ void readSearchHistoryReject() {
// purpose
// test read device type in various ways for create, reject
// search
@@ -1176,7 +1176,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void readSearchHistoryStatusLatest1() {
+ void readSearchHistoryStatusLatest1() {
// purpose
// test read device type in various ways
// status
@@ -1281,7 +1281,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void readSearchHistoryStatusLatest9() {
+ void readSearchHistoryStatusLatest9() {
// purpose
// test read device type in various ways
// status
@@ -1454,7 +1454,7 @@ public class StructuresDeviceTypeIT {
}
@Test
- public void readSearchStatusDeletedChildren() {
+ void readSearchStatusDeletedChildren() {
// purpose
// test read device type in various ways
// status
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index 00fbe9cd..b92dac7e 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -48,7 +48,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Lars Johansson
*/
@Testcontainers
-public class StructuresDisciplineIT {
+class StructuresDisciplineIT {
// note
// StructureElement - when, who, comment - depend on requested or processed
@@ -78,7 +78,7 @@ public class StructuresDisciplineIT {
.waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1));
@Test
- public void equivalenceMnemonic() {
+ void equivalenceMnemonic() {
// purpose
// test mnemonic equivalence
//
@@ -89,7 +89,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void checkCreate() {
+ void checkCreate() {
// purpose
// test conditions for create discipline
// not create itself
@@ -149,7 +149,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void checkCreateMnemonic() {
+ void checkCreateMnemonic() {
// purpose
// test conditions for create discipline
// not create itself
@@ -260,7 +260,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void createApprove() {
+ void createApprove() {
// purpose
// test create and approve discipline
//
@@ -310,7 +310,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void createCancel() {
+ void createCancel() {
// purpose
// test create and cancel discipline
//
@@ -360,7 +360,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void createReject() {
+ void createReject() {
// purpose
// test create and reject discipline
//
@@ -410,7 +410,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void checkUpdate() {
+ void checkUpdate() {
// purpose
// test conditions for update discipline
// not update
@@ -495,7 +495,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void updateApprove() {
+ void updateApprove() {
// purpose
// test update and approve discipline
//
@@ -542,7 +542,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void updateCancel() {
+ void updateCancel() {
// purpose
// test update and cancel discipline
//
@@ -591,7 +591,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void updateReject() {
+ void updateReject() {
// purpose
// test update and reject discipline
//
@@ -640,7 +640,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void checkDelete() {
+ void checkDelete() {
// purpose
// test conditions for delete discipline
// not delete
@@ -722,7 +722,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void deleteApprove() {
+ void deleteApprove() {
// purpose
// test delete and approve discipline
//
@@ -769,7 +769,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void deleteCancel() {
+ void deleteCancel() {
// purpose
// test delete and cancel discipline
//
@@ -818,7 +818,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void deleteReject() {
+ void deleteReject() {
// purpose
// test delete and reject discipline
//
@@ -867,7 +867,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void readSearchHistoryApprove() {
+ void readSearchHistoryApprove() {
// purpose
// test read discipline in various ways for create, approve
// search
@@ -941,7 +941,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void readSearchHistoryCancel() {
+ void readSearchHistoryCancel() {
// purpose
// test read discipline in various ways for create, cancel
// search
@@ -1015,7 +1015,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void readSearchHistoryReject() {
+ void readSearchHistoryReject() {
// purpose
// test read discipline in various ways for create, reject
// search
@@ -1089,7 +1089,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void readSearchHistoryStatusLatest1() {
+ void readSearchHistoryStatusLatest1() {
// purpose
// test read discipline in various ways
// status
@@ -1190,7 +1190,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void readSearchHistoryStatusLatest9() {
+ void readSearchHistoryStatusLatest9() {
// purpose
// test read discipline in various ways
// status
@@ -1359,7 +1359,7 @@ public class StructuresDisciplineIT {
}
@Test
- public void readSearchStatusDeletedChildren() {
+ void readSearchStatusDeletedChildren() {
// purpose
// test read discipline in various ways
// status
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index 830a7af8..8a0aaab9 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -49,7 +49,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Lars Johansson
*/
@Testcontainers
-public class StructuresSubsystemIT {
+class StructuresSubsystemIT {
// note
// StructureElement - when, who, comment - depend on requested or processed
@@ -104,7 +104,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void equivalenceMnemonic() {
+ void equivalenceMnemonic() {
// purpose
// test mnemonic equivalence
//
@@ -115,7 +115,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void checkCreate() {
+ void checkCreate() {
// purpose
// test conditions for create subsystem
// not create itself
@@ -194,7 +194,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void checkCreateMnemonic() {
+ void checkCreateMnemonic() {
// purpose
// test conditions for create subsystem
// not create itself
@@ -306,7 +306,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void createApprove() {
+ void createApprove() {
// purpose
// test create and approve subsystem
//
@@ -356,7 +356,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void createCancel() {
+ void createCancel() {
// purpose
// test create and cancel subsystem
//
@@ -406,7 +406,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void createReject() {
+ void createReject() {
// purpose
// test create and reject subsystem
//
@@ -456,7 +456,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void checkUpdate() {
+ void checkUpdate() {
// purpose
// test conditions for update subsystem
// not update
@@ -548,7 +548,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void updateApprove() {
+ void updateApprove() {
// purpose
// test update and approve subsystem
//
@@ -595,7 +595,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void updateCancel() {
+ void updateCancel() {
// purpose
// test update and cancel subsystem
//
@@ -644,7 +644,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void updateReject() {
+ void updateReject() {
// purpose
// test update and reject subsystem
//
@@ -693,7 +693,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void checkDelete() {
+ void checkDelete() {
// purpose
// test conditions for delete subsystem
// not delete
@@ -781,7 +781,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void deleteApprove() {
+ void deleteApprove() {
// purpose
// test delete and approve subsystem
//
@@ -828,7 +828,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void deleteCancel() {
+ void deleteCancel() {
// purpose
// test delete and cancel subsystem
//
@@ -877,7 +877,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void deleteReject() {
+ void deleteReject() {
// purpose
// test delete and reject subsystem
//
@@ -926,7 +926,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void readSearchHistoryApprove() {
+ void readSearchHistoryApprove() {
// purpose
// test read subsystem in various ways for create, approve
// search
@@ -1024,7 +1024,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void readSearchHistoryCancel() {
+ void readSearchHistoryCancel() {
// purpose
// test read subsystem in various ways for create, cancel
// search
@@ -1122,7 +1122,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void readSearchHistoryReject() {
+ void readSearchHistoryReject() {
// purpose
// test read subsystem in various ways for create, reject
// search
@@ -1220,7 +1220,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void readSearchHistoryStatusLatest1() {
+ void readSearchHistoryStatusLatest1() {
// purpose
// test read subsystem in various ways
// status
@@ -1329,7 +1329,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void readSearchHistoryStatusLatest9() {
+ void readSearchHistoryStatusLatest9() {
// purpose
// test read subsystem in various ways
// status
@@ -1506,7 +1506,7 @@ public class StructuresSubsystemIT {
}
@Test
- public void readSearchStatusDeletedChildren() {
+ void readSearchStatusDeletedChildren() {
// purpose
// test read subsystem in various ways
// status
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index 733ca51b..04977955 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -49,7 +49,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Lars Johansson
*/
@Testcontainers
-public class StructuresSystemGroupIT {
+class StructuresSystemGroupIT {
// note
// StructureElement - when, who, comment - depend on requested or processed
@@ -79,7 +79,7 @@ public class StructuresSystemGroupIT {
.waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1));
@Test
- public void equivalenceMnemonic() {
+ void equivalenceMnemonic() {
// purpose
// test mnemonic equivalence
//
@@ -90,7 +90,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void checkCreate() {
+ void checkCreate() {
// purpose
// test conditions for create system group
// not create itself
@@ -161,7 +161,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void checkCreateMnemonic() {
+ void checkCreateMnemonic() {
// purpose
// test conditions for create system group
// not create itself
@@ -278,7 +278,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void createApprove() {
+ void createApprove() {
// purpose
// test create and approve system group
//
@@ -352,7 +352,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void createCancel() {
+ void createCancel() {
// purpose
// test create and cancel system group
//
@@ -402,7 +402,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void createReject() {
+ void createReject() {
// purpose
// test create and reject system group
//
@@ -452,7 +452,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void checkUpdate() {
+ void checkUpdate() {
// purpose
// test conditions for update system group
// not update
@@ -537,7 +537,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void updateApprove() {
+ void updateApprove() {
// purpose
// test update and approve system group
//
@@ -585,7 +585,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void updateCancel() {
+ void updateCancel() {
// purpose
// test update and cancel system group
//
@@ -635,7 +635,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void updateReject() {
+ void updateReject() {
// purpose
// test update and reject system group
//
@@ -685,7 +685,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void checkDelete() {
+ void checkDelete() {
// purpose
// test conditions for delete system group
// not delete
@@ -767,7 +767,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void deleteApprove() {
+ void deleteApprove() {
// purpose
// test delete and approve system group
//
@@ -814,7 +814,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void deleteCancel() {
+ void deleteCancel() {
// purpose
// test delete and cancel system group
//
@@ -863,7 +863,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void deleteReject() {
+ void deleteReject() {
// purpose
// test delete and reject system group
//
@@ -912,7 +912,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void readSearchHistoryApprove() {
+ void readSearchHistoryApprove() {
// purpose
// test read system group in various ways for create, approve
// search
@@ -986,7 +986,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void readSearchHistoryCancel() {
+ void readSearchHistoryCancel() {
// purpose
// test read system group in various ways for create, cancel
// search
@@ -1060,7 +1060,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void readSearchHistoryReject() {
+ void readSearchHistoryReject() {
// purpose
// test read system group in various ways for create, reject
// search
@@ -1134,7 +1134,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void readSearchHistoryStatusLatest1() {
+ void readSearchHistoryStatusLatest1() {
// purpose
// test read system group in various ways
// status
@@ -1235,7 +1235,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void readSearchHistoryStatusLatest9() {
+ void readSearchHistoryStatusLatest9() {
// purpose
// test read system group in various ways
// status
@@ -1404,7 +1404,7 @@ public class StructuresSystemGroupIT {
}
@Test
- public void readSearchStatusDeletedChildren() {
+ void readSearchStatusDeletedChildren() {
// purpose
// test read system group in various ways
// status
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index 66852a02..3701d1c9 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -49,7 +49,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Lars Johansson
*/
@Testcontainers
-public class StructuresSystemIT {
+class StructuresSystemIT {
// note
// StructureElement - when, who, comment - depend on requested or processed
@@ -96,7 +96,7 @@ public class StructuresSystemIT {
}
@Test
- public void equivalenceMnemonic() {
+ void equivalenceMnemonic() {
// purpose
// test mnemonic equivalence
//
@@ -107,7 +107,7 @@ public class StructuresSystemIT {
}
@Test
- public void checkCreate() {
+ void checkCreate() {
// purpose
// test conditions for create system
// not create itself
@@ -178,7 +178,7 @@ public class StructuresSystemIT {
}
@Test
- public void checkCreateMnemonic() {
+ void checkCreateMnemonic() {
// purpose
// test conditions for create system
// not create itself
@@ -289,7 +289,7 @@ public class StructuresSystemIT {
}
@Test
- public void createApprove() {
+ void createApprove() {
// purpose
// test create and approve system
//
@@ -339,7 +339,7 @@ public class StructuresSystemIT {
}
@Test
- public void createCancel() {
+ void createCancel() {
// purpose
// test create and cancel system
//
@@ -389,7 +389,7 @@ public class StructuresSystemIT {
}
@Test
- public void createReject() {
+ void createReject() {
// purpose
// test create and reject system
//
@@ -439,7 +439,7 @@ public class StructuresSystemIT {
}
@Test
- public void checkUpdate() {
+ void checkUpdate() {
// purpose
// test conditions for update system
// not update
@@ -531,7 +531,7 @@ public class StructuresSystemIT {
}
@Test
- public void updateApprove() {
+ void updateApprove() {
// purpose
// test update and approve system
//
@@ -578,7 +578,7 @@ public class StructuresSystemIT {
}
@Test
- public void updateCancel() {
+ void updateCancel() {
// purpose
// test update and cancel system
//
@@ -627,7 +627,7 @@ public class StructuresSystemIT {
}
@Test
- public void updateReject() {
+ void updateReject() {
// purpose
// test update and reject system
//
@@ -676,7 +676,7 @@ public class StructuresSystemIT {
}
@Test
- public void checkDelete() {
+ void checkDelete() {
// purpose
// test conditions for delete system
// not delete
@@ -764,7 +764,7 @@ public class StructuresSystemIT {
}
@Test
- public void deleteApprove() {
+ void deleteApprove() {
// purpose
// test delete and approve system
//
@@ -811,7 +811,7 @@ public class StructuresSystemIT {
}
@Test
- public void deleteCancel() {
+ void deleteCancel() {
// purpose
// test delete and cancel system
//
@@ -860,7 +860,7 @@ public class StructuresSystemIT {
}
@Test
- public void deleteReject() {
+ void deleteReject() {
// purpose
// test delete and reject system
//
@@ -909,7 +909,7 @@ public class StructuresSystemIT {
}
@Test
- public void readSearchHistoryApprove() {
+ void readSearchHistoryApprove() {
// purpose
// test read system in various ways for create, approve
// search
@@ -993,7 +993,7 @@ public class StructuresSystemIT {
}
@Test
- public void readSearchHistoryCancel() {
+ void readSearchHistoryCancel() {
// purpose
// test read system in various ways for create, cancel
// search
@@ -1077,7 +1077,7 @@ public class StructuresSystemIT {
}
@Test
- public void readSearchHistoryReject() {
+ void readSearchHistoryReject() {
// purpose
// test read system in various ways for create, reject
// search
@@ -1161,7 +1161,7 @@ public class StructuresSystemIT {
}
@Test
- public void readSearchHistoryStatusLatest1() {
+ void readSearchHistoryStatusLatest1() {
// purpose
// test read system in various ways
// status
@@ -1266,7 +1266,7 @@ public class StructuresSystemIT {
}
@Test
- public void readSearchHistoryStatusLatest9() {
+ void readSearchHistoryStatusLatest9() {
// purpose
// test read system in various ways
// status
@@ -1439,7 +1439,7 @@ public class StructuresSystemIT {
}
@Test
- public void readSearchStatusDeletedChildren() {
+ void readSearchStatusDeletedChildren() {
// purpose
// test read system in various ways
// status
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 1da3e0c2..35278b96 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
@@ -52,7 +52,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
*/
@SuppressWarnings("unused")
@Testcontainers
-public class NamesInstanceIndexIT {
+class NamesInstanceIndexIT {
// note
// disciplines
@@ -536,7 +536,7 @@ public class NamesInstanceIndexIT {
}
@Test
- public void checkCreateInstanceIndex_Cryo() {
+ void checkCreateInstanceIndex_Cryo() {
// purpose
// test conditions for create name
// not create itself
@@ -675,7 +675,7 @@ public class NamesInstanceIndexIT {
}
@Test
- public void checkCreateInstanceIndex_EMR() {
+ void checkCreateInstanceIndex_EMR() {
// purpose
// test conditions for create name
// not create itself
@@ -814,7 +814,7 @@ public class NamesInstanceIndexIT {
}
@Test
- public void checkCreateInstanceIndex_HVAC() {
+ void checkCreateInstanceIndex_HVAC() {
// purpose
// test conditions for create name
// not create itself
@@ -953,7 +953,7 @@ public class NamesInstanceIndexIT {
}
@Test
- public void checkCreateInstanceIndex_Proc() {
+ void checkCreateInstanceIndex_Proc() {
// purpose
// test conditions for create name
// not create itself
@@ -1092,7 +1092,7 @@ public class NamesInstanceIndexIT {
}
@Test
- public void checkCreateInstanceIndex_SC() {
+ void checkCreateInstanceIndex_SC() {
// purpose
// test conditions for create name
// not create itself
@@ -1231,7 +1231,7 @@ public class NamesInstanceIndexIT {
}
@Test
- public void checkCreateInstanceIndex_Vac() {
+ void checkCreateInstanceIndex_Vac() {
// purpose
// test conditions for create name
// not create itself
@@ -1370,7 +1370,7 @@ public class NamesInstanceIndexIT {
}
@Test
- public void checkCreateInstanceIndex_WtrC() {
+ void checkCreateInstanceIndex_WtrC() {
// purpose
// test conditions for create name
// not create itself
@@ -1509,7 +1509,7 @@ public class NamesInstanceIndexIT {
}
@Test
- public void checkCreateInstanceIndex_BMD() {
+ void checkCreateInstanceIndex_BMD() {
// purpose
// test conditions for create name
// not create itself
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
index 938ae980..aaa5f605 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
@@ -48,7 +48,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Lars Johansson
*/
@Testcontainers
-public class StructuresCreateLevel3IT {
+class StructuresCreateLevel3IT {
// note
// create in order to approve
@@ -266,7 +266,7 @@ public class StructuresCreateLevel3IT {
}
@Test
- public void createSubsystem() {
+ void createSubsystem() {
// purpose
// test create and approve subsystem
// all create, then all approve
@@ -325,7 +325,7 @@ public class StructuresCreateLevel3IT {
}
@Test
- public void createDeviceType() {
+ void createDeviceType() {
// purpose
// test create and approve device type
// all create, then all approve
diff --git a/src/test/java/org/openepics/names/util/EssNamingConventionTest.java b/src/test/java/org/openepics/names/util/EssNamingConventionTest.java
index 41ef7451..89bd9c28 100644
--- a/src/test/java/org/openepics/names/util/EssNamingConventionTest.java
+++ b/src/test/java/org/openepics/names/util/EssNamingConventionTest.java
@@ -19,6 +19,7 @@ package org.openepics.names.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.AfterAll;
@@ -134,7 +135,7 @@ public class EssNamingConventionTest {
* Test of equivalence class representative method.
*/
@Test
- public void equivalenceClassRepresentative() {
+ void equivalenceClassRepresentative() {
assertEquals("RFQ-10:EMR-TT-1", namingConvention.equivalenceClassRepresentative("RFQ-010:EMR-TT-001"));
assertEquals("RFQ-10:EMR-TT-10", namingConvention.equivalenceClassRepresentative("RFQ-010:EMR-TT-010"));
assertEquals("RFQ-10:EMR-TT-11", namingConvention.equivalenceClassRepresentative("RFQ-010:EMR-TT-011"));
@@ -186,7 +187,7 @@ public class EssNamingConventionTest {
* Test of equivalence class representative method for similarity to <tt>1</tt>.
*/
@Test
- public void equivalenceClassRepresentativeSimilarTo1() {
+ void equivalenceClassRepresentativeSimilarTo1() {
assertEquals(
namingConvention.equivalenceClassRepresentative(NUM_1),
namingConvention.equivalenceClassRepresentative(NUM_1));
@@ -202,16 +203,16 @@ public class EssNamingConventionTest {
assertEquals(
namingConvention.equivalenceClassRepresentative(NUM_1),
namingConvention.equivalenceClassRepresentative("i"));
- assertFalse(
- namingConvention.equivalenceClassRepresentative(NUM_1).equals(
- namingConvention.equivalenceClassRepresentative("b")));
+ assertNotEquals(
+ namingConvention.equivalenceClassRepresentative(NUM_1),
+ namingConvention.equivalenceClassRepresentative("b"));
}
/**
* Test of equivalence class representative method for similarity to <tt>0</tt>.
*/
@Test
- public void equivalenceClassRepresentativeSimilarTo0() {
+ void equivalenceClassRepresentativeSimilarTo0() {
assertEquals(
namingConvention.equivalenceClassRepresentative(NUM_0),
namingConvention.equivalenceClassRepresentative("o"));
@@ -221,44 +222,44 @@ public class EssNamingConventionTest {
assertEquals(
namingConvention.equivalenceClassRepresentative(NUM_0),
namingConvention.equivalenceClassRepresentative(NUM_0));
- assertFalse(
- namingConvention.equivalenceClassRepresentative(NUM_0).equals(
- namingConvention.equivalenceClassRepresentative("b")));
+ assertNotEquals(
+ namingConvention.equivalenceClassRepresentative(NUM_0),
+ namingConvention.equivalenceClassRepresentative("b"));
}
/**
* Test of equivalence class representative method for similarity to <tt>V</tt>.
*/
@Test
- public void equivalenceClassRepresentativeSimilarToV() {
+ void equivalenceClassRepresentativeSimilarToV() {
assertEquals(
namingConvention.equivalenceClassRepresentative("V"),
namingConvention.equivalenceClassRepresentative("v"));
assertEquals(
namingConvention.equivalenceClassRepresentative("V"),
namingConvention.equivalenceClassRepresentative("V"));
- assertFalse(
- namingConvention.equivalenceClassRepresentative("V1").equals(
- namingConvention.equivalenceClassRepresentative("w1")));
- assertFalse(
- namingConvention.equivalenceClassRepresentative("V1").equals(
- namingConvention.equivalenceClassRepresentative("W1")));
- assertFalse(
- namingConvention.equivalenceClassRepresentative("V").equals(
- namingConvention.equivalenceClassRepresentative("w")));
- assertFalse(
- namingConvention.equivalenceClassRepresentative("V").equals(
- namingConvention.equivalenceClassRepresentative("W")));
- assertFalse(
- namingConvention.equivalenceClassRepresentative("V").equals(
- namingConvention.equivalenceClassRepresentative("b")));
+ assertNotEquals(
+ namingConvention.equivalenceClassRepresentative("V1"),
+ namingConvention.equivalenceClassRepresentative("w1"));
+ assertNotEquals(
+ namingConvention.equivalenceClassRepresentative("V1"),
+ namingConvention.equivalenceClassRepresentative("W1"));
+ assertNotEquals(
+ namingConvention.equivalenceClassRepresentative("V"),
+ namingConvention.equivalenceClassRepresentative("w"));
+ assertNotEquals(
+ namingConvention.equivalenceClassRepresentative("V"),
+ namingConvention.equivalenceClassRepresentative("W"));
+ assertNotEquals(
+ namingConvention.equivalenceClassRepresentative("V"),
+ namingConvention.equivalenceClassRepresentative("b"));
}
/**
* Test of equivalence class representative method for lower and upper case characters.
*/
@Test
- public void equivalenceClassRepresentativeLowerAndUpperCaseCharacters() {
+ void equivalenceClassRepresentativeLowerAndUpperCaseCharacters() {
assertEquals(
namingConvention.equivalenceClassRepresentative("tEsTS"),
namingConvention.equivalenceClassRepresentative("TeSts"));
@@ -268,7 +269,7 @@ public class EssNamingConventionTest {
* Test of equivalence class representative method for zero prefixed number.
*/
@Test
- public void equivalenceClassRepresentativeZeroPrefixedNumber() {
+ void equivalenceClassRepresentativeZeroPrefixedNumber() {
assertEquals(
namingConvention.equivalenceClassRepresentative("01"),
namingConvention.equivalenceClassRepresentative("001"));
@@ -284,7 +285,7 @@ public class EssNamingConventionTest {
* Test of equivalence class representative method for zero after alpha character.
*/
@Test
- public void equivalenceClassRepresentativeZeroAfterAlphaCharacter() {
+ void equivalenceClassRepresentativeZeroAfterAlphaCharacter() {
assertEquals(
namingConvention.equivalenceClassRepresentative("Sub0001"),
namingConvention.equivalenceClassRepresentative("Sub1"));
@@ -297,7 +298,7 @@ public class EssNamingConventionTest {
* Test of equivalence class representative method for chained calls to get equivalence class.
*/
@Test
- public void equivalenceClassRepresentativeTwiceEquivalence() {
+ void equivalenceClassRepresentativeTwiceEquivalence() {
// note that of 2 chained calls to equivalenceClassRepresentative, 2nd call may modify
// <==> 2nd output not same as 1st output
assertEquals(
@@ -314,7 +315,7 @@ public class EssNamingConventionTest {
* Test of equivalence class representative method for device type.
*/
@Test
- public void equivalenceClassRepresentativeDeviceType() {
+ void equivalenceClassRepresentativeDeviceType() {
// note handling of trailing zeroes
assertEquals(ECAT10, namingConvention.equivalenceClassRepresentative("ECATIO"));
assertEquals("ECAT1", namingConvention.equivalenceClassRepresentative("ECATI0"));
@@ -334,7 +335,7 @@ public class EssNamingConventionTest {
* Test validity of instance index for device.
*/
@Test
- public void isInstanceIndexValid() {
+ void isInstanceIndexValid() {
String conventionNameBase = SYS + "-" + SUB + ":" + DIS + "-" + DEV;
assertFalse(namingConvention.isInstanceIndexValid(NULL), NULL_NOT_OK);
@@ -406,7 +407,7 @@ public class EssNamingConventionTest {
* Test validity of instance index for device.
*/
@Test
- public void isInstanceIndexValidOverride() {
+ void isInstanceIndexValidOverride() {
// override - length, characters
String conventionNameBase = SYS + "-" + SUB + ":" + DIS + "-" + DEV;
@@ -480,7 +481,7 @@ public class EssNamingConventionTest {
* Test validity of instance index, for device.
*/
@Test
- public void isInstanceIndexValidPIDNumeric() {
+ void isInstanceIndexValidPIDNumeric() {
// depend on discipline, device type
// mnemonic path system structure
@@ -674,7 +675,7 @@ public class EssNamingConventionTest {
* Test validity of instance index, for device.
*/
@Test
- public void isInstanceIndexValidPID() {
+ void isInstanceIndexValidPID() {
// depend on discipline
// mnemonic paths system structure and device structure
@@ -884,7 +885,7 @@ public class EssNamingConventionTest {
* Test validity of instance index, for device.
*/
@Test
- public void isInstanceIndexValidPIDOverride() {
+ void isInstanceIndexValidPIDOverride() {
// depend on discipline
// override - length, characters
@@ -1095,7 +1096,7 @@ public class EssNamingConventionTest {
* Test validity of mnemonic path.
*/
@Test
- public void isMnemonicPathValid() {
+ void isMnemonicPathValid() {
assertFalse(namingConvention.isMnemonicPathValid(NULL));
assertFalse(namingConvention.isMnemonicPathValid(EMPTY));
assertFalse(namingConvention.isMnemonicPathValid(SPACE));
@@ -1116,7 +1117,7 @@ public class EssNamingConventionTest {
* Test if mnemonic is required.
*/
@Test
- public void isMnemonicRequired() {
+ void isMnemonicRequired() {
assertFalse(namingConvention.isMnemonicRequired(null));
assertFalse(namingConvention.isMnemonicRequired(Type.SYSTEMGROUP));
@@ -1148,7 +1149,7 @@ public class EssNamingConventionTest {
* Test validity of mnemonic for system group.
*/
@Test
- public void isSystemGroupValid(){
+ void isSystemGroupValid(){
assertEquals(MnemonicValidation.VALID, testSystemGroup(NULL));
assertEquals(MnemonicValidation.VALID, testSystemGroup(EMPTY));
assertEquals(MnemonicValidation.NON_ACCEPTABLE_CHARS, testSystemGroup(SPACE));
@@ -1177,7 +1178,7 @@ public class EssNamingConventionTest {
* Test validity of mnemonic for system.
*/
@Test
- public void isSystemValid() {
+ void isSystemValid() {
assertEquals(MnemonicValidation.EMPTY, testSystem(NULL));
assertEquals(MnemonicValidation.EMPTY, testSystem(EMPTY));
assertEquals(MnemonicValidation.NON_ACCEPTABLE_CHARS, testSystem(SPACE));
@@ -1204,7 +1205,7 @@ public class EssNamingConventionTest {
* Test validity of mnemonic for subsystem.
*/
@Test
- public void isSubsystemValid() {
+ void isSubsystemValid() {
assertEquals(MnemonicValidation.EMPTY, testSubsystem(NULL));
assertEquals(MnemonicValidation.EMPTY, testSubsystem(EMPTY));
assertEquals(MnemonicValidation.NON_ACCEPTABLE_CHARS, testSubsystem(SPACE));
@@ -1231,7 +1232,7 @@ public class EssNamingConventionTest {
* Test validity of mnemonic for discipline.
*/
@Test
- public void isDisciplineValid() {
+ void isDisciplineValid() {
assertEquals(MnemonicValidation.EMPTY, testDiscipline(NULL));
assertEquals(MnemonicValidation.EMPTY, testDiscipline(EMPTY));
assertEquals(MnemonicValidation.NON_ACCEPTABLE_CHARS, testDiscipline(SPACE));
@@ -1256,7 +1257,7 @@ public class EssNamingConventionTest {
* Test validity of mnemonic for device group.
*/
@Test
- public void isDeviceGroupValid() {
+ void isDeviceGroupValid() {
assertEquals(MnemonicValidation.VALID, testDeviceGroup(NULL));
assertEquals(MnemonicValidation.VALID, testDeviceGroup(EMPTY));
assertEquals(MnemonicValidation.NON_ACCEPTABLE_CHARS, testDeviceGroup(SPACE));
@@ -1281,7 +1282,7 @@ public class EssNamingConventionTest {
* Test validity of mnemonic for device type.
*/
@Test
- public void isDeviceTypeValid() {
+ void isDeviceTypeValid() {
assertEquals(MnemonicValidation.EMPTY, testDeviceType(NULL));
assertEquals(MnemonicValidation.EMPTY, testDeviceType(EMPTY));
assertEquals(MnemonicValidation.NON_ACCEPTABLE_CHARS, testDeviceType(SPACE));
diff --git a/src/test/java/org/openepics/names/util/ExceptionUtilTest.java b/src/test/java/org/openepics/names/util/ExceptionUtilTest.java
index 65936990..dff4a8da 100644
--- a/src/test/java/org/openepics/names/util/ExceptionUtilTest.java
+++ b/src/test/java/org/openepics/names/util/ExceptionUtilTest.java
@@ -41,13 +41,13 @@ import org.openepics.names.service.exception.InputNotValidException;
*
* @see ExceptionUtil
*/
-public class ExceptionUtilTest {
+class ExceptionUtilTest {
/**
* Test of create data conflict exception.
*/
@Test
- public void createDataConflictException() {
+ void createDataConflictException() {
DataConflictException exception = ExceptionUtil.createDataConflictException(null, null, null);
assertNotNull(exception);
assertNull(exception.getMessage());
@@ -60,7 +60,7 @@ public class ExceptionUtilTest {
* Test of create data deleted exception.
*/
@Test
- public void createDataDeletedException() {
+ void createDataDeletedException() {
DataDeletedException exception = ExceptionUtil.createDataDeletedException(null, null, null);
assertNotNull(exception);
assertEquals(null, exception.getMessage());
@@ -73,7 +73,7 @@ public class ExceptionUtilTest {
* Test of create data exist exception.
*/
@Test
- public void createDataExistException() {
+ void createDataExistException() {
DataExistException exception = ExceptionUtil.createDataExistException("1", "2", "3");
assertNotNull(exception);
assertEquals("1", exception.getMessage());
@@ -86,7 +86,7 @@ public class ExceptionUtilTest {
* Test of create data not available exception.
*/
@Test
- public void createDataNotAvailableException() {
+ void createDataNotAvailableException() {
DataNotAvailableException exception = ExceptionUtil.createDataNotAvailableException("1", "2", null);
assertNotNull(exception);
assertEquals("1", exception.getMessage());
@@ -99,7 +99,7 @@ public class ExceptionUtilTest {
* Test of create data not correct exception.
*/
@Test
- public void createDataNotCorrectException() {
+ void createDataNotCorrectException() {
DataNotCorrectException exception = ExceptionUtil.createDataNotCorrectException("1", null, "3");
assertNotNull(exception);
assertEquals("1", exception.getMessage());
@@ -112,7 +112,7 @@ public class ExceptionUtilTest {
* Test of create data not found exception.
*/
@Test
- public void createDataNotFoundException() {
+ void createDataNotFoundException() {
DataNotFoundException exception = ExceptionUtil.createDataNotFoundException("1", null, null);
assertNotNull(exception);
assertEquals("1", exception.getMessage());
@@ -125,7 +125,7 @@ public class ExceptionUtilTest {
* Test of create data not valid exception.
*/
@Test
- public void createDataNotValidException() {
+ void createDataNotValidException() {
DataNotValidException exception = ExceptionUtil.createDataNotValidException(null, "2", "3");
assertNotNull(exception);
assertEquals(null, exception.getMessage());
@@ -138,7 +138,7 @@ public class ExceptionUtilTest {
* Test of create input not available exception.
*/
@Test
- public void createInputNotAvailableException() {
+ void createInputNotAvailableException() {
InputNotAvailableException exception = ExceptionUtil.createInputNotAvailableException(null, "2", null);
assertNotNull(exception);
assertEquals(null, exception.getMessage());
@@ -151,7 +151,7 @@ public class ExceptionUtilTest {
* Test of create input not correct exception.
*/
@Test
- public void createInputNotCorrectException() {
+ void createInputNotCorrectException() {
InputNotCorrectException exception = ExceptionUtil.createInputNotCorrectException(null, null, "3");
assertNotNull(exception);
assertEquals(TextUtil.INPUT_NOT_CORRECT_FOR_FIELD, exception.getMessage());
@@ -164,7 +164,7 @@ public class ExceptionUtilTest {
* Test of create input not valid exception.
*/
@Test
- public void createInputNotValidException() {
+ void createInputNotValidException() {
InputNotValidException exception = ExceptionUtil.createInputNotValidException(null, null, null);
assertNotNull(exception);
assertEquals(null, exception.getMessage());
diff --git a/src/test/java/org/openepics/names/util/NameElementUtilTest.java b/src/test/java/org/openepics/names/util/NameElementUtilTest.java
index 3e91aa7d..02d67ec2 100644
--- a/src/test/java/org/openepics/names/util/NameElementUtilTest.java
+++ b/src/test/java/org/openepics/names/util/NameElementUtilTest.java
@@ -34,13 +34,13 @@ import org.openepics.names.rest.beans.element.NameElement;
*
* @see NameElementUtil
*/
-public class NameElementUtilTest {
+class NameElementUtilTest {
/**
* Test of get name element for name.
*/
@Test
- public void getNameElement() {
+ void getNameElement() {
NameElement nameElement = NameElementUtil.getNameElement(null);
assertNull(nameElement);
@@ -68,7 +68,7 @@ public class NameElementUtilTest {
* Test of get name element for content.
*/
@Test
- public void getNameElementContent() {
+ void getNameElementContent() {
NameElement nameElement = NameElementUtil.getNameElement(
null,
null, null,
diff --git a/src/test/java/org/openepics/names/util/NameUtilTest.java b/src/test/java/org/openepics/names/util/NameUtilTest.java
index 99c666f7..2c63e397 100644
--- a/src/test/java/org/openepics/names/util/NameUtilTest.java
+++ b/src/test/java/org/openepics/names/util/NameUtilTest.java
@@ -32,13 +32,13 @@ import org.openepics.names.repository.model.Name;
*
* @see NameUtil
*/
-public class NameUtilTest {
+class NameUtilTest {
/**
* Test of get level of system structure for name.
*/
@Test
- public void getLevelSystemStructure() {
+ void getLevelSystemStructure() {
Name name = new Name();
assertEquals(-1, NameUtil.getLevelSystemStructure(name));
@@ -82,7 +82,7 @@ public class NameUtilTest {
* Test of get level of device structure for name.
*/
@Test
- public void getLevelDeviceStructure() {
+ void getLevelDeviceStructure() {
Name name = new Name();
assertEquals(-1, NameUtil.getLevelDeviceStructure(name));
diff --git a/src/test/java/org/openepics/names/util/NamingConventionUtilTest.java b/src/test/java/org/openepics/names/util/NamingConventionUtilTest.java
index b5a1d2d9..9e1e1d0c 100644
--- a/src/test/java/org/openepics/names/util/NamingConventionUtilTest.java
+++ b/src/test/java/org/openepics/names/util/NamingConventionUtilTest.java
@@ -34,7 +34,7 @@ import org.openepics.names.repository.model.Discipline;
*
* @see NamingConventionUtil
*/
-public class NamingConventionUtilTest {
+class NamingConventionUtilTest {
// conventionname_abc_def
// a - 1/0 - system group or not
@@ -72,7 +72,7 @@ public class NamingConventionUtilTest {
* Test of extraction of system group from convention name.
*/
@Test
- public void extractSystemGroup() {
+ void extractSystemGroup() {
assertNull(NamingConventionUtil.extractSystemGroup(NULL));
assertNull(NamingConventionUtil.extractSystemGroup(EMPTY));
assertNull(NamingConventionUtil.extractSystemGroup(DUMMY));
@@ -97,7 +97,7 @@ public class NamingConventionUtilTest {
* Test of extraction of system from convention name.
*/
@Test
- public void extractSystem() {
+ void extractSystem() {
assertNull(NamingConventionUtil.extractSystem(NULL));
assertNull(NamingConventionUtil.extractSystem(EMPTY));
assertEquals(DUMMY, NamingConventionUtil.extractSystem(DUMMY));
@@ -122,7 +122,7 @@ public class NamingConventionUtilTest {
* Test of extraction of subsystem group from convention name.
*/
@Test
- public void extractSubsystem() {
+ void extractSubsystem() {
assertNull(NamingConventionUtil.extractSubsystem(NULL));
assertNull(NamingConventionUtil.extractSubsystem(EMPTY));
assertNull(NamingConventionUtil.extractSubsystem(DUMMY));
@@ -147,7 +147,7 @@ public class NamingConventionUtilTest {
* Test of extraction of discipline from convention name.
*/
@Test
- public void extractDiscipline() {
+ void extractDiscipline() {
assertNull(NamingConventionUtil.extractDiscipline(NULL));
assertNull(NamingConventionUtil.extractDiscipline(EMPTY));
assertNull(NamingConventionUtil.extractDiscipline(DUMMY));
@@ -172,7 +172,7 @@ public class NamingConventionUtilTest {
* Test of extraction of device type from convention name.
*/
@Test
- public void extractDeviceType() {
+ void extractDeviceType() {
assertNull(NamingConventionUtil.extractDeviceType(NULL));
assertNull(NamingConventionUtil.extractDeviceType(EMPTY));
assertNull(NamingConventionUtil.extractDeviceType(DUMMY));
@@ -197,7 +197,7 @@ public class NamingConventionUtilTest {
* Test of extraction of instance index from convention name.
*/
@Test
- public void extractInstanceIndex() {
+ void extractInstanceIndex() {
assertNull(NamingConventionUtil.extractInstanceIndex(NULL));
assertNull(NamingConventionUtil.extractInstanceIndex(EMPTY));
assertNull(NamingConventionUtil.extractInstanceIndex(DUMMY));
@@ -222,7 +222,7 @@ public class NamingConventionUtilTest {
* Test of extraction of mnemonic path for system structure from convention name.
*/
@Test
- public void extractMnemonicPathSystemStructure() {
+ void extractMnemonicPathSystemStructure() {
assertEquals(NULL, NamingConventionUtil.extractMnemonicPathSystemStructure(NULL));
assertEquals(NULL, NamingConventionUtil.extractMnemonicPathSystemStructure(EMPTY));
assertEquals(DUMMY, NamingConventionUtil.extractMnemonicPathSystemStructure(DUMMY));
@@ -248,7 +248,7 @@ public class NamingConventionUtilTest {
* Test of extraction of mnemonic path for device structure from convention name.
*/
@Test
- public void extractMnemonicPathDeviceStructure() {
+ void extractMnemonicPathDeviceStructure() {
assertEquals(NULL, NamingConventionUtil.extractMnemonicPathDeviceStructure(NULL));
assertEquals(NULL, NamingConventionUtil.extractMnemonicPathDeviceStructure(EMPTY));
assertEquals(NULL, NamingConventionUtil.extractMnemonicPathDeviceStructure(DUMMY));
@@ -274,7 +274,7 @@ public class NamingConventionUtilTest {
* Test to get index style from convention name.
*/
@Test
- public void getInstanceIndexStyleConventionName() {
+ void getInstanceIndexStyleConventionName() {
assertEquals(NULL, NamingConventionUtil.getInstanceIndexStyle("Mech-TDS"));
assertEquals(NULL, NamingConventionUtil.getInstanceIndexStyle("Cryo-TDS"));
@@ -303,7 +303,7 @@ public class NamingConventionUtilTest {
* Test to get index style from discipline.
*/
@Test
- public void getInstanceIndexStyleDiscipline() {
+ void getInstanceIndexStyleDiscipline() {
Discipline discipline = new Discipline();
discipline.setMnemonic(NULL);
@@ -332,7 +332,7 @@ public class NamingConventionUtilTest {
* Test to check if discipline is PID.
*/
@Test
- public void isDisciplinePID() {
+ void isDisciplinePID() {
assertFalse(NamingConventionUtil.isDisciplinePID(NULL));
assertFalse(NamingConventionUtil.isDisciplinePID(EMPTY));
assertFalse(NamingConventionUtil.isDisciplinePID(DUMMY));
@@ -361,7 +361,7 @@ public class NamingConventionUtilTest {
* Test to check if mnemonic path (device structure) is PID numeric.
*/
@Test
- public void isMnemonicPathPIDNumeric() {
+ void isMnemonicPathPIDNumeric() {
assertFalse(NamingConventionUtil.isMnemonicPathDeviceStructurePIDNumeric(NULL));
assertFalse(NamingConventionUtil.isMnemonicPathDeviceStructurePIDNumeric(EMPTY));
assertFalse(NamingConventionUtil.isMnemonicPathDeviceStructurePIDNumeric(DUMMY));
@@ -390,7 +390,7 @@ public class NamingConventionUtilTest {
* Test to check if convention name is offsite.
*/
@Test
- public void isOffsite() {
+ void isOffsite() {
assertFalse(NamingConventionUtil.isOffsite(CONVENTIONNAME_010));
assertFalse(NamingConventionUtil.isOffsite(CONVENTIONNAME_011));
@@ -411,7 +411,7 @@ public class NamingConventionUtilTest {
* Test to check conversion of string (e.g. name) to mnemonic path.
*/
@Test
- public void string2MnemonicPath() {
+ void string2MnemonicPath() {
String[] array = null;
array = NamingConventionUtil.string2MnemonicPath(null);
diff --git a/src/test/java/org/openepics/names/util/StructureElementUtilTest.java b/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
index d397454d..4aad2d9e 100644
--- a/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
+++ b/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
@@ -32,13 +32,13 @@ import org.openepics.names.rest.beans.element.StructureElement;
*
* @see StructureElementUtil
*/
-public class StructureElementUtilTest {
+class StructureElementUtilTest {
/**
* Test of get structure element for content.
*/
@Test
- public void getStructureElementContent() {
+ void getStructureElementContent() {
StructureElement structureElement = StructureElementUtil.getStructureElement(
null,
null,
@@ -65,7 +65,7 @@ public class StructureElementUtilTest {
}
@Test
- public void equals() {
+ void equals() {
StructureElement se1 = new StructureElement();
StructureElement se2 = new StructureElement();
diff --git a/src/test/java/org/openepics/names/util/ValidateUtilTest.java b/src/test/java/org/openepics/names/util/ValidateUtilTest.java
index 388724dd..01c7b138 100644
--- a/src/test/java/org/openepics/names/util/ValidateUtilTest.java
+++ b/src/test/java/org/openepics/names/util/ValidateUtilTest.java
@@ -34,13 +34,13 @@ import org.openepics.names.service.exception.InputNotAvailableException;
*
* @see ValidateUtil
*/
-public class ValidateUtilTest {
+class ValidateUtilTest {
/**
* Test of validate input comment.
*/
@Test
- public void validateInputCommentNull() {
+ void validateInputCommentNull() {
try {
ValidateUtil.validateInputComment(null);
fail();
@@ -57,7 +57,7 @@ public class ValidateUtilTest {
* Test of validate input comment.
*/
@Test
- public void validateInputCommentEmpty() {
+ void validateInputCommentEmpty() {
try {
ValidateUtil.validateInputComment("");
fail();
@@ -74,7 +74,7 @@ public class ValidateUtilTest {
* Test of validate input comment.
*/
@Test
- public void validateInputComment() {
+ void validateInputComment() {
ValidateUtil.validateInputComment("asdf");
}
@@ -82,7 +82,7 @@ public class ValidateUtilTest {
* Test of validate input description.
*/
@Test
- public void validateInputDescriptionNull() {
+ void validateInputDescriptionNull() {
try {
ValidateUtil.validateInputDescription(null);
fail();
@@ -99,7 +99,7 @@ public class ValidateUtilTest {
* Test of validate input description.
*/
@Test
- public void validateInputDescriptionEmpty() {
+ void validateInputDescriptionEmpty() {
try {
ValidateUtil.validateInputDescription("");
fail();
@@ -116,7 +116,7 @@ public class ValidateUtilTest {
* Test of validate input description.
*/
@Test
- public void validateInputDescription() {
+ void validateInputDescription() {
ValidateUtil.validateInputDescription("asdf");
}
@@ -124,7 +124,7 @@ public class ValidateUtilTest {
* Test of validate input mnemonic.
*/
@Test
- public void validateInputMnemonicNull() {
+ void validateInputMnemonicNull() {
try {
ValidateUtil.validateInputMnemonic(null);
fail();
@@ -141,7 +141,7 @@ public class ValidateUtilTest {
* Test of validate input mnemonic.
*/
@Test
- public void validateInputMnemonicEmpty() {
+ void validateInputMnemonicEmpty() {
try {
ValidateUtil.validateInputMnemonic("");
fail();
@@ -158,7 +158,7 @@ public class ValidateUtilTest {
* Test of validate input mnemonic.
*/
@Test
- public void validateInputMnemonic() {
+ void validateInputMnemonic() {
ValidateUtil.validateInputMnemonic("asdf");
}
@@ -166,7 +166,7 @@ public class ValidateUtilTest {
* Test of validate input name.
*/
@Test
- public void validateInputNameNull() {
+ void validateInputNameNull() {
try {
ValidateUtil.validateInputName(null);
fail();
@@ -183,7 +183,7 @@ public class ValidateUtilTest {
* Test of validate input name.
*/
@Test
- public void validateInputNameEmpty() {
+ void validateInputNameEmpty() {
try {
ValidateUtil.validateInputName("");
fail();
@@ -200,7 +200,7 @@ public class ValidateUtilTest {
* Test of validate input name.
*/
@Test
- public void validateInputName() {
+ void validateInputName() {
ValidateUtil.validateInputName("asdf");
}
@@ -208,7 +208,7 @@ public class ValidateUtilTest {
* Test of validate input type.
*/
@Test
- public void validateInputTypeNull() {
+ void validateInputTypeNull() {
try {
ValidateUtil.validateInputType(null);
fail();
@@ -225,7 +225,7 @@ public class ValidateUtilTest {
* Test of validate input type.
*/
@Test
- public void validateInputType() {
+ void validateInputType() {
ValidateUtil.validateInputType(Type.SYSTEMGROUP);
ValidateUtil.validateInputType(Type.SYSTEM);
ValidateUtil.validateInputType(Type.SUBSYSTEM);
@@ -238,7 +238,7 @@ public class ValidateUtilTest {
* Test of validate input uuid.
*/
@Test
- public void validateInputUuidNull() {
+ void validateInputUuidNull() {
try {
ValidateUtil.validateInputUuid(null);
fail();
@@ -255,7 +255,7 @@ public class ValidateUtilTest {
* Test of validate input uuid.
*/
@Test
- public void validateInputUuidEmpty() {
+ void validateInputUuidEmpty() {
try {
ValidateUtil.validateInputUuid("");
fail();
@@ -270,7 +270,7 @@ public class ValidateUtilTest {
* Test of validate input uuid.
*/
@Test
- public void validateInputUuid() {
+ void validateInputUuid() {
ValidateUtil.validateInputUuid(UUID.randomUUID().toString());
}
@@ -280,7 +280,7 @@ public class ValidateUtilTest {
* Test of validate input read names.
*/
@Test
- public void validateInputReadNames() {
+ void validateInputReadNames() {
ValidateUtil.validateNamesInputRead(
null, null, null,
null,
@@ -292,7 +292,7 @@ public class ValidateUtilTest {
* Test of validate input create name element.
*/
@Test
- public void validateInputCreateNameElement() {
+ void validateInputCreateNameElement() {
ValidateUtil.validateNameElementInputCreate(null);
}
@@ -300,7 +300,7 @@ public class ValidateUtilTest {
* Test of validate data create name element.
*/
@Test
- public void validateDataCreateNameElement() {
+ void validateDataCreateNameElement() {
ValidateUtil.validateNameElementDataCreate(null, null, null, null, null);
}
@@ -308,14 +308,14 @@ public class ValidateUtilTest {
* Test of validate data create name.
*/
@Test
- public void validateDataCreateName() {
+ void validateDataCreateName() {
ValidateUtil.validateNameDataCreate(null, null, null, null, null);
}
/**
* Test of validate input update name element.
*/
@Test
- public void validateInputUpdateNameElement() {
+ void validateInputUpdateNameElement() {
ValidateUtil.validateNameElementInputUpdate(null);
}
@@ -323,7 +323,7 @@ public class ValidateUtilTest {
* Test of validate data update name element.
*/
@Test
- public void validateDataUpdateNameElement() {
+ void validateDataUpdateNameElement() {
ValidateUtil.validateNameElementDataUpdate(null, null, null, null, null);
}
@@ -333,7 +333,7 @@ public class ValidateUtilTest {
* Test of validate input read structures.
*/
@Test
- public void validateInputReadStructuresTypeNull() {
+ void validateInputReadStructuresTypeNull() {
try {
ValidateUtil.validateStructuresInputRead(
null, null, null, null, null,
@@ -351,7 +351,7 @@ public class ValidateUtilTest {
* Test of validate input read structures.
*/
@Test
- public void validateInputReadStructures() {
+ void validateInputReadStructures() {
ValidateUtil.validateStructuresInputRead(
Type.SYSTEMGROUP, null, null, null, null,
null,
@@ -388,7 +388,7 @@ public class ValidateUtilTest {
* Test of validate data create structure element.
*/
@Test
- public void validateDataCreateStructureElement() {
+ void validateDataCreateStructureElement() {
ValidateUtil.validateStructureElementDataCreate(null, null, null, null);
}
@@ -396,7 +396,7 @@ public class ValidateUtilTest {
* Test of validate data create structure.
*/
@Test
- public void validateDataCreateStructuret() {
+ void validateDataCreateStructuret() {
ValidateUtil.validateStructureDataCreate(null, null, null, null, null);
}
@@ -404,7 +404,7 @@ public class ValidateUtilTest {
* Test of validate input update structure element.
*/
@Test
- public void validateInputUpdateStructureElement() {
+ void validateInputUpdateStructureElement() {
ValidateUtil.validateStructureElementInputUpdate(null, null);
}
@@ -412,7 +412,7 @@ public class ValidateUtilTest {
* Test of validate data update structure element.
*/
@Test
- public void validateDataUpdateStructureElement() {
+ void validateDataUpdateStructureElement() {
ValidateUtil.validateStructureElementDataUpdate(null, null, null, null);
}
--
GitLab