mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
CLOUDSTACK-8294: fix for java 1.8 build
The test testFindSecurityProfileByUuid built an assumptio on the order of the arguments after transforming through a HashMap. Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
This commit is contained in:
parent
ed099c3f96
commit
873649eb3b
@ -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.methods.PutMethod;
|
||||
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 class NiciraNvpApiTest {
|
||||
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",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user