conflicts

provider/search-azure/src/test/java/org/opengroup/osdu/search/provider/azure/provider.impl/QueryServiceImplTest.java

@@ -513,27 +513,6 @@ public class QueryServiceImplTest {
         }
     }
 
-    @Test(expected = AppException.class)
-    public void testQueryBase_SocketTimeoutException_ListenerTimeout_throwsException() throws IOException {
-        SocketTimeoutException exception = mock(SocketTimeoutException.class);
-
-        Set<String> indexedTypes = new HashSet<>();
-        String dummyTimeoutMessage = "60,000 milliseconds timeout on connection";
-
-        doThrow(exception).when(client).search(any(), any(RequestOptions.class));
-        doReturn(dummyTimeoutMessage).when(exception).getMessage();
-        doReturn(indexedTypes).when(fieldMappingTypeService).getFieldTypes(eq(client), eq(fieldName), eq(indexName));
-
-        try {
-            sut.queryIndex(searchRequest);
-        } catch (AppException e) {
-            int errorCode = 504;
-            String errorMessage = "Request timed out after waiting for 1m";
-            validateAppException(e, errorCode, errorMessage);
-            throw (e);
-        }
-    }
-
     @Test(expected = AppException.class)
     public void testQueryBase_IOException_EmptyMessage_throwsException() throws IOException {
         IOException exception = mock(IOException.class);