(cloudstack) branch main updated: Fix query filter and units tests (#12184)

[bstoyanov]

This is an automated email from the ASF dual-hosted git repository.

bstoyanov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 8c2a0308165 Fix query filter and units tests (#12184)
8c2a0308165 is described below

commit 8c2a0308165173812d146d835bf31c3e515daff4
Author: Daniel Augusto Veronezi Salvador 
<38945620+gutoveron...@users.noreply.github.com>
AuthorDate: Thu Jan 29 09:51:22 2026 -0300

    Fix query filter and units tests (#12184)
---
 .../java/com/cloud/network/dao/NetworkDaoImpl.java |  2 +-
 .../com/cloud/network/dao/NetworkDaoImplTest.java  | 31 +++++++++-------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git 
a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java 
b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
index 8066b89b4b9..4e8b6204f72 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
@@ -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);
     }
 
diff --git 
a/engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java 
b/engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java
index ab5f4352105..a78eab568af 100644
--- a/engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java
+++ b/engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java
@@ -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));
-
-            long expectedPhysicalNetwork = 2513l;
+        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));
 
-            for (Networks.TrafficType trafficType : 
Networks.TrafficType.values()) {
-                List<NetworkVO> result = 
networkDaoImplSpy.listByPhysicalNetworkTrafficType(expectedPhysicalNetwork, 
trafficType);
-                Assert.assertEquals(listNetworkVoMock, result);
-                
Mockito.verify(searchCriteriaNetworkVoMock).setParameters("trafficType", 
trafficType);
-            }
+        long expectedPhysicalNetwork = 2513l;
 
-            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);
     }
 }