Removed some useless PowerMock marks

Change-Id: Ia3fb568b2aec0c435ff4861227988ae0e58b41fd
Signed-off-by: saomenmen <zhangmroy@163.com>

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/intent/IntentResolverTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/intent/IntentResolverTest.java
index 6dbc8485cc7b6b00091cb559f95c36f00fd99799..bbbd075744c4ce65a1f1d2dab38aa8ca9f54b4e9 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/intent/IntentResolverTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/intent/IntentResolverTest.java
@@ -133,7 +133,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.com
  */
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({IntentResolver.class,IntentResolverUtils.class})
+@PrepareForTest(IntentResolverUtils.class)
 public class IntentResolverTest {
     private IntentResolver intentResolver;
     private  DataBroker dataBroker;
@@ -405,4 +405,4 @@ public class IntentResolverTest {
         intentResolver.close();
 
     }
-}
\ No newline at end of file
+}

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/intent/NodeMapperTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/intent/NodeMapperTest.java
index 60266233e7d9144a13e54bd59810767215595fb5..fb8c032b1ee2c426eae37988655e3b3c7f718008 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/intent/NodeMapperTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/intent/NodeMapperTest.java
@@ -87,7 +87,7 @@ import static org.mockito.Mockito.*;
  * Created by zhangmeng on 2015/12/22.\r
  */\r
 @RunWith(PowerMockRunner.class)\r
-@PrepareForTest({NodeMapper.class,IntentResolverUtils.class})\r
+@PrepareForTest(IntentResolverUtils.class)\r
 public class NodeMapperTest extends TestCase {\r
     private DataBroker dataBroker ;\r
     private NodeMapper nodeMapper ;\r
@@ -526,4 +526,4 @@ public class NodeMapperTest extends TestCase {
         verify(node).getNodeId();\r
 \r
     }\r
-}
\ No newline at end of file
+}\r

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/intent/action/ActionResolverUtilsTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/intent/action/ActionResolverUtilsTest.java
index b3f9b5b5f475079fad3554cbdb6c19b147029724..e611e8c6635513d7877a51265bef98d404deaabd 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/intent/action/ActionResolverUtilsTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/intent/action/ActionResolverUtilsTest.java
@@ -51,8 +51,7 @@ import static org.mockito.Mockito.*;
 /**
  * Created by zhangmeng on 2015/12/25.
  */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ActionResolverUtils.class,IntentResolverUtils.class})
+
 public class ActionResolverUtilsTest extends TestCase {
     private ActionResolverUtils actionResolverUtils;
     @Before
@@ -161,6 +160,8 @@ public class ActionResolverUtilsTest extends TestCase {
         virtualNodes.add(virtualNode);
         propertyValues.add(stringValue);
         virtualResourceList.add(virtualResource);
+        propertyList.add(property);
+
 
         //get into method "getMatchItem" args(matchItems ,new MatchItemName("src-ip"))
         when(flow.getMatchItem()).thenReturn(matchItems);
@@ -175,21 +176,27 @@ public class ActionResolverUtilsTest extends TestCase {
         //get into method "getVirtualRouterWithIpPrefix" args(virtualNodes,matchItemValue,nodes, intentVnMappingResults)
         when(node.getNodeType()).thenReturn(new NodeType("l2-group"));
         when(node.getProperty()).thenReturn(propertyList);
-        PowerMockito.mockStatic(IntentResolverUtils.class);
-        PowerMockito.when(IntentResolverUtils.getNodeProperty(any(List.class), any(PropertyName.class))).thenReturn(property);
+//        PowerMockito.mockStatic(IntentResolverUtils.class);
+//        PowerMockito.when(IntentResolverUtils.getNodeProperty(any(List.class), any(PropertyName.class))).thenReturn(property);
+        ////get into method "getNodeProperty" arg(propertyList,new PropertyName("ip-prefix"))
+        when(property.getPropertyName()).thenReturn(new PropertyName("ip-prefix"));
         when(property.getPropertyValues()).thenReturn(propertyValues_temp);
         when(propertyValues_temp.getStringValue()).thenReturn(propertyValues);
         when(stringValue.getValue()).thenReturn(new String("test"));
         when(node.getNodeId()).thenReturn(nodeId);
         when(nodeId.getValue()).thenReturn(new String("00001111-0000-0000-0000-000011112222"));
-        PowerMockito.when(IntentResolverUtils.getIntentVnMappingResult(intentVnMappingResults, new IntentId(node.getNodeId().getValue())))
-                .thenReturn(intentVnMappingResult);
+//        PowerMockito.when(IntentResolverUtils.getIntentVnMappingResult(intentVnMappingResults, new IntentId(node.getNodeId().getValue())))
+//                .thenReturn(intentVnMappingResult);
+        ////get into method "getIntentVnMappingResult" args(intentVnMappingResults,new IntentId(new String("00001111-0000-0000-0000-000011112222")))
+        when(intentVnMappingResult.getIntentId()).thenReturn(new IntentId(new String("00001111-0000-0000-0000-000011112222")));
         when(intentVnMappingResult.getVirtualResource()).thenReturn(virtualResourceList);
         when(virtualResource.getVirtualResourceType()).thenReturn(VirtualResource.VirtualResourceType.Vport);
         when(virtualResource.getParentVirtualResourceEntityId()).thenReturn(virtualResourceEntityId);
         when(virtualResourceEntityId.getValue()).thenReturn(new String("00001111-1111-0000-0000-000011112222"));
-        PowerMockito.when(IntentResolverUtils.getVirtualNode(any(List.class), any(VirtualNodeId.class)))
-                .thenReturn(virtualNode);
+//        PowerMockito.when(IntentResolverUtils.getVirtualNode(any(List.class), any(VirtualNodeId.class)))
+//                .thenReturn(virtualNode);
+        ////get into method "getVirtualNode" arg(virtualNodes,new VirtualNodeId(new String("00001111-1111-0000-0000-000011112222")))
+        when(virtualNode.getNodeId()).thenReturn(new VirtualNodeId(new String("00001111-1111-0000-0000-000011112222")));
         when(virtualNode.getNodeType()).thenReturn(VirtualNode.NodeType.Vrouter);
         Assert.assertTrue(ActionResolverUtils.getSourceVirtualRouterOfFlow(virtualNodes, flow, nodes, intentVnMappingResults) != null);
 
@@ -254,4 +261,4 @@ public class ActionResolverUtilsTest extends TestCase {
         verify(virtualPath1).getMetric();
 
     }
-}
\ No newline at end of file
+}

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/intent/computation/VNMappingUnitTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/intent/computation/VNMappingUnitTest.java
index e979bdcbe7a0951065d9c60cee69c6bb231b4d5f..680b5e907fcfc2aa364cdefa659f90b40ca47195 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/intent/computation/VNMappingUnitTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/intent/computation/VNMappingUnitTest.java
@@ -62,11 +62,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.eng
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.api.support.membermodification.MemberMatcher;
-import org.powermock.api.support.membermodification.MemberModifier;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -77,8 +72,6 @@ import static org.mockito.Mockito.*;
 /**
  * Created by zhangmeng on 2015/12/21.
  */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({VNMappingUnit.class,VNMappingUnitUtils.class})
 public class VNMappingUnitTest extends TestCase {
     private Class<VNMappingUnit> class1;
     private Method method;
@@ -124,6 +117,7 @@ public class VNMappingUnitTest extends TestCase {
         List<VnPnMappingResult> vnPnMappingResults_virtualLinkMapping = new ArrayList<VnPnMappingResult>();
 
         virtualLinks.add(virtualLink);
+        vnPnMappingResults_virtualLinkMapping.add(vnPnMappingResult_virtualLinkMapping);
 
         Assert.assertTrue(result.isPresent());
         when(dataBroker.newReadOnlyTransaction()).thenReturn(readOnlyTransaction);
@@ -144,14 +138,15 @@ public class VNMappingUnitTest extends TestCase {
         when(virtualNetwork.getNetworkId()).thenReturn(virtualNetworkId);
         //get into method "virtualLinkMapping" args(virtualNetworkId,virtualLink,userVnPnMapping)
         when(virtualLink.getSrcNodeId()).thenReturn(virtualNodeId);
+        when(virtualLink.getDestNodeId()).thenReturn(virtualNodeId);
         when(virtualNodeId.getValue()).thenReturn(new String("00001111-0000-0000-0000-000011112222"));
         //powermock
-        PowerMockito.mockStatic(VNMappingUnitUtils.class);
-        PowerMockito.when(VNMappingUnitUtils.getVnPnMappingResult(vnPnMappingResults_virtualLinkMapping, new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222"))))
-                .thenReturn(vnPnMappingResult_virtualLinkMapping);
+//        PowerMockito.mockStatic(VNMappingUnitUtils.class);
+//        PowerMockito.when(VNMappingUnitUtils.getVnPnMappingResult(vnPnMappingResults_virtualLinkMapping, new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222"))))
+//                .thenReturn(vnPnMappingResult_virtualLinkMapping);
+        when(vnPnMappingResult_virtualLinkMapping.getVirtualResourceEntityId()).thenReturn(new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222")));
         when(vnPnMappingResult_virtualLinkMapping.getPhysicalResourceEntityId()).thenReturn(physicalResourceEntityId_virtualLinkMapping);
         when(physicalResourceEntityId_virtualLinkMapping.getValue()).thenReturn(new String("test"));
-        when(virtualLink.getDestNodeId()).thenReturn(virtualNodeId);
         when(virtualLink.getBandwidth()).thenReturn(1L);
         //return to main
         doNothing().when(pnResourcesTracker).addPhysicalPath(any(UserId.class),any(PhysicalPath.class));
@@ -185,6 +180,7 @@ public class VNMappingUnitTest extends TestCase {
 
         unmappedVirtualLinks.add(virtualLink);
         virtualLinks.add(virtualLink);
+        vnPnMappingResults_virtualLinkMapping.add(vnPnMappingResult_virtualLinkMapping);
 
         when(virtualNetwork.getVirtualLinks()).thenReturn(virtualLinks_temp);
         when(virtualLinks_temp.getVirtualLink()).thenReturn(virtualLinks);
@@ -194,21 +190,23 @@ public class VNMappingUnitTest extends TestCase {
         when(virtualNetwork.getNetworkId()).thenReturn(virtualNetworkId);
         //get into method "virtualLinkMapping" args(virtualNetworkId,virtualLink,userVnPnMapping)
         when(virtualLink.getSrcNodeId()).thenReturn(virtualNodeId);
+        when(virtualLink.getDestNodeId()).thenReturn(virtualNodeId);
         when(virtualNodeId.getValue()).thenReturn(new String("00001111-0000-0000-0000-000011112222"));
         //powermock
-        PowerMockito.mockStatic(VNMappingUnitUtils.class);
-        PowerMockito.when(VNMappingUnitUtils.getVnPnMappingResult(vnPnMappingResults_virtualLinkMapping, new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222"))))
-                .thenReturn(vnPnMappingResult_virtualLinkMapping);
+//        PowerMockito.mockStatic(VNMappingUnitUtils.class);
+//        PowerMockito.when(VNMappingUnitUtils.getVnPnMappingResult(vnPnMappingResults_virtualLinkMapping, new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222"))))
+//                .thenReturn(vnPnMappingResult_virtualLinkMapping);
+        when(vnPnMappingResult_virtualLinkMapping.getVirtualResourceEntityId()).thenReturn(new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222")));
         when(vnPnMappingResult_virtualLinkMapping.getPhysicalResourceEntityId()).thenReturn(physicalResourceEntityId_virtualLinkMapping);
         when(physicalResourceEntityId_virtualLinkMapping.getValue()).thenReturn(new String("test"));
-        when(virtualLink.getDestNodeId()).thenReturn(virtualNodeId);
         when(virtualLink.getBandwidth()).thenReturn(1L);
         //return to main
-        doNothing().when(pnResourcesTracker).addPhysicalPath(any(UserId.class),any(PhysicalPath.class));
+        doNothing().when(pnResourcesTracker).addPhysicalPath(any(UserId.class), any(PhysicalPath.class));
         when(virtualLink.getLinkId()).thenReturn(virtualLinkId);
         when(virtualLinkId.getValue()).thenReturn(new String("00001111-0000-0000-0000-000011112222"));
 
         vnMappingUnit.virtualNetworkMapping(virtualNetwork, unmappedVirtualLinks, userVnPnMapping, physicalPaths);
+        verify(vnPnMappingResult_virtualLinkMapping,times(2)).getVirtualResourceEntityId();
         verify(pnResourcesTracker).addPhysicalPath(any(UserId.class), any(PhysicalPath.class));
         verify(userVnPnMapping,times(2)).getVnPnMappingResult();
         verify(virtualLink,times(2)).getSrcNodeId();
@@ -615,14 +613,20 @@ public class VNMappingUnitTest extends TestCase {
         PhysicalResourceEntityId physicalResourceEntityId = mock(PhysicalResourceEntityId.class);
         List<VnPnMappingResult> vnPnMappingResults = new ArrayList<VnPnMappingResult>();
 
+        vnPnMappingResults.add(vnPnMappingResult);
+
         when(userVnPnMapping.getVnPnMappingResult()).thenReturn(vnPnMappingResults);
         when(virtualLink.getSrcNodeId()).thenReturn(virtualNodeId);
+        when(virtualLink.getDestNodeId()).thenReturn(virtualNodeId);
         when(virtualNodeId.getValue()).thenReturn(new String("00001111-0000-0000-0000-000011112222"));
         //powermock
-        PowerMockito.mockStatic(VNMappingUnitUtils.class);
-        PowerMockito.when(VNMappingUnitUtils.getVnPnMappingResult(vnPnMappingResults, new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222"))))
-                .thenReturn(vnPnMappingResult);
-        when(virtualLink.getDestNodeId()).thenReturn(virtualNodeId);
+//        PowerMockito.mockStatic(VNMappingUnitUtils.class);
+//        PowerMockito.when(VNMappingUnitUtils.getVnPnMappingResult(vnPnMappingResults, new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222"))))
+//                .thenReturn(vnPnMappingResult);
+        // replace powermock
+        //get into method "getVnPnMappingResult" args(vnPnMappingResults,new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222")))
+        when(vnPnMappingResult.getVirtualResourceEntityId()).thenReturn(new VirtualResourceEntityId(new String("00001111-0000-0000-0000-000011112222")));
+        // end
         when(vnPnMappingResult.getPhysicalResourceEntityId()).thenReturn(physicalResourceEntityId);
         when(physicalResourceEntityId.getValue())
                 .thenReturn(new String("test"))//source