apache · asfgit · Mar 2, 2015 · Mar 1, 2015
diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
@@ -20,12 +20,18 @@
 package com.cloud.network.nicira;

 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Matchers.any;

 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;

 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
@@ -38,10 +44,11 @@
 import org.apache.commons.httpclient.params.HttpClientParams;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;

 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
-
 import com.cloud.utils.rest.RESTServiceConnector;
 import com.cloud.utils.rest.RESTValidationStrategy;

@@ -144,13 +151,23 @@ public void testFindSecurityProfileByUuid() throws NiciraNvpApiException, IOExce
                new NameValuePair("uuid", UUID),
                new NameValuePair("fields","*")
        };
+        final List<NameValuePair> queryStringNvps = new ArrayList<>();
+        doAnswer(new Answer<Void>() {
+
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                final NameValuePair[] arguments = (NameValuePair[]) invocation.getArguments()[0];
+                queryStringNvps.addAll(Arrays.asList(arguments));
+                return null;
+            }}).when(method).setQueryString(any(NameValuePair[].class));

        // Execute
        final NiciraNvpList<SecurityProfile> actualProfiles = api.findSecurityProfile(UUID);

        // Assert
        verify(method, times(1)).releaseConnection();
-        verify(method, times(1)).setQueryString(queryString);
+        assertTrue(queryStringNvps.containsAll(Arrays.asList(queryString)));
+        assertEquals(queryString.length, queryStringNvps.size());
        assertEquals("Wrong Uuid in the newly created SecurityProfile",
                UUID, actualProfiles.getResults().get(0).getUuid());
        assertEquals("Wrong Uuid in the newly created SecurityProfile",