Remove PowerMockRunner

Did you know that using @RunWith(PowerMockRunner.class) makes tests count 0 lines of coverage in Sonar?  I didn't.

Change-Id: I5c8fae2d0a329866e9c35a7c85344d368af4ad76
Issue-ID: SO-489
Signed-off-by: Arthur Martella <amartell@research.att.com>

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloudify/utils/MsoCloudifyUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloudify/utils/MsoCloudifyUtilsTest.java
index 821522f..da4aebd 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloudify/utils/MsoCloudifyUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloudify/utils/MsoCloudifyUtilsTest.java
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 
-@RunWith(PowerMockRunner.class)
+//@RunWith(PowerMockRunner.class)
 @PrepareForTest({MsoCloudifyUtils.class})
 
 
@@ -109,14 +109,15 @@ public class MsoCloudifyUtilsTest {
 
     @Test(expected = MsoCloudifyManagerNotFound.class)
     public void testCloudifyClient() throws MsoException {
-
+       msoPropertiesFactory = mock(MsoPropertiesFactory.class);
+       cloudConfigFactory = mock(CloudConfigFactory.class);
+       cloudSite = mock(CloudSite.class);
         MsoCloudifyUtils mcu = new MsoCloudifyUtils("msoPropID", msoPropertiesFactory, cloudConfigFactory);
         mcu.getCloudifyClient(cloudSite);
         assert (mcu.getCloudifyClient(cloudSite) != null);
 
     }
 
-
     @Test(expected = NullPointerException.class)
     public void testuploadBlueprint() throws MsoException {
 

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatUtilsTest.java
index c50ffb0..9ba9b2f 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatUtilsTest.java
@@ -44,30 +44,25 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.doReturn;
 
-@RunWith(PowerMockRunner.class)
+//@RunWith(PowerMockRunner.class)
 @PrepareForTest({MsoHeatUtils.class})
 
 
 public class MsoHeatUtilsTest {
 
     @Mock
-
     StackInfo stackInfo;
 
     @Mock
-
     MsoPropertiesFactory msoPropertiesFactory;
 
     @Mock
-
     CloudConfigFactory cloudConfigFactory;
 
     @Mock
-
     Heat heatClient;
 
     @Mock
-
     CloudSite cloudSite;
 
     @Test(expected = NullPointerException.class)

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtilsTest.java
index 4112675..3e4758a 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtilsTest.java
@@ -44,7 +44,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import com.woorea.openstack.keystone.Keystone;\r
 import com.woorea.openstack.keystone.model.Tenant;\r
 \r
-@RunWith(PowerMockRunner.class)\r
+//@RunWith(PowerMockRunner.class)\r
 @PrepareForTest({MsoKeystoneUtils.class,CloudSite.class,CloudIdentity.class,Tenant.class,Keystone.class,MsoTenant.class,MsoJavaProperties.class})\r
 public class MsoKeystoneUtilsTest {\r
     \r
@@ -71,6 +71,7 @@ public class MsoKeystoneUtilsTest {
         MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));\r
         Map<String,String>metadata=new HashMap<>();\r
         metadata.put("1", "value");\r
+        tenant = mock(Tenant.class);\r
         PowerMockito.when(tenant.getId ()).thenReturn("ID");\r
        doReturn(tenant.getId ()).when(msk).createTenant("tenantName", "cloudSiteId", metadata, true);\r
        PowerMockito.spy(tenant.getId ());\r
@@ -95,6 +96,7 @@ public class MsoKeystoneUtilsTest {
         MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));\r
         Map<String,String>metadata=new HashMap<>();\r
         metadata.put("1", "value");  \r
+        mst = mock(MsoTenant.class);\r
        PowerMockito.when(mst.getTenantId()).thenReturn("tenantId");\r
        PowerMockito.when(mst.getMetadata()).thenReturn(metadata);\r
        PowerMockito.when(mst.getTenantName()).thenReturn("name");\r
@@ -107,6 +109,7 @@ public class MsoKeystoneUtilsTest {
         MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));\r
         Map<String,String>metadata=new HashMap<>();\r
         metadata.put("1", "value");  \r
+        mst = mock(MsoTenant.class);\r
         PowerMockito.when(mst.getTenantId()).thenReturn("tenantId");\r
         PowerMockito.when(mst.getMetadata()).thenReturn(metadata);\r
         PowerMockito.when(mst.getTenantName()).thenReturn("name");\r
@@ -117,6 +120,7 @@ public class MsoKeystoneUtilsTest {
     \r
     @Test\r
     public void testgetKeystoneAdminClient() throws MsoException{\r
+       cloudIdentity = mock(CloudIdentity.class);\r
         Keystone keystone = new Keystone (cloudIdentity.getKeystoneUrl ("region", "msoPropID"));\r
         MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));\r
         doReturn(keystone).when(msk).getKeystoneAdminClient(cs);\r

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoNeutronUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoNeutronUtilsTest.java
index 5c52cb5..839da37 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoNeutronUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoNeutronUtilsTest.java
@@ -22,6 +22,7 @@ package org.openecomp.mso.openstack.utils;
 \r
 import static org.junit.Assert.assertTrue;\r
 import static org.mockito.Mockito.doReturn;\r
+import static org.mockito.Mockito.mock;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
@@ -43,7 +44,8 @@ import com.woorea.openstack.quantum.Quantum;
 import com.woorea.openstack.quantum.model.Network;\r
 import com.woorea.openstack.quantum.model.Segment;\r
 \r
-@RunWith(PowerMockRunner.class)\r
+\r
+//@RunWith(PowerMockRunner.class)\r
 @PrepareForTest({MsoNeutronUtils.class,MsoCommonUtils.class,NetworkInfo.class,CloudConfigFactory.class,CloudConfig.class,Segment.class,Network.class,Quantum.class})\r
 public class MsoNeutronUtilsTest{\r
 \r
@@ -79,6 +81,8 @@ CloudSite cloudSite;
        public void testcreateNetwork() throws MsoException{\r
            List<Integer> vlans=new ArrayList();\r
            vlans.add(1);\r
+           cloudConfigFactory = mock(CloudConfigFactory.class);\r
+           ninfo = mock(NetworkInfo.class);\r
            MsoNeutronUtils mnu=PowerMockito.spy(new MsoNeutronUtils("msoProp",cloudConfigFactory));\r
         NetworkType type=NetworkType.PROVIDER;\r
         doReturn(ninfo).when(mnu).createNetwork("cloudSiteId", "tenantId", type, "networkName", "provider", vlans);\r
@@ -87,13 +91,17 @@ CloudSite cloudSite;
        }\r
        @Test\r
     public void testqueryNetwork() throws MsoException{\r
+           cloudConfigFactory = mock(CloudConfigFactory.class);\r
+           ninfo = mock(NetworkInfo.class);\r
            MsoNeutronUtils mnu=PowerMockito.spy(new MsoNeutronUtils("msoProp",cloudConfigFactory));\r
            doReturn(ninfo).when(mnu).queryNetwork("networkNameOrId", "tenantId", "cloudSiteId");\r
-           assert(mnu.queryNetwork("networkNameOrId", "tenantId", "cloudSiteId")!=null);\r
+           NetworkInfo ni = mnu.queryNetwork("networkNameOrId", "tenantId", "cloudSiteId");\r
+           assert(ni!=null);\r
        }\r
        \r
        @Test\r
        public void testdeleteNetwork() throws MsoException{\r
+           cloudConfigFactory = mock(CloudConfigFactory.class);\r
            MsoNeutronUtils mnu=PowerMockito.spy(new MsoNeutronUtils("msoProp",cloudConfigFactory));\r
            doReturn(true).when(mnu).deleteNetwork("networkId", "tenantId", "cloudSiteId");\r
            assertTrue(mnu.deleteNetwork("networkId", "tenantId", "cloudSiteId"));\r
@@ -104,6 +112,8 @@ CloudSite cloudSite;
            List<Integer> vlans=new ArrayList();\r
         vlans.add(1);\r
         NetworkType type=NetworkType.PROVIDER;\r
+           cloudConfigFactory = mock(CloudConfigFactory.class);\r
+           ninfo = mock(NetworkInfo.class);\r
         MsoNeutronUtils mnu=PowerMockito.spy(new MsoNeutronUtils("msoProp",cloudConfigFactory));\r
         doReturn(ninfo).when(mnu).updateNetwork("cloudSiteId", "tenantId", "Nid", type, "provider", vlans);\r
         assert(mnu.updateNetwork("cloudSiteId", "tenantId", "Nid", type, "provider", vlans)!=null);\r

diff --git a/adapters/mso-network-adapter/src/test/java/org/openecomp/mso/adapters/network/NetworkAdapterRestTest.java b/adapters/mso-network-adapter/src/test/java/org/openecomp/mso/adapters/network/NetworkAdapterRestTest.java
index 8e304c6..182190b 100644 (file)
--- a/adapters/mso-network-adapter/src/test/java/org/openecomp/mso/adapters/network/NetworkAdapterRestTest.java
+++ b/adapters/mso-network-adapter/src/test/java/org/openecomp/mso/adapters/network/NetworkAdapterRestTest.java
@@ -65,7 +65,7 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-@RunWith(PowerMockRunner.class)
+//@RunWith(PowerMockRunner.class)
 @PrepareForTest({NetworkAdapterRest.class, CreateNetworkTask.class, CreateNetworkRequest.class, DeleteNetworkTask.class, DeleteNetworkRequest.class})
 public class NetworkAdapterRestTest {
        @Mock