mirror of https://github.com/apache/cloudstack.git
Fix query filter and units tests (#12184)
This commit is contained in:
parent
0b62fb5e20
commit
8c2a030816
|
|
@ -598,7 +598,7 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long>implements Ne
|
|||
public List<NetworkVO> listByPhysicalNetworkTrafficType(final long physicalNetworkId, final TrafficType trafficType) {
|
||||
final SearchCriteria<NetworkVO> sc = AllFieldsSearch.create();
|
||||
sc.setParameters("trafficType", trafficType);
|
||||
sc.setParameters("physicalNetwork", physicalNetworkId);
|
||||
sc.setParameters("physicalNetworkId", physicalNetworkId);
|
||||
return listBy(sc);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ package com.cloud.network.dao;
|
|||
import com.cloud.network.Networks;
|
||||
import com.cloud.utils.db.SearchBuilder;
|
||||
import com.cloud.utils.db.SearchCriteria;
|
||||
import com.cloud.utils.db.TransactionLegacy;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
|
@ -30,7 +29,6 @@ import org.mockito.Mock;
|
|||
import org.mockito.Mockito;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
|
|
@ -46,26 +44,21 @@ public class NetworkDaoImplTest {
|
|||
List<NetworkVO> listNetworkVoMock;
|
||||
|
||||
@Test
|
||||
public void listByPhysicalNetworkTrafficTypeTestSetParametersValidation() throws Exception {
|
||||
public void listByPhysicalNetworkTrafficTypeTestSetParametersValidation() {
|
||||
NetworkDaoImpl networkDaoImplSpy = Mockito.spy(NetworkDaoImpl.class);
|
||||
TransactionLegacy txn = TransactionLegacy.open("runNetworkDaoImplTest");
|
||||
try {
|
||||
networkDaoImplSpy.AllFieldsSearch = searchBuilderNetworkVoMock;
|
||||
Mockito.doReturn(searchCriteriaNetworkVoMock).when(searchBuilderNetworkVoMock).create();
|
||||
Mockito.doNothing().when(searchCriteriaNetworkVoMock).setParameters(Mockito.anyString(), Mockito.any());
|
||||
Mockito.doReturn(listNetworkVoMock).when(networkDaoImplSpy).listBy(Mockito.any(SearchCriteria.class));
|
||||
networkDaoImplSpy.AllFieldsSearch = searchBuilderNetworkVoMock;
|
||||
Mockito.doReturn(searchCriteriaNetworkVoMock).when(searchBuilderNetworkVoMock).create();
|
||||
Mockito.doNothing().when(searchCriteriaNetworkVoMock).setParameters(Mockito.anyString(), Mockito.any());
|
||||
Mockito.doReturn(listNetworkVoMock).when(networkDaoImplSpy).listBy(Mockito.any(SearchCriteria.class));
|
||||
|
||||
long expectedPhysicalNetwork = 2513l;
|
||||
long expectedPhysicalNetwork = 2513l;
|
||||
|
||||
for (Networks.TrafficType trafficType : Networks.TrafficType.values()) {
|
||||
List<NetworkVO> result = networkDaoImplSpy.listByPhysicalNetworkTrafficType(expectedPhysicalNetwork, trafficType);
|
||||
Assert.assertEquals(listNetworkVoMock, result);
|
||||
Mockito.verify(searchCriteriaNetworkVoMock).setParameters("trafficType", trafficType);
|
||||
}
|
||||
|
||||
Mockito.verify(searchCriteriaNetworkVoMock, Mockito.times(Networks.TrafficType.values().length)).setParameters("physicalNetwork", expectedPhysicalNetwork);
|
||||
} finally {
|
||||
txn.close();
|
||||
for (Networks.TrafficType trafficType : Networks.TrafficType.values()) {
|
||||
List<NetworkVO> result = networkDaoImplSpy.listByPhysicalNetworkTrafficType(expectedPhysicalNetwork, trafficType);
|
||||
Assert.assertEquals(listNetworkVoMock, result);
|
||||
Mockito.verify(searchCriteriaNetworkVoMock).setParameters("trafficType", trafficType);
|
||||
}
|
||||
|
||||
Mockito.verify(searchCriteriaNetworkVoMock, Mockito.times(Networks.TrafficType.values().length)).setParameters("physicalNetworkId", expectedPhysicalNetwork);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue