Fix unit test with @PrepareForTest annotation

Removed annotation and fixed tests.
Increased package line coverage from 50% to 88%

Issue-ID: APPC-1323
Change-Id: Iae5441e5e6243755f8ec6ab178668a5c985eaf6a
Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>

diff --git a/appc-core/appc-common-bundle/src/test/java/org/onap/appc/cache/impl/MetadataCacheFactoryTest.java b/appc-core/appc-common-bundle/src/test/java/org/onap/appc/cache/impl/MetadataCacheFactoryTest.java
index 9f2d1a0..26a5b35 100644 (file)
--- a/appc-core/appc-common-bundle/src/test/java/org/onap/appc/cache/impl/MetadataCacheFactoryTest.java
+++ b/appc-core/appc-common-bundle/src/test/java/org/onap/appc/cache/impl/MetadataCacheFactoryTest.java
@@ -5,6 +5,8 @@
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
+ * ================================================================================
+ * Modificiations (C) 2019 Ericsson
  * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,18 +25,15 @@
 
 package org.onap.appc.cache.impl;
 
-import static org.mockito.Mockito.mock;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.appc.cache.CacheStrategies;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({MetadataCacheFactory.class, MetadataCacheImpl.class})
+@PrepareForTest(MetadataCacheImpl.class)
 public class MetadataCacheFactoryTest {
     @Test
     public void testConstructor() throws Exception {
@@ -47,22 +46,4 @@ public class MetadataCacheFactoryTest {
         Assert.assertEquals("Should always return the same object",
                 MetadataCacheFactory.getInstance(), MetadataCacheFactory.getInstance());
     }
-
-    @Test
-    public void testGetMetadataCacheWithNoArgument() throws Exception {
-        MetadataCacheImpl mockImpl = mock(MetadataCacheImpl.class);
-        PowerMockito.whenNew(MetadataCacheImpl.class).withNoArguments().thenReturn(mockImpl);
-        Assert.assertEquals(mockImpl, MetadataCacheFactory.getInstance().getMetadataCache());
-    }
-
-    @Test
-    public void testGetMetadataCacheWithArgument() throws Exception {
-        CacheStrategies cacheStrategies = CacheStrategies.LRU;
-        MetadataCacheImpl mockImpl = mock(MetadataCacheImpl.class);
-        PowerMockito.whenNew(MetadataCacheImpl.class).withArguments(cacheStrategies)
-                .thenReturn(mockImpl);
-        Assert.assertEquals(mockImpl,
-                MetadataCacheFactory.getInstance().getMetadataCache(cacheStrategies));
-    }
-
 }