diff options
13 files changed, 210 insertions, 118 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/src/test/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManagerTest.java b/openecomp-be/backend/openecomp-sdc-application-config-manager/src/test/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManagerTest.java deleted file mode 100644 index e58f455d11..0000000000 --- a/openecomp-be/backend/openecomp-sdc-application-config-manager/src/test/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManagerTest.java +++ /dev/null @@ -1,82 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 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.applicationconfig; - -import org.openecomp.sdc.applicationconfig.impl.ApplicationConfigManagerImpl; - -/** - * Created by Talio on 8/9/2016. - */ -public class ApplicationConfigManagerTest { - - public static final String TEST_NAMESPACE_1 = "test-app-namespace"; - public static final String TEST_NAMESPACE_2 = "test-namespace"; - public static final String TEST_KEY = "test-app-key"; - public static final String TEST_VALUE = "test-app-value"; - ApplicationConfigManager applicationConfigManager = new ApplicationConfigManagerImpl(); - - /* - @Test - public void testInsertIntoTable() { - try { - applicationConfigManager.insertIntoTable(TEST_NAMESPACE_1, TEST_KEY, TEST_VALUE); - } catch (CoreException exception) { - Assert.assertEquals(exception.getMessage(), - "Error occurred while loading questionnaire schema templates"); - } - } - - - @Test(dependsOnMethods = "testInsertIntoTable") - public void testGetValueFromTable() { - ConfigurationData value = applicationConfigManager.getFromTable(TEST_NAMESPACE_1, TEST_KEY); - - Assert.assertEquals(value.getValue(), TEST_VALUE); - } - - - @Test(dependsOnMethods = "testInsertIntoTable") - public void testGetValueFromTableNegative() { - try { - ConfigurationData value = - applicationConfigManager.getFromTable("not-existing-namespace", "not-existing-key"); - } catch (CoreException ce) { - Assert.assertEquals(ce.getMessage(), - "Configuration for namespace not-existing-namespace and key not-existing-key was not found"); - } - - } - - @Test - public void testGetList() { - applicationConfigManager.insertIntoTable(TEST_NAMESPACE_2, "key1", "val1"); - applicationConfigManager.insertIntoTable(TEST_NAMESPACE_2, "key2", "val2"); - applicationConfigManager.insertIntoTable(TEST_NAMESPACE_2, "key3", "val3"); - - Collection<ApplicationConfigEntity> ACElist = - applicationConfigManager.getListOfConfigurationByNamespace(TEST_NAMESPACE_2); - - Assert.assertNotNull(ACElist); - Assert.assertEquals(ACElist.size(), 3); - } - - */ -} diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml index a0e36c9d8b..15733ba710 100644 --- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml @@ -66,6 +66,12 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.google.code.bean-matchers</groupId> + <artifactId>bean-matchers</artifactId> + <version>${bean-matchers.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckResultTest.java b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckResultTest.java new file mode 100644 index 0000000000..996dcb5fc6 --- /dev/null +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckResultTest.java @@ -0,0 +1,32 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. 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.health.data; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.junit.Assert.assertThat; + +import org.junit.Test; + +public class HealthCheckResultTest { + @Test + public void shouldHaveValidGettersAndSetters() { + assertThat(HealthCheckResult.class, hasValidGettersAndSetters()); + } +}
\ No newline at end of file diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckStatusTest.java b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckStatusTest.java new file mode 100644 index 0000000000..98850defd1 --- /dev/null +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckStatusTest.java @@ -0,0 +1,40 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. 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.health.data; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; + +public class HealthCheckStatusTest { + + @Test + public void shouldReturnEnumFromStringValue() { + HealthCheckStatus status = HealthCheckStatus.toValue("UP"); + assertEquals(status, HealthCheckStatus.UP); + } + + @Test + public void shouldReturnNullIfNotSuchEnum() { + HealthCheckStatus status = HealthCheckStatus.toValue("MAYBE"); + assertNull(status); + } +}
\ No newline at end of file diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthInfoTest.java b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthInfoTest.java new file mode 100644 index 0000000000..dbb3a76569 --- /dev/null +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthInfoTest.java @@ -0,0 +1,32 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. 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.health.data; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.junit.Assert.assertThat; + +import org.junit.Test; + +public class HealthInfoTest { + @Test + public void shouldHaveValidGettersAndSetters() { + assertThat(HealthInfo.class, hasValidGettersAndSetters()); + } +}
\ No newline at end of file diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/MonitoredModulesTest.java b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/MonitoredModulesTest.java new file mode 100644 index 0000000000..fe9415a72c --- /dev/null +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/MonitoredModulesTest.java @@ -0,0 +1,40 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. 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.health.data; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; + +public class MonitoredModulesTest { + + @Test + public void shouldReturnEnumFromStringValue() { + MonitoredModules modules = MonitoredModules.toValue("Zusammen"); + assertEquals(modules, MonitoredModules.ZU); + } + + @Test + public void shouldReturnNullIfNotSuchEnum() { + MonitoredModules modules = MonitoredModules.toValue("UP"); + assertNull(modules); + } +}
\ No newline at end of file diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/SiteModeTest.java b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/SiteModeTest.java new file mode 100644 index 0000000000..b3d21a0d45 --- /dev/null +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/SiteModeTest.java @@ -0,0 +1,39 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. 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.health.data; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; + +public class SiteModeTest { + @Test + public void shouldReturnEnumFromStringValue() { + SiteMode siteMode = SiteMode.toValue("active"); + assertEquals(siteMode, SiteMode.Active); + } + + @Test + public void shouldReturnNullIfNotSuchEnum() { + SiteMode siteMode = SiteMode.toValue("maybe"); + assertNull(siteMode); + } +}
\ No newline at end of file diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/AuthenticationCookieUtilsTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/AuthenticationCookieUtilsTest.java index 34d349a2b4..402803479f 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/AuthenticationCookieUtilsTest.java +++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/AuthenticationCookieUtilsTest.java @@ -18,14 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdc.security; - import org.junit.Test; -import org.onap.sdc.security.filters.SampleFilter; import javax.servlet.http.Cookie; import java.io.IOException; +import org.openecomp.sdc.securityutil.AuthenticationCookie; +import org.openecomp.sdc.securityutil.AuthenticationCookieUtils; +import org.openecomp.sdc.securityutil.CipherUtilException; +import org.openecomp.sdc.securityutil.ISessionValidationFilterConfiguration; +import org.openecomp.sdc.securityutil.filters.SampleFilter; import static org.junit.Assert.*; @@ -38,7 +40,8 @@ public class AuthenticationCookieUtilsTest { public void vaildateThatCookieCurrentSessionTimeIncreased() throws IOException, CipherUtilException { // original cookie, pojo and servlet cookie AuthenticationCookie authenticationCookieOriginal = new AuthenticationCookie("kuku"); - Cookie cookieWithOriginalTime = new Cookie(filterCfg.getCookieName(), AuthenticationCookieUtils.getEncryptedCookie(authenticationCookieOriginal,filterCfg )); + Cookie cookieWithOriginalTime = new Cookie(filterCfg.getCookieName(), AuthenticationCookieUtils + .getEncryptedCookie(authenticationCookieOriginal,filterCfg )); // cookie with increased time, pojo and servlet cookie Cookie cookieWithIncreasedTime = AuthenticationCookieUtils.updateSessionTime(cookieWithOriginalTime, filterCfg); AuthenticationCookie authenticationCookieIncreasedTime = AuthenticationCookieUtils.getAuthenticationCookie(cookieWithIncreasedTime, filterCfg); @@ -58,17 +61,4 @@ public class AuthenticationCookieUtilsTest { assertTrue(authenticationCookieOriginal.equals(decriptedAndDeserializedAuthenticationCookie)); } - - -// @Test -// public void getEncryptedCookie() { -// } -// -// @Test -// public void getAuthenticationCookie() { -// } -// -// @Test -// public void isSessionExpired() { -// } } diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/CipherUtilTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/CipherUtilTest.java index 6d539b6391..888c888d42 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/CipherUtilTest.java +++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/CipherUtilTest.java @@ -18,15 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdc.security; - import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.RandomStringUtils; import org.junit.Test; +import org.openecomp.sdc.securityutil.CipherUtil; +import org.openecomp.sdc.securityutil.CipherUtilException; -import java.util.Random; - -import static org.apache.commons.codec.binary.Base64.encodeBase64String; import static org.junit.Assert.*; public class CipherUtilTest { diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/PasswordsTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/PasswordsTest.java index 4ead127ad2..d3ba3bbe4e 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/PasswordsTest.java +++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/PasswordsTest.java @@ -18,11 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdc.security; - import org.junit.Test; +import org.openecomp.sdc.securityutil.Passwords; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/RepresentationUtilsTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/RepresentationUtilsTest.java index 5d7798da56..5960c82130 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/RepresentationUtilsTest.java +++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/RepresentationUtilsTest.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdc.security; - import org.junit.Test; import java.io.IOException; import java.util.HashSet; import java.util.Set; +import org.openecomp.sdc.securityutil.AuthenticationCookie; +import org.openecomp.sdc.securityutil.RepresentationUtils; import static org.junit.Assert.assertTrue; diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/SecurityUtilTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/SecurityUtilTest.java index 9edce15a44..938f3c5e92 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/SecurityUtilTest.java +++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/SecurityUtilTest.java @@ -18,11 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdc.security; - import org.junit.Test; import java.util.Base64; +import org.openecomp.sdc.securityutil.SecurityUtil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/SessionValidationFilterTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/SessionValidationFilterTest.java index 9a1bb1c5c1..07151bc4d5 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/SessionValidationFilterTest.java +++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/SessionValidationFilterTest.java @@ -18,8 +18,6 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdc.security; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,8 +26,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; -import org.onap.sdc.security.filters.ResponceWrapper; -import org.onap.sdc.security.filters.SampleFilter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -38,13 +34,17 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import org.openecomp.sdc.securityutil.AuthenticationCookie; +import org.openecomp.sdc.securityutil.AuthenticationCookieUtils; +import org.openecomp.sdc.securityutil.CipherUtilException; +import org.openecomp.sdc.securityutil.RepresentationUtils; +import org.openecomp.sdc.securityutil.filters.ResponceWrapper; +import org.openecomp.sdc.securityutil.filters.SampleFilter; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -//@RunWith(PowerMockRunner.class) -//@PrepareForTest(fullyQualifiedNames = "org.onap.sdc.security.*") public class SessionValidationFilterTest { @Mock @@ -126,7 +126,8 @@ public class SessionValidationFilterTest { long startTime = authenticationCookie.getMaxSessionTime(); long timeout = startTime - maxSessionTimeOut - 1000l; authenticationCookie.setMaxSessionTime(timeout); - Cookie cookie = new Cookie(sessionValidationFilter.getFilterConfiguration().getCookieName(), AuthenticationCookieUtils.getEncryptedCookie(authenticationCookie, sessionValidationFilter.getFilterConfiguration())); + Cookie cookie = new Cookie(sessionValidationFilter.getFilterConfiguration().getCookieName(), AuthenticationCookieUtils + .getEncryptedCookie(authenticationCookie, sessionValidationFilter.getFilterConfiguration())); when(request.getCookies()).thenReturn(new Cookie[]{cookie}); sessionValidationFilter.doFilter(request, response, filterChain); |