Skip to content

Commit 5ade2b3

Browse files
committed
Fix unit test
1 parent ca62353 commit 5ade2b3

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

server/src/test/java/com/cloud/network/firewall/FirewallManagerTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import com.cloud.network.NetworkModel;
2525
import com.cloud.network.NetworkRuleApplier;
2626
import com.cloud.network.dao.FirewallRulesDao;
27+
import com.cloud.network.dao.NetworkDao;
28+
import com.cloud.network.dao.NetworkVO;
2729
import com.cloud.network.element.FirewallServiceProvider;
2830
import com.cloud.network.element.VirtualRouterElement;
2931
import com.cloud.network.element.VpcVirtualRouterElement;
@@ -43,6 +45,7 @@
4345
import org.junit.runner.RunWith;
4446
import org.mockito.InjectMocks;
4547
import org.mockito.Mock;
48+
import org.mockito.Mockito;
4649
import org.mockito.MockitoAnnotations;
4750
import org.mockito.Spy;
4851
import org.mockito.junit.MockitoJUnitRunner;
@@ -76,6 +79,8 @@ public class FirewallManagerTest {
7679
IpAddressManager _ipAddrMgr;
7780
@Mock
7881
FirewallRulesDao _firewallDao;
82+
@Mock
83+
NetworkDao _networkDao;
7984

8085
@Spy
8186
@InjectMocks
@@ -196,6 +201,10 @@ public void testDetectRulesConflict() {
196201
FirewallRule newRule4 = new FirewallRuleVO("newRule4", 3L, 15, 25, "TCP", 1, 2, 1, Purpose.Firewall, sString, dString2, null, null,
197202
null, FirewallRule.TrafficType.Egress);
198203

204+
NetworkVO networkVO = Mockito.mock(NetworkVO.class);
205+
when(firewallMgr._networkDao.findById(1L)).thenReturn(networkVO);
206+
when(networkVO.getVpcId()).thenReturn(null);
207+
199208
try {
200209
firewallMgr.detectRulesConflict(newRule1);
201210
firewallMgr.detectRulesConflict(newRule2);

0 commit comments

Comments
 (0)