Add unit tests to improve test coverage.
Issue-ID: SDC-3428
Change-Id: I9e00af2824366ae45d47d2dcecf322fd3e9a6fea
Signed-off-by: xuegao <xue.gao@intl.att.com>
package org.openecomp.sdc.asdctool.migration.core.task;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.asdctool.migration.core.task.MigrationResult.MigrationStatus;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class MigrationResultTest {
@Test
- public void testGetMsg() {
- MigrationResult testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getMsg();
- }
-
-
- @Test
- public void testSetMsg() {
- MigrationResult testSubject;
- String msg = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setMsg(msg);
+ public void testMsg() {
+ MigrationResult testSubject = createTestSubject();
+ assertNull(testSubject.getMsg());
+ testSubject.setMsg("msg");
+ assertEquals("msg", testSubject.getMsg());
}
-
@Test
public void testGetMigrationStatus() {
MigrationResult testSubject;
result = testSubject.getMigrationStatus();
}
-
@Test
public void testSetMigrationStatus() {
MigrationResult testSubject;
testSubject = createTestSubject();
testSubject.setMigrationStatus(migrationStatus);
}
+
+ @Test
+ public void testSuccess() {
+ MigrationResult testSubject = createTestSubject();
+ assertEquals(MigrationResult.MigrationStatus.COMPLETED, testSubject.success().getMigrationStatus());
+ }
+
+ @Test
+ public void testError() {
+ MigrationResult testSubject = createTestSubject();
+ MigrationResult result = testSubject.error("testErr");
+ assertEquals(MigrationStatus.FAILED, result.getMigrationStatus());
+ assertEquals("testErr", result.getMsg());
+ }
}
package org.openecomp.sdc.be.auditing.impl;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder;
private AuditAuthRequestEventFactory createTestSubject() {
Builder newBuilder = CommonAuditData.newBuilder();
CommonAuditData build = newBuilder.build();
- return new AuditAuthRequestEventFactory(build, "mock", "mock", "mock", "mock");
+ return new AuditAuthRequestEventFactory(build, "mock", "mock", "mock", "mock", "");
}
@Test
package org.openecomp.sdc.be.auditing.impl.distribution;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent;
import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder;
import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
-public class AuditDistribDownloadEventFactoryTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
- private AuditDistributionDeployEventFactory createTestSubject() {
- Builder newBuilder = CommonAuditData.newBuilder();
- CommonAuditData build = newBuilder.build();
- return new AuditDistributionDeployEventFactory(build,new ResourceCommonInfo(),"",new User(),"1.0");
- }
+public class AuditDistribDownloadEventFactoryTest {
@Test
public void testGetLogMessage() throws Exception {
- AuditDistributionDeployEventFactory testSubject;
- String result;
+ Builder newBuilder = CommonAuditData.newBuilder();
+ CommonAuditData build = newBuilder.build();
+ AuditDistributionDeployEventFactory testSubject = new AuditDistributionDeployEventFactory(build,new ResourceCommonInfo(),"",new User(),"1.0");
+ String expected = "ACTION = \"DResult\" RESOURCE_NAME = \"\" RESOURCE_TYPE = \"\" SERVICE_INSTANCE_ID = \"\" CURR_VERSION = \"1.0\" MODIFIER = \"\" DID = \"\" STATUS = \"\" DESC = \"\"";
- // default test
- testSubject = createTestSubject();
- result = testSubject.getLogMessage();
+ assertEquals(expected, testSubject.getLogMessage());
}
@Test
public void testGetDbEvent() throws Exception {
- AuditDistributionDeployEventFactory testSubject;
- AuditingGenericEvent result;
+ Builder newBuilder = CommonAuditData.newBuilder();
+ CommonAuditData build = newBuilder.build();
+ AuditDistributionDeployEventFactory testSubject = new AuditDistributionDeployEventFactory(build,new ResourceCommonInfo(),"","user","1.0", "");
+ DistributionDeployEvent result = (DistributionDeployEvent)testSubject.getDbEvent();
- // default test
- testSubject = createTestSubject();
- result = testSubject.getDbEvent();
+ assertEquals("DResult", result.getAction());
+ assertEquals("1.0", result.getCurrVersion());
+ assertEquals("", result.getDid());
+ assertEquals("user", result.getModifier());
}
}
package org.openecomp.sdc.be.auditing.impl.distribution;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder;
private AuditDistributionStatusEventFactory createTestSubject() {
Builder newBuilder = CommonAuditData.newBuilder();
CommonAuditData build = newBuilder.build();
- return new AuditDistributionStatusEventFactory(build,new DistributionData("",""), "", "", "");
+ return new AuditDistributionStatusEventFactory(build,new DistributionData("",""), "", "", "", "");
}
@Test
package org.openecomp.sdc.be.auditing.impl.distribution;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.auditing.impl.AuditGetUebClusterEventFactory;
import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class AuditGetUebClusterEventFactoryTest {
private AuditGetUebClusterEventFactory createTestSubject() {
Builder newBuilder = CommonAuditData.newBuilder();
CommonAuditData build = newBuilder.build();
- return new AuditGetUebClusterEventFactory(build, "");
+ return new AuditGetUebClusterEventFactory(build, "", "");
}
@Test
public void testGetLogMessage() throws Exception {
- AuditGetUebClusterEventFactory testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getLogMessage();
+ AuditGetUebClusterEventFactory testSubject = createTestSubject();
+ String expected1 = "ACTION = \"GetUebCluster\" CONSUMER_ID = \"\" STATUS_TIME =";
+ String expected2 = "STATUS = \"\" STATUS_DESC = \"\"";
+ String actual = testSubject.getLogMessage();
+ assertTrue(actual.contains(expected1));
+ assertTrue(actual.contains(expected2));
}
@Test
public void testGetDbEvent() throws Exception {
- AuditGetUebClusterEventFactory testSubject;
- AuditingGenericEvent result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getDbEvent();
+ AuditGetUebClusterEventFactory testSubject = createTestSubject();
+ AuditingGenericEvent result = testSubject.getDbEvent();
+ assertEquals("GetUebCluster", result.getAction());
}
}
package org.openecomp.sdc.be.components.validation;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.openecomp.sdc.be.config.ConfigurationManager;
import org.openecomp.sdc.be.dao.api.ActionStatus;
import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
import org.openecomp.sdc.be.model.User;
import org.openecomp.sdc.be.user.Role;
import org.openecomp.sdc.be.user.UserBusinessLogic;
import org.openecomp.sdc.common.impl.ExternalConfiguration;
import org.openecomp.sdc.common.impl.FSConfigurationSource;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.junit.jupiter.api.Assertions.*;
public class UserValidationsTest {
@Mock
UserBusinessLogic userAdmin;
- @Mock
- ComponentsUtils componentsUtils;
-
- @Before
+ @BeforeEach
public void setUp() {
//TestUtilsSdc.setFinalStatic(UserValidations.class, "log", LoggerFactory.getLogger(UserValidations.class));
MockitoAnnotations.initMocks(this);
String userId = "mock";
User usr = new User();
usr.setUserId(userId);
- usr.setStatus(UserStatusEnum.ACTIVE);
+ usr.setStatus(UserStatusEnum.INACTIVE);
Mockito.when(userAdmin.getUser(Mockito.anyString())).thenReturn(usr);
+
+ assertThrows(ByActionStatusComponentException.class, () -> {
+ testSubject.validateUserExists(userId);
+ });
+ Mockito.verify(userAdmin, Mockito.times(1)).getUser(Mockito.anyString());
+
// default test
+ usr.setStatus(UserStatusEnum.ACTIVE);
User result = testSubject.validateUserExists(userId);
- assertThat(result).isNotNull().isEqualTo(usr);
+ assertNotNull(result);
+ assertEquals(usr, result);
}
-
+
@Test
public void testValidateNonExistingUser2() {
String userId = "mock";
Mockito.when(userAdmin.getUser(Mockito.anyString())).thenThrow(new ByActionStatusComponentException(ActionStatus.USER_NOT_FOUND));
- Throwable thrown = catchThrowable(() -> testSubject.validateUserExists(userId) );
- assertThat(thrown).isInstanceOf(ComponentException.class).hasFieldOrPropertyWithValue("actionStatus" , ActionStatus.USER_NOT_FOUND);
-
+ assertThrows(ComponentException.class, () -> {
+ testSubject.validateUserExists(userId);
+ });
+ Mockito.verify(userAdmin, Mockito.times(1)).getUser(Mockito.anyString());
}
@Test
public void testValidateUserRole() {
User user = new User();
List<Role> roles = new LinkedList<>();
- roles.add(Role.DESIGNER);
user.setRole(Role.DESIGNER.name());
- // test 1
- Throwable thrown = catchThrowable(() -> testSubject.validateUserRole(user, roles));
- assertThat(thrown).isNull();
+ assertThrows(ByActionStatusComponentException.class, () -> {
+ testSubject.validateUserRole(user, roles);
+ });
+
+ roles.add(Role.DESIGNER);
+ assertDoesNotThrow(() -> testSubject.validateUserRole(user, roles));
}
@Test
User usr = new User();
usr.setUserId(userId);
usr.setStatus(UserStatusEnum.ACTIVE);
-
+
+ Mockito.when(userAdmin.hasActiveUser(Mockito.anyString())).thenReturn(false);
+ assertEquals(ActionStatus.RESTRICTED_OPERATION, testSubject.validateUserExistsActionStatus(userId));
+ Mockito.verify(userAdmin, Mockito.times(1)).hasActiveUser(Mockito.anyString());
+
Mockito.when(userAdmin.hasActiveUser(Mockito.anyString())).thenReturn(true);
-
- // default test
- result = testSubject.validateUserExistsActionStatus(userId);
- assertThat(result).isEqualTo(ActionStatus.OK);
+ assertEquals(ActionStatus.OK, testSubject.validateUserExistsActionStatus(userId));
+ Mockito.verify(userAdmin, Mockito.times(2)).hasActiveUser(Mockito.anyString());
}
@Test
Mockito.when(userAdmin.hasActiveUser(Mockito.anyString())).thenThrow(new ByActionStatusComponentException((ActionStatus.USER_NOT_FOUND)));
// default test
- Throwable thrown = catchThrowable(() -> testSubject.validateUserExistsActionStatus(userId));
- assertThat(thrown).isInstanceOf(ComponentException.class).hasFieldOrPropertyWithValue("actionStatus" , ActionStatus.USER_NOT_FOUND);
+ assertThrows(ComponentException.class, () -> {
+ testSubject.validateUserExistsActionStatus(userId);
+ });
+ Mockito.verify(userAdmin, Mockito.times(1)).hasActiveUser(Mockito.anyString());
}
@Test
public void testValidateUserNotEmpty() {
User user = new User();
- user.setUserId("userId");
+ user.setUserId("");
String ecompErrorContext = "mock";
User result;
// default test
+ assertThrows(ByActionStatusComponentException.class, () -> {
+ testSubject.validateUserNotEmpty(user, ecompErrorContext);
+ });
+
+ user.setUserId("userId");
result = testSubject.validateUserNotEmpty(user, ecompErrorContext);
- assertThat(result).isEqualTo(user);
+ assertEquals(user, result);
}
@Test
Mockito.when(userAdmin.getUser(Mockito.anyString())).thenThrow(new ByActionStatusComponentException(ActionStatus.USER_NOT_FOUND));
// default test
- Throwable thrown = catchThrowable(() -> testSubject.validateUserExists(userId) );
- assertThat(thrown).isInstanceOf(ComponentException.class).hasFieldOrPropertyWithValue("actionStatus" , ActionStatus.USER_NOT_FOUND);
+ assertThrows(ComponentException.class, () -> {
+ testSubject.validateUserExists(userId);
+ });
+ Mockito.verify(userAdmin, Mockito.times(1)).getUser(Mockito.anyString());
}
}
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.model.DataTypeDefinition;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class MapConverterTest {
- private MapConverter createTestSubject() {
- return new MapConverter();
- }
-
-
@Test
public void testGetInstance() throws Exception {
- MapConverter result;
-
- // default test
- result = MapConverter.getInstance();
+ assertNotNull(MapConverter.getInstance());
}
@Test
public void testConvert() throws Exception {
- MapConverter testSubject;
- String value = "";
- String innerType = "";
+ MapConverter testSubject = new MapConverter();
Map<String, DataTypeDefinition> dataTypes = null;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.convert(value, innerType, dataTypes);
+ assertTrue(testSubject.convert("", null, dataTypes).isEmpty());
+ assertTrue(testSubject.convert("", "string", dataTypes).isEmpty());
+ assertNull(testSubject.convert("{\"key\":}", "integer", dataTypes));
+
+ assertEquals("{\"key\":\"value\"}", testSubject.convert("{\"key\":\"value\"}", "list", dataTypes));
+ assertEquals("{\"key\":\"value\"}", testSubject.convert("{\"key\":\"value\"}", "string", dataTypes));
+ assertEquals("{\"key\":2}", testSubject.convert("{\"key\":2}", "integer", dataTypes));
+ assertEquals("{\"key\":null}", testSubject.convert("{\"key\":null}", "integer", dataTypes));
+ assertEquals("{\"key\":0.2}", testSubject.convert("{\"key\":0.2}", "float", dataTypes));
+ assertEquals("{\"key\":null}", testSubject.convert("{\"key\":null}", "float", dataTypes));
+ assertEquals("{\"key\":true}", testSubject.convert("{\"key\":true}", "boolean", dataTypes));
+ assertEquals("{\"key\":null}", testSubject.convert("{\"key\":null}", "boolean", dataTypes));
}
-
-
-
-
-
-
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2021 AT&T Intellectual Property. 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.openecomp.sdc.be.model.tosca.validators;
+
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class KeyValidatorTest {
+
+ @Test
+ public void isValidTest() {
+ assertFalse(KeyValidator.getInstance().isValid(null, "string"));
+
+ String veryLongString = "veryverylonglonglonglonglonglongstringveryverylonglonglonglonglonglongstringveryverylonglonglonglonglonglongstring";
+ assertFalse(KeyValidator.getInstance().isValid(veryLongString, "string"));
+
+ assertTrue(KeyValidator.getInstance().isValid("test", "string"));
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2021 AT&T Intellectual Property. 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.openecomp.sdc.be.model.tosca.validators;
+
+
+import org.junit.jupiter.api.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ListValidatorTest {
+
+ @Test
+ public void isValidTest() {
+ Map<String, DataTypeDefinition> map = new HashMap();
+ ListValidator validator = new ListValidator();
+ assertTrue(validator.isValid("", "", map));
+ assertFalse(validator.isValid("test", null, map));
+
+ assertTrue(validator.isValid("[2,3]", "integer", map));
+ assertTrue(validator.isValid("[0.2]", "float", map));
+ assertTrue(validator.isValid("[true]", "boolean", map));
+ assertTrue(validator.isValid("[test]", "string", map));
+ assertTrue(validator.isValid("[{\"key\":1};{\"key2\":2}]", "json", map));
+
+ assertFalse(validator.isValid("[[1,2],[3]]", "list", map));
+ assertFalse(validator.isValid("[2,true]", "integer", map));
+ assertFalse(validator.isValid("test", "wrong", map));
+ }
+}
package org.openecomp.sdc.common.http.config;
import fj.data.Either;
+import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.StringUtils;
import org.onap.sdc.security.SecurityUtil;
+@EqualsAndHashCode
public class ClientCertificate {
private String keyStore;
private String keyStorePassword;
public String getKeyStorePassword() {
return keyStorePassword;
}
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((keyStore == null) ? 0 : keyStore.hashCode());
- result = prime * result + ((keyStorePassword == null) ? 0 : keyStorePassword.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ClientCertificate other = (ClientCertificate) obj;
- if (keyStore == null) {
- if (other.keyStore != null)
- return false;
- }
- else if (!keyStore.equals(other.keyStore))
- return false;
- if (keyStorePassword == null) {
- if (other.keyStorePassword != null)
- return false;
- }
- else if (!keyStorePassword.equals(other.keyStorePassword))
- return false;
- return true;
- }
@Override
public String toString() {
import com.google.common.collect.Lists;
import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
import java.io.File;
import java.io.IOException;
import java.util.Base64;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
public class GeneralUtilityTest {
@Test
public void validateIsBase64EncodedReturnsProperResponseFromByteArray() {
-
final String testString = "testDataToEncode";
final byte[] testBytes = testString.getBytes();
final byte[] testEncodedBytes = Base64.getEncoder().encode(testBytes);
- boolean result = GeneralUtility.isBase64Encoded(testEncodedBytes);
-
- assertTrue(result);
+ assertTrue(GeneralUtility.isBase64Encoded(testEncodedBytes));
+ assertTrue(GeneralUtility.isBase64Encoded(testString));
}
@Test
final String encodedString =
org.apache.commons.codec.digest.DigestUtils.md5Hex(testStringToEncode.getBytes());
- assertArrayEquals(encodedString.getBytes(), Base64.getDecoder().decode(result));
+ assertEquals(encodedString, new String(Base64.getDecoder().decode(result)));
}
@Test
final String encodedString =
org.apache.commons.codec.digest.DigestUtils.md5Hex(testStringToEncode.getBytes());
- assertArrayEquals(encodedString.getBytes(), Base64.getDecoder().decode(result));
+ assertEquals(encodedString, new String(Base64.getDecoder().decode(result)));
}
@Test
final String empty = " \ttest ";
boolean result = GeneralUtility.isEmptyString(empty);
-
+ assertTrue(GeneralUtility.isEmptyString(null));
assertFalse(result);
}
+ @Test
+ public void getCategorizedComponentsTest() {
+
+ List<ICategorizedElement> components = new LinkedList<>();
+ ICategorizedElement componentService = Mockito.mock(ICategorizedElement.class);
+ when(componentService.getComponentTypeAsString()).thenReturn("SERVICE");
+
+ ICategorizedElement componentResource = Mockito.mock(ICategorizedElement.class);
+ when(componentResource.getComponentTypeAsString()).thenReturn("RESOURCE");
+
+ components.add(componentService);
+ components.add(componentResource);
+ Map<String, Map<String, List<ICategorizedElement>>> result = GeneralUtility.getCategorizedComponents(components);
+ verify(componentService, Mockito.times(1)).getComponentTypeAsString();
+ verify(componentResource, Mockito.times(2)).getComponentTypeAsString();
+ assertEquals(2, result.size());
+ }
}
package org.openecomp.sdc.common.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.openecomp.sdc.common.api.FilterDecisionEnum;
+import org.openecomp.sdc.common.datastructure.UserContext;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import java.util.HashSet;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ThreadLocalsHolderTest {
assertNull(ThreadLocalsHolder.getUuid());
assertEquals(ThreadLocalsHolder.isMdcProcessed(), false);
}
+
+ @Test
+ public void validateUserContext() {
+ UserContext userContext = new UserContext("userId", new HashSet<>(), "firstName", "lastName");
+
+ ThreadLocalsHolder.setUserContext(userContext);
+ assertEquals("userId", ThreadLocalsHolder.getUserContext().getUserId());
+ assertEquals("firstName", ThreadLocalsHolder.getUserContext().getFirstName());
+ assertEquals("lastName", ThreadLocalsHolder.getUserContext().getLastName());
+ assertEquals(0, ThreadLocalsHolder.getUserContext().getUserRoles().size());
+ }
+
+ @Test
+ public void validateApiType() {
+ FilterDecisionEnum filterDecision = FilterDecisionEnum.INTERNAL;
+
+ ThreadLocalsHolder.setApiType(filterDecision);
+ assertEquals(filterDecision, ThreadLocalsHolder.getApiType());
+ }
+
+ @Test
+ public void isInternalRequestTest() {
+ FilterDecisionEnum filterDecision = FilterDecisionEnum.INTERNAL;
+ ThreadLocalsHolder.setApiType(filterDecision);
+ assertTrue(ThreadLocalsHolder.isInternalRequest());
+
+ filterDecision = FilterDecisionEnum.EXTERNAL;
+ ThreadLocalsHolder.setApiType(filterDecision);
+ assertFalse(ThreadLocalsHolder.isInternalRequest());
+ }
+
+ @Test
+ public void isExternalRequestTest() {
+ FilterDecisionEnum filterDecision = FilterDecisionEnum.INTERNAL;
+ ThreadLocalsHolder.setApiType(filterDecision);
+ assertFalse(ThreadLocalsHolder.isExternalRequest());
+
+ filterDecision = FilterDecisionEnum.EXTERNAL;
+ ThreadLocalsHolder.setApiType(filterDecision);
+ assertTrue(ThreadLocalsHolder.isExternalRequest());
+ }
}
package org.openecomp.sdc.be.datatypes.elements;
import org.apache.commons.collections.map.HashedMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MapListCapabilityDataDefinitionTest {
new MapListCapabilityDataDefinition(createTestSubject());
}
- @Test
- public void testGetMapToscaDataDefinition() throws Exception {
- MapListCapabilityDataDefinition testSubject;
- Map<String, ListCapabilityDataDefinition> result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getMapToscaDataDefinition();
- }
-
-
@Test
public void testAdd() throws Exception {
- MapListCapabilityDataDefinition testSubject;
- String key = "";
- CapabilityDataDefinition value = null;
-
- // default test
- testSubject = createTestSubject();
- testSubject.add(key, value);
+ MapListCapabilityDataDefinition testSubject = createTestSubject();
+ testSubject.add("", null);
+ testSubject.add("key2", null);
+ testSubject.add("key2", new CapabilityDataDefinition());
+ assertEquals(2, testSubject.getMapToscaDataDefinition().size());
+ assertEquals(2, testSubject.getMapToscaDataDefinition().get("key2").getListToscaDataDefinition().size());
}
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2021 AT&T Intellectual Property. 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.openecomp.sdc.heat.datatypes;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.LinkedList;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DefinedHeatParameterTypesTest {
+
+ @Test
+ public void testIsValueIsFromGivenType() {
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(2, "number"));
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType("2 KB", "number"));
+
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(true, "boolean"));
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType("test", "string"));
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(new LinkedList<>(), "json"));
+
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType("val1,val2", "comma_delimited_list"));
+ assertFalse(DefinedHeatParameterTypes.isValueIsFromGivenType("", "wrong"));
+ }
+
+ @Test
+ public void testIsNovaServerEnvValueIsFromRightType() {
+ assertTrue(DefinedHeatParameterTypes.isNovaServerEnvValueIsFromRightType("test"));
+ assertTrue(DefinedHeatParameterTypes.isNovaServerEnvValueIsFromRightType("val1,val2"));
+ }
+
+ @Test
+ public void testIsEmptyValueInEnv() {
+ assertTrue(DefinedHeatParameterTypes.isEmptyValueInEnv(null));
+ assertFalse(DefinedHeatParameterTypes.isEmptyValueInEnv(""));
+ }
+}
*/
package org.openecomp.sdc.logging.servlet;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
* @author evitaliy
* @since 25 Mar 2018
*/
+@EqualsAndHashCode
+@ToString
public class HttpHeader {
private static final String NAMES_CANNOT_BE_NULL = "Names cannot be null";
}
return Optional.empty();
}
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- HttpHeader that = (HttpHeader) o;
- return Objects.equals(headerNames, that.headerNames);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(headerNames);
- }
-
- @Override
- public String toString() {
- return "HttpHeader{headerNames=" + headerNames + '}';
- }
}
Code Review / sdc.git / commitdiff