aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Puzikov <d.puzikov2@partner.samsung.com>2019-11-20 17:08:22 +0100
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-12-01 15:49:13 +0000
commit562b7d5d155c840c1608b0c449c7fe7b6871035e (patch)
tree42ee5f3e3f7acdbbd2166bc9faf1209ead601b60
parent57c8700a4808665d5005de583a15354b9fb0b9f8 (diff)
Increase test coverage
Added tests for uncovered default methods. Change-Id: I3bd88ba5d53a8e5614bd72d2781801fcd5f3fe14 Issue-ID: SDC-2669 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-api/pom.xml5
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java112
2 files changed, 117 insertions, 0 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
index a5bed15729..5105e690ec 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
@@ -19,6 +19,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java
index 530c74eb0f..7e3fd5d2c9 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java
@@ -21,13 +21,26 @@ import java.util.concurrent.ExecutionException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.when;
/**
* @author evitaliy
* @since 28 Oct 2018
*/
+@RunWith(MockitoJUnitRunner.class)
public class ConfigurationTest {
+ @Mock
+ private Configuration configuration;
+
@After
public void cleanUp() {
Configuration.TENANT.remove();
@@ -69,4 +82,103 @@ public class ConfigurationTest {
Assert.assertNull("Tenant in the other thread expected to be null", result.get());
Assert.assertEquals(currentTenant, Configuration.TENANT.get());
}
+
+ @Test
+ public void testGetAsString() {
+ doCallRealMethod().when(configuration).getAsString(anyString());
+ doCallRealMethod().when(configuration).getAsString(any(), anyString());
+ doCallRealMethod().when(configuration).getAsString(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(String.class))).thenReturn("42");
+
+ Assert.assertEquals(String.class, configuration.getAsString("key").getClass());
+ Assert.assertEquals("42", configuration.getAsString("key"));
+ }
+
+ @Test
+ public void testGetAsByte() {
+ doCallRealMethod().when(configuration).getAsByteValue(anyString());
+ doCallRealMethod().when(configuration).getAsByteValue(any(), anyString());
+ doCallRealMethod().when(configuration).getAsByteValue(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(Byte.class))).thenReturn((byte) 42);
+
+ Assert.assertEquals(Byte.class, configuration.getAsByteValue("key").getClass());
+ Assert.assertEquals(Byte.valueOf((byte) 42), configuration.getAsByteValue("key"));
+ }
+
+ @Test
+ public void testGetAsShort() {
+ doCallRealMethod().when(configuration).getAsShortValue(anyString());
+ doCallRealMethod().when(configuration).getAsShortValue(any(), anyString());
+ doCallRealMethod().when(configuration).getAsShortValue(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(Short.class))).thenReturn((short) 42);
+
+ Assert.assertEquals(Short.class, configuration.getAsShortValue("key").getClass());
+ Assert.assertEquals(Short.valueOf((short) 42), configuration.getAsShortValue("key"));
+ }
+
+ @Test
+ public void testGetAsInteger() {
+ doCallRealMethod().when(configuration).getAsIntegerValue(anyString());
+ doCallRealMethod().when(configuration).getAsIntegerValue(any(), anyString());
+ doCallRealMethod().when(configuration).getAsIntegerValue(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(Integer.class))).thenReturn(42);
+
+ Assert.assertEquals(Integer.class, configuration.getAsIntegerValue("key").getClass());
+ Assert.assertEquals(Integer.valueOf(42), configuration.getAsIntegerValue("key"));
+ }
+
+ @Test
+ public void testGetAsLong() {
+ doCallRealMethod().when(configuration).getAsLongValue(anyString());
+ doCallRealMethod().when(configuration).getAsLongValue(any(), anyString());
+ doCallRealMethod().when(configuration).getAsLongValue(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(Long.class))).thenReturn((long) 42);
+
+ Assert.assertEquals(Long.class, configuration.getAsLongValue("key").getClass());
+ Assert.assertEquals(Long.valueOf(42), configuration.getAsLongValue("key"));
+ }
+
+ @Test
+ public void testGetAsDouble() {
+ doCallRealMethod().when(configuration).getAsDoubleValue(anyString());
+ doCallRealMethod().when(configuration).getAsDoubleValue(any(), anyString());
+ doCallRealMethod().when(configuration).getAsDoubleValue(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(Double.class))).thenReturn((double) 42);
+
+ Assert.assertEquals(Double.class, configuration.getAsDoubleValue("key").getClass());
+ Assert.assertEquals(Double.valueOf(42), configuration.getAsDoubleValue("key"));
+ }
+
+ @Test
+ public void testGetAsFloat() {
+ doCallRealMethod().when(configuration).getAsFloatValue(anyString());
+ doCallRealMethod().when(configuration).getAsFloatValue(any(), anyString());
+ doCallRealMethod().when(configuration).getAsFloatValue(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(Float.class))).thenReturn((float) 42);
+
+ Assert.assertEquals(Float.class, configuration.getAsFloatValue("key").getClass());
+ Assert.assertEquals(Float.valueOf(42), configuration.getAsFloatValue("key"));
+ }
+
+ @Test
+ public void testGetAsBoolean() {
+ doCallRealMethod().when(configuration).getAsBooleanValue(anyString());
+ doCallRealMethod().when(configuration).getAsBooleanValue(any(), anyString());
+ doCallRealMethod().when(configuration).getAsBooleanValue(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(Boolean.class))).thenReturn(true);
+
+ Assert.assertEquals(Boolean.class, configuration.getAsBooleanValue("key").getClass());
+ Assert.assertEquals(Boolean.TRUE, configuration.getAsBooleanValue("key"));
+ }
+
+ @Test
+ public void testGetAsCharacter() {
+ doCallRealMethod().when(configuration).getAsCharValue(anyString());
+ doCallRealMethod().when(configuration).getAsCharValue(any(), anyString());
+ doCallRealMethod().when(configuration).getAsCharValue(any(), any(), anyString());
+ when(configuration.get(any(), any(), anyString(), same(Character.class))).thenReturn('\u0042');
+
+ Assert.assertEquals(Character.class, configuration.getAsCharValue("key").getClass());
+ Assert.assertEquals(Character.valueOf('\u0042'), configuration.getAsCharValue("key"));
+ }
}