diff options
6 files changed, 87 insertions, 2 deletions
diff --git a/security-util-lib/src/test/java/org/onap/sdc/security/logging/enums/LoggerSupportabilityActionsTest.java b/security-util-lib/src/test/java/org/onap/sdc/security/logging/enums/LoggerSupportabilityActionsTest.java new file mode 100644 index 0000000..5f63c7a --- /dev/null +++ b/security-util-lib/src/test/java/org/onap/sdc/security/logging/enums/LoggerSupportabilityActionsTest.java @@ -0,0 +1,46 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2020 Samsung. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * + */ +package org.onap.sdc.security.logging.enums; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class LoggerSupportabilityActionsTest { + + @Test + public void testGetName() { + assertEquals(LoggerSupportabilityActions.ARCHIVE.getName(), "ARCHIVE"); + assertEquals(LoggerSupportabilityActions.ASSOCIATE_RI_TO_RI.getName(), + "ASSOCIATE RI TO RI"); + assertEquals(LoggerSupportabilityActions.CHANGELIFECYCLESTATE.getName(), + "CHANGE LIFECYCLE STATE"); + assertEquals(LoggerSupportabilityActions.CREATE_ARTIFACTS.getName(), "ADD ARTIFACTS"); + assertEquals(LoggerSupportabilityActions.CREATE_CAPABILITY_REQUIREMENTS.getName(), + "CREATE CAPABILITY REQUIREMENTS"); + assertEquals(LoggerSupportabilityActions.CREATE_GROUP_POLICY.getName(), "ADD GROUP POLICY"); + assertEquals(LoggerSupportabilityActions.CREATE_GROUPS.getName(), "ADD GROUPS"); + + + + } +} diff --git a/security-util-lib/src/test/java/org/onap/sdc/security/logging/enums/SeverityTest.java b/security-util-lib/src/test/java/org/onap/sdc/security/logging/enums/SeverityTest.java new file mode 100644 index 0000000..7ef4190 --- /dev/null +++ b/security-util-lib/src/test/java/org/onap/sdc/security/logging/enums/SeverityTest.java @@ -0,0 +1,39 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2020 Samsung. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * + */ + +package org.onap.sdc.security.logging.enums; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class SeverityTest { + + @Test + public void testGetSeverityType() { + assertEquals(Severity.OK.getSeverityType(), 0); + assertEquals(Severity.WARNING.getSeverityType(), 1); + assertEquals(Severity.CRITICAL.getSeverityType(), 2); + assertEquals(Severity.DOWN.getSeverityType(), 3); + assertEquals(Severity.UNREACHABLE.getSeverityType(), 4); + } +} diff --git a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/persistence/types/InternalItem.java b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/persistence/types/InternalItem.java index 4b435fa..1c62ebb 100644 --- a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/persistence/types/InternalItem.java +++ b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/persistence/types/InternalItem.java @@ -63,7 +63,6 @@ public class InternalItem extends Item { } public void populateExternalFields(Item item) { - setId(item.getId()); setType(item.getType()); setName(item.getName()); setOwner(item.getOwner()); diff --git a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/persistence/types/InternalVersion.java b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/persistence/types/InternalVersion.java index ac49d6f..f6e4c57 100644 --- a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/persistence/types/InternalVersion.java +++ b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/persistence/types/InternalVersion.java @@ -48,7 +48,6 @@ public class InternalVersion extends Version { } public void populateExternalFields(Version version) { - setId(version.getId()); setDescription(version.getDescription()); version.getProperties().forEach(this::addProperty); } diff --git a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/ItemManagerImpl.java b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/ItemManagerImpl.java index 0f74376..5bd2cf3 100644 --- a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/ItemManagerImpl.java +++ b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/ItemManagerImpl.java @@ -52,6 +52,7 @@ public class ItemManagerImpl implements ItemManager { @Override public Item create(Item item) { InternalItem internalItem = new InternalItem(); + internalItem.setId(item.getId()); internalItem.populateExternalFields(item); return itemDao.create(internalItem); } diff --git a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/VersioningManagerImpl.java b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/VersioningManagerImpl.java index c7b6f6a..1689182 100644 --- a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/VersioningManagerImpl.java +++ b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/VersioningManagerImpl.java @@ -70,6 +70,7 @@ public class VersioningManagerImpl implements VersioningManager { @Override public Version create(String itemId, String baseVersionId, Version version, VersionCreationMethod creationMethod) { InternalVersion internalVersion = new InternalVersion(); + internalVersion.setId(version.getId()); internalVersion.setBaseId(baseVersionId); internalVersion.populateExternalFields(version); |