test fixes

clm-webservice/src/main/resources/com/cdek/client/dao/mapper/registry/RegistryNPJournalMapper.xml

@@ -22,8 +22,9 @@
 
     <select id="getItems" parameterType="FilterRequestDto" resultMap="RegistryNpMapper">
         SELECT
-        rnp.uuid as uuid,
+        rnp.uuid as uuid
         <if test="request.columns != null and request.columns.size &gt; 0">
+        	,
             <foreach item="col" collection="request.columns" separator=", ">
                 <!-- Производим выборку колонок -->
                 <choose>

clm-webservice/src/test/java/com/cdek/client/service/impl/registry/RegistryNPServiceTest.java

@@ -60,12 +60,12 @@ public class RegistryNPServiceTest extends BaseServiceTest {
     @Mock
     private RegistryNPDAO registryNPDAO;
 
-    public static final int ID = 5;
+    public static final int ID = 1;
 
     @Before
     public void init(){
         enhancedRandom = CommonEnhancedRandomBuilder.getRandom();
-        filterRequestDto = enhancedRandom.nextObject(FilterRequestDto.class);
+        filterRequestDto = enhancedRandom.nextObject(FilterRequestDto.class, "columns", "sort");
 
         ReflectionTestUtils.setField(registryNPService, "registryUrl", "http://registryUrl");
         ReflectionTestUtils.setField(registryNPService, "changeStatusMethod", "http://changeStatusMethod");
@@ -79,9 +79,9 @@ public class RegistryNPServiceTest extends BaseServiceTest {
     @Test
     public void getFilteredDataTest(){
         registryNPService.getFilteredData(filterRequestDto);
-        verify(validator).validate(refEq(filterRequestDto));
-        verify(clientRegistryNpFilterJournalDao).getJournalClient(refEq(filterRequestDto));
-        verify(clientRegistryNpFilterJournalDao).getClientsCount(refEq(filterRequestDto));
+        verify(validator).validateRegistryNpJournalRequest(refEq(filterRequestDto));
+        verify(registryNPJournalDAO).getItems(refEq(filterRequestDto));
+        verify(registryNPJournalDAO).getMaxAvailableCount(refEq(filterRequestDto));
     }
 
     @Test
@@ -95,9 +95,9 @@ public class RegistryNPServiceTest extends BaseServiceTest {
     @Test
     public void filterJournalClientsTest(){
         registryNPService.filterJournalClients(filterRequestDto);
-        verify(validator).validateRegistryNpJournalRequest(refEq(filterRequestDto));
-        verify(registryNPJournalDAO).getItems(refEq(filterRequestDto));
-        verify(registryNPJournalDAO).getMaxAvailableCount(refEq(filterRequestDto));
+        verify(validator).validate(refEq(filterRequestDto));
+        verify(clientRegistryNpFilterJournalDao).getJournalClient(refEq(filterRequestDto));
+        verify(clientRegistryNpFilterJournalDao).getClientsCount(refEq(filterRequestDto));
     }
 
     @Test