Yair Zaslavsky has uploaded a new change for review. Change subject: webadmin: Fix of method names to java convention ......................................................................
webadmin: Fix of method names to java convention Change-Id: I8446c08e623285de17ae0cea6292fa293839bfea Signed-off-by: Yair Zaslavsky <[email protected]> --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendTest.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProviderTest.java 6 files changed, 120 insertions(+), 113 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/28323/1 diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java index 4769f81..4ab141e 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java @@ -121,7 +121,7 @@ getService(new ServiceCallback() { @Override public void serviceFound(GenericApiGWTServiceAsync service) { - service.RunPublicQuery((VdcQueryType) operation.getOperation(), + service.runPublicQuery((VdcQueryType) operation.getOperation(), (VdcQueryParametersBase) operation.getParameter(), new AsyncCallback<VdcQueryReturnValue>() { @Override public void onFailure(final Throwable exception) { @@ -150,7 +150,7 @@ getService(new ServiceCallback() { @Override public void serviceFound(GenericApiGWTServiceAsync service) { - service.RunQuery((VdcQueryType) operation.getOperation(), + service.runQuery((VdcQueryType) operation.getOperation(), (VdcQueryParametersBase) operation.getParameter(), new AsyncCallback<VdcQueryReturnValue>() { @Override public void onFailure(final Throwable exception) { @@ -179,7 +179,7 @@ getService(new ServiceCallback() { @Override public void serviceFound(GenericApiGWTServiceAsync service) { - service.RunAction((VdcActionType) operation.getOperation(), + service.runAction((VdcActionType) operation.getOperation(), (VdcActionParametersBase) operation.getParameter(), new AsyncCallback<VdcReturnValueBase>() { @Override public void onFailure(final Throwable exception) { @@ -255,7 +255,7 @@ getService(new ServiceCallback() { @Override public void serviceFound(GenericApiGWTServiceAsync service) { - service.RunMultipleQueries((ArrayList<VdcQueryType>) queryTypes, + service.runMultipleQueries((ArrayList<VdcQueryType>) queryTypes, (ArrayList<VdcQueryParametersBase>) parameters, new AsyncCallback<ArrayList<VdcQueryReturnValue>>() { @Override @@ -363,7 +363,7 @@ getService(new ServiceCallback() { @Override public void serviceFound(GenericApiGWTServiceAsync service) { - service.RunMultipleActions(actionType, (ArrayList<VdcActionParametersBase>) parameters, + service.runMultipleActions(actionType, (ArrayList<VdcActionParametersBase>) parameters, false, waitForResults, new AsyncCallback<ArrayList<VdcReturnValueBase>>() { @Override @@ -466,7 +466,7 @@ getService(new ServiceCallback() { @Override public void serviceFound(GenericApiGWTServiceAsync service) { - service.Login(loginOperation.getParameter().getLoginName(), loginOperation.getParameter().getPassword(), + service.login(loginOperation.getParameter().getLoginName(), loginOperation.getParameter().getPassword(), loginOperation.getParameter().getProfileName(), loginOperation.getOperation(), new AsyncCallback<VdcReturnValueBase>() { @Override diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java index 81bea66..8331df3 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java @@ -16,26 +16,26 @@ @RemoteServiceRelativePath("GenericApiGWTService") public interface GenericApiGWTService extends XsrfProtectedRpcService { - public VdcQueryReturnValue RunQuery(VdcQueryType search, + public VdcQueryReturnValue runQuery(VdcQueryType search, VdcQueryParametersBase searchParameters); - public VdcReturnValueBase RunAction(VdcActionType actionType, + public VdcReturnValueBase runAction(VdcActionType actionType, VdcActionParametersBase params); @NoXsrfProtect - public VdcQueryReturnValue RunPublicQuery(VdcQueryType queryType, + public VdcQueryReturnValue runPublicQuery(VdcQueryType queryType, VdcQueryParametersBase params); - public ArrayList<VdcQueryReturnValue> RunMultipleQueries( + public ArrayList<VdcQueryReturnValue> runMultipleQueries( ArrayList<VdcQueryType> vdcQueryTypeList, ArrayList<VdcQueryParametersBase> paramsList); - public ArrayList<VdcReturnValueBase> RunMultipleActions( + public ArrayList<VdcReturnValueBase> runMultipleActions( VdcActionType actionType, ArrayList<VdcActionParametersBase> multipleParams, boolean isRunOnlyIfAllCanDoPass); - public ArrayList<VdcReturnValueBase> RunMultipleActions( + public ArrayList<VdcReturnValueBase> runMultipleActions( VdcActionType actionType, ArrayList<VdcActionParametersBase> multipleParams, boolean isRunOnlyIfAllCanDoPass, boolean isWaitForResult); @@ -46,7 +46,7 @@ public VdcReturnValueBase logOff(DbUser userToLogoff); @NoXsrfProtect - public VdcReturnValueBase Login(String userName, String password, String profileName, VdcActionType loginType); + public VdcReturnValueBase login(String userName, String password, String profileName, VdcActionType loginType); public void storeInHttpSession(String key, String value); diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java index 1ef8c1e..c56071f 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java @@ -4,6 +4,7 @@ import java.util.Random; import javax.ejb.EJB; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -45,8 +46,12 @@ return backend; } + public void init() throws ServletException { + log.debug("Initializing servlet!"); //$NON-NLS-1$ + } + @Override - public VdcQueryReturnValue RunQuery(VdcQueryType search, + public VdcQueryReturnValue runQuery(VdcQueryType search, VdcQueryParametersBase searchParameters) { log.debug("Server: RunQuery invoked!"); //$NON-NLS-1$ debugQuery(search, searchParameters); @@ -55,7 +60,7 @@ } @Override - public VdcQueryReturnValue RunPublicQuery(VdcQueryType queryType, + public VdcQueryReturnValue runPublicQuery(VdcQueryType queryType, VdcQueryParametersBase params) { log.debug("Server: runPublicQuery invoked! " + queryType); //$NON-NLS-1$ debugQuery(queryType, params); @@ -63,7 +68,7 @@ } @Override - public ArrayList<VdcQueryReturnValue> RunMultipleQueries( + public ArrayList<VdcQueryReturnValue> runMultipleQueries( ArrayList<VdcQueryType> queryTypeList, ArrayList<VdcQueryParametersBase> queryParamsList) { int size = queryTypeList == null ? 0 : queryTypeList.size(); @@ -82,7 +87,7 @@ else { for (int i = 0; i < queryTypeList.size(); i++) { debugQuery(queryTypeList.get(i), queryParamsList.get(i)); - ret.add(RunQuery(queryTypeList.get(i), queryParamsList.get(i))); + ret.add(runQuery(queryTypeList.get(i), queryParamsList.get(i))); } } @@ -96,13 +101,13 @@ } @Override - public ArrayList<VdcReturnValueBase> RunMultipleActions(VdcActionType actionType, + public ArrayList<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, ArrayList<VdcActionParametersBase> multipleParams, boolean isRunOnlyIfAllCanDoPass) { - return RunMultipleActions(actionType, multipleParams, isRunOnlyIfAllCanDoPass, false); + return runMultipleActions(actionType, multipleParams, isRunOnlyIfAllCanDoPass, false); } @Override - public ArrayList<VdcReturnValueBase> RunMultipleActions(VdcActionType actionType, + public ArrayList<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, ArrayList<VdcActionParametersBase> multipleParams, boolean isRunOnlyIfAllCanDoPass, boolean isWaitForResult) { log.debug("Server: RunMultipleAction invoked! [amount of actions: " + multipleParams.size() + "]"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -117,7 +122,7 @@ } @Override - public VdcReturnValueBase RunAction(VdcActionType actionType, + public VdcReturnValueBase runAction(VdcActionType actionType, VdcActionParametersBase params) { log.debug("Server: RunAction invoked!"); //$NON-NLS-1$ debugAction(actionType, params); @@ -138,7 +143,7 @@ queryParams.setSessionId(getSession().getId()); queryParams.setHttpSessionId(getSession().getId()); - VdcQueryReturnValue vqrv = RunQuery(VdcQueryType.GetUserBySessionId, + VdcQueryReturnValue vqrv = runQuery(VdcQueryType.GetUserBySessionId, queryParams); if (!vqrv.getSucceeded()) { @@ -163,7 +168,7 @@ } @Override - public VdcReturnValueBase Login(String userName, String password, String profileName, VdcActionType loginType) { + public VdcReturnValueBase login(String userName, String password, String profileName, VdcActionType loginType) { LoginUserParameters params = new LoginUserParameters(profileName, userName, password); HttpSession originalSession = getSession(); // Prevent session fixation. diff --git a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java index 6797e1b..f1bfb72 100644 --- a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java +++ b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java @@ -136,12 +136,12 @@ * </ol> */ @Test - public void testRunMultipleActions_ignored_failure_multiple() { + public void testrunMultipleActions_ignored_failure_multiple() { ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(new VdcActionParametersBase()); frontend.runMultipleAction(VdcActionType.AddLocalStorageDomain, parameters, false, mockMultipleActionCallback, null); - verify(mockService).RunMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), + verify(mockService).runMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), eq(false), callbackMultipleActions.capture()); StatusCodeException exception = new StatusCodeException(0, "0 status code"); //$NON-NLS-1$ callbackMultipleActions.getValue().onFailure(exception); @@ -159,13 +159,13 @@ * </ol> */ @Test - public void testRunMultipleActions_404_failure_multiple() { + public void testrunMultipleActions_404_failure_multiple() { ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(new VdcActionParametersBase()); Object testState = new Object(); frontend.runMultipleAction(VdcActionType.AddLocalStorageDomain, parameters, false, mockMultipleActionCallback, testState); - verify(mockService).RunMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), + verify(mockService).runMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), eq(false), callbackMultipleActions.capture()); StatusCodeException exception = new StatusCodeException(HttpServletResponse.SC_NOT_FOUND, "404 status code"); //$NON-NLS-1$ @@ -189,7 +189,7 @@ * </ol> */ @Test - public void testRunMultipleActionsMultipleSuccess() { + public void testrunMultipleActionsMultipleSuccess() { // Don't immediately call process until both queries are in the queue. fakeScheduler.setThreshold(2); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); @@ -199,7 +199,7 @@ Object testState = new Object(); frontend.runMultipleAction(VdcActionType.AddLocalStorageDomain, parameters, false, mockMultipleActionCallback, testState); - verify(mockService).RunMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), + verify(mockService).runMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), eq(false), callbackMultipleActions.capture()); ArrayList<VdcReturnValueBase> returnValues = new ArrayList<VdcReturnValueBase>(); returnValues.add(new VdcReturnValueBase()); @@ -226,7 +226,7 @@ */ @SuppressWarnings("unchecked") @Test - public void testRunMultipleActionsMultipleSuccess_oneFailure() { + public void testrunMultipleActionsMultipleSuccess_oneFailure() { // Don't immediately call process until both queries are in the queue. fakeScheduler.setThreshold(2); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); @@ -236,7 +236,7 @@ Object testState = new Object(); frontend.runMultipleAction(VdcActionType.AddLocalStorageDomain, parameters, false, mockMultipleActionCallback, testState); - verify(mockService).RunMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), + verify(mockService).runMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), eq(false), callbackMultipleActions.capture()); ArrayList<VdcReturnValueBase> returnValues = new ArrayList<VdcReturnValueBase>(); returnValues.add(new VdcReturnValueBase()); @@ -269,7 +269,7 @@ */ @SuppressWarnings("unchecked") @Test - public void testRunMultipleActionsMultipleSuccess_multipleFailure() { + public void testrunMultipleActionsMultipleSuccess_multipleFailure() { // Don't immediately call process until all queries are in the queue. fakeScheduler.setThreshold(4); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); @@ -283,7 +283,7 @@ Object testState = new Object(); frontend.runMultipleAction(VdcActionType.AddLocalStorageDomain, parameters, false, mockMultipleActionCallback, testState); - verify(mockService).RunMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), + verify(mockService).runMultipleActions(eq(VdcActionType.AddLocalStorageDomain), eq(parameters), eq(false), eq(false), callbackMultipleActions.capture()); ArrayList<VdcReturnValueBase> returnValues = new ArrayList<VdcReturnValueBase>(); returnValues.add(new VdcReturnValueBase()); @@ -321,11 +321,11 @@ * </ol> */ @Test - public void testRunActionImpl_ignored_failure() { + public void testrunActionImpl_ignored_failure() { Object testState = new Object(); VdcActionParametersBase testParameters = new VdcActionParametersBase(); frontend.runAction(VdcActionType.AddDisk, testParameters, mockActionCallback, testState, false); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters), callbackAction.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters), callbackAction.capture()); StatusCodeException exception = new StatusCodeException(0, "0 status code"); //$NON-NLS-1$ callbackAction.getValue().onFailure(exception); verify(mockFrontendFailureEvent, never()).raise(eq(Frontend.class), (FrontendFailureEventArgs) any()); @@ -342,11 +342,11 @@ * </ol> */ @Test - public void testRunActionImpl_404_failure() { + public void testrunActionImpl_404_failure() { Object testState = new Object(); VdcActionParametersBase testParameters = new VdcActionParametersBase(); frontend.runAction(VdcActionType.AddDisk, testParameters, mockActionCallback, testState, false); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters), callbackAction.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters), callbackAction.capture()); StatusCodeException exception = new StatusCodeException(HttpServletResponse.SC_NOT_FOUND, "404 status code"); //$NON-NLS-1$ callbackAction.getValue().onFailure(exception); @@ -368,11 +368,11 @@ * </ol> */ @Test - public void testRunActionImpl_success() { + public void testrunActionImpl_success() { Object testState = new Object(); VdcActionParametersBase testParameters = new VdcActionParametersBase(); frontend.runAction(VdcActionType.AddDisk, testParameters, mockActionCallback, testState, false); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters), callbackAction.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters), callbackAction.capture()); VdcReturnValueBase returnValue = new VdcReturnValueBase(); callbackAction.getValue().onSuccess(returnValue); verify(mockActionCallback).executed(callbackParam.capture()); @@ -573,7 +573,7 @@ * </ol> */ @Test - public void testRunMultipleActions_1action() { + public void testrunMultipleActions_1action() { List<VdcActionType> actionTypes = new ArrayList<VdcActionType>(); actionTypes.add(VdcActionType.AddDisk); List<VdcActionParametersBase> testParameters = new ArrayList<VdcActionParametersBase>(); @@ -582,7 +582,7 @@ callbacks.add(mockActionCallback); Object testState = new Object(); frontend.runMultipleActions(actionTypes, testParameters, callbacks, mockActionFailureCallback, testState); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters.get(0)), callbackAction.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters.get(0)), callbackAction.capture()); VdcReturnValueBase returnValue = new VdcReturnValueBase(); returnValue.setCanDoAction(true); returnValue.setSucceeded(true); @@ -602,7 +602,7 @@ * </ol> */ @Test - public void testRunMultipleActions_multipleaction_success_all() { + public void testrunMultipleActions_multipleaction_success_all() { List<VdcActionType> actionTypes = new ArrayList<VdcActionType>(); actionTypes.add(VdcActionType.AddDisk); actionTypes.add(VdcActionType.AddBricksToGlusterVolume); @@ -614,15 +614,15 @@ callbacks.add(mockActionCallback); Object testState = new Object(); frontend.runMultipleActions(actionTypes, testParameters, callbacks, mockActionFailureCallback, testState); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters.get(0)), callbackAction.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters.get(0)), callbackAction.capture()); VdcReturnValueBase returnValue = new VdcReturnValueBase(); returnValue.setCanDoAction(true); returnValue.setSucceeded(true); callbackAction.getValue().onSuccess(returnValue); verify(mockActionCallback).executed(callbackParam.capture()); assertEquals(callbackParam.getValue().getReturnValue(), returnValue); - // Second call to RunAction, the size of the parameters should have decreased - verify(mockService).RunAction(eq(VdcActionType.AddBricksToGlusterVolume), eq(testParameters.get(0)), + // Second call to runAction, the size of the parameters should have decreased + verify(mockService).runAction(eq(VdcActionType.AddBricksToGlusterVolume), eq(testParameters.get(0)), callbackAction.capture()); returnValue = new VdcReturnValueBase(); returnValue.setCanDoAction(true); @@ -641,7 +641,7 @@ * </ol> */ @Test - public void testRunMultipleActions_multipleaction_success_first_success_second_failure() { + public void testrunMultipleActions_multipleaction_success_first_success_second_failure() { List<VdcActionType> actionTypes = new ArrayList<VdcActionType>(); actionTypes.add(VdcActionType.AddDisk); actionTypes.add(VdcActionType.AddBricksToGlusterVolume); @@ -653,15 +653,15 @@ callbacks.add(mockActionCallback); Object testState = new Object(); frontend.runMultipleActions(actionTypes, testParameters, callbacks, mockActionFailureCallback, testState); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters.get(0)), callbackAction.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters.get(0)), callbackAction.capture()); VdcReturnValueBase returnValue = new VdcReturnValueBase(); returnValue.setCanDoAction(true); returnValue.setSucceeded(true); callbackAction.getValue().onSuccess(returnValue); verify(mockActionCallback).executed(callbackParam.capture()); assertEquals(callbackParam.getValue().getReturnValue(), returnValue); - // Second call to RunAction - verify(mockService).RunAction(eq(VdcActionType.AddBricksToGlusterVolume), eq(testParameters.get(0)), + // Second call to runAction + verify(mockService).runAction(eq(VdcActionType.AddBricksToGlusterVolume), eq(testParameters.get(0)), callbackAction.capture()); returnValue = new VdcReturnValueBase(); returnValue.setCanDoAction(false); @@ -680,7 +680,7 @@ * </ol> */ @Test - public void testRunMultipleActions_multipleaction_success_first_failure_second_success() { + public void testrunMultipleActions_multipleaction_success_first_failure_second_success() { List<VdcActionType> actionTypes = new ArrayList<VdcActionType>(); actionTypes.add(VdcActionType.AddDisk); actionTypes.add(VdcActionType.AddBricksToGlusterVolume); @@ -692,15 +692,15 @@ callbacks.add(mockActionCallback); Object testState = new Object(); frontend.runMultipleActions(actionTypes, testParameters, callbacks, mockActionFailureCallback, testState); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters.get(0)), callbackAction.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters.get(0)), callbackAction.capture()); VdcReturnValueBase returnValue = new VdcReturnValueBase(); returnValue.setCanDoAction(false); returnValue.setSucceeded(false); callbackAction.getValue().onSuccess(returnValue); verify(mockActionFailureCallback).executed(callbackParam.capture()); assertEquals(callbackParam.getValue().getReturnValue(), returnValue); - // Second call to RunAction, the size of the parameters should have decreased - verify(mockService, never()).RunAction(eq(VdcActionType.AddBricksToGlusterVolume), eq(testParameters.get(0)), + // Second call to runAction, the size of the parameters should have decreased + verify(mockService, never()).runAction(eq(VdcActionType.AddBricksToGlusterVolume), eq(testParameters.get(0)), callbackAction.capture()); } @@ -721,7 +721,7 @@ String testPassword = "testpassword"; //$NON-NLS-1$ String testProfile = "testprofile"; //$NON-NLS-1$ frontend.loginAsync(testUser, testPassword, testProfile, true, mockAsyncQuery); - verify(mockService).Login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginAdminUser), + verify(mockService).login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginAdminUser), callbackAction.capture()); StatusCodeException exception = new StatusCodeException(0, "0 status code"); //$NON-NLS-1$ callbackAction.getValue().onFailure(exception); @@ -747,7 +747,7 @@ String testPassword = "testpassword"; //$NON-NLS-1$ String testProfile = "testprofile"; //$NON-NLS-1$ frontend.loginAsync(testUser, testPassword, testProfile, false, mockAsyncQuery); - verify(mockService).Login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginUser), + verify(mockService).login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginUser), callbackAction.capture()); StatusCodeException exception = new StatusCodeException(0, "0 status code"); //$NON-NLS-1$ callbackAction.getValue().onFailure(exception); @@ -774,7 +774,7 @@ frontend.initLoggedInUser(new DbUser(), testPassword); when(mockAsyncQuery.isHandleFailure()).thenReturn(Boolean.TRUE); frontend.loginAsync(testUser, testPassword, testProfile, false, mockAsyncQuery); - verify(mockService).Login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginUser), + verify(mockService).login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginUser), callbackAction.capture()); StatusCodeException exception = new StatusCodeException(HttpServletResponse.SC_NOT_FOUND, "404 status code"); //$NON-NLS-1$ @@ -805,7 +805,7 @@ frontend.initLoggedInUser(new DbUser(), testPassword); when(mockAsyncQuery.isHandleFailure()).thenReturn(Boolean.TRUE); frontend.loginAsync(testUser, testPassword, testProfile, false, mockAsyncQuery); - verify(mockService).Login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginUser), + verify(mockService).login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginUser), callbackAction.capture()); VdcReturnValueBase returnValue = new VdcReturnValueBase(); returnValue.setSucceeded(true); @@ -835,7 +835,7 @@ frontend.initLoggedInUser(new DbUser(), testPassword); when(mockAsyncQuery.isHandleFailure()).thenReturn(Boolean.TRUE); frontend.loginAsync(testUser, testPassword, testProfile, false, mockAsyncQuery); - verify(mockService).Login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginUser), + verify(mockService).login(eq(testUser), eq(testPassword), eq(testProfile), eq(VdcActionType.LoginUser), callbackAction.capture()); VdcReturnValueBase returnValue = new VdcReturnValueBase(); returnValue.setSucceeded(false); // Yes I know this is the default, just to be sure. diff --git a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendTest.java b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendTest.java index b921892..e8051d6 100644 --- a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendTest.java +++ b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendTest.java @@ -144,13 +144,13 @@ * </ol> */ @Test - public void testRunQuery_ignored_failure() { + public void testrunQuery_ignored_failure() { VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ StatusCodeException exception = new StatusCodeException(0, "0 status code"); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); // Repeat 4 times, because of retries. for (int i = 1; i < RETRY_COUNT; i++) { - verify(mockService, times(i)).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService, times(i)).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); // Call the failure handler. callback.getValue().onFailure(exception); } @@ -166,14 +166,14 @@ * </ol> */ @Test - public void testRunQuery_failure_404() { + public void testrunQuery_failure_404() { VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); StatusCodeException exception = new StatusCodeException(HttpServletResponse.SC_NOT_FOUND, "404 status code"); //$NON-NLS-1$ // Repeat 4 times, because of retries. for (int i = 1; i < RETRY_COUNT; i++) { - verify(mockService, times(i)).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService, times(i)).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); // Call the failure handler. callback.getValue().onFailure(exception); } @@ -190,7 +190,7 @@ * </ol> */ @Test - public void testRunQuery_failure_404_callback() { + public void testrunQuery_failure_404_callback() { Object mockModel = new Object(); when(mockAsyncQuery.isHandleFailure()).thenReturn(true); when(mockAsyncQuery.getModel()).thenReturn(mockModel); @@ -200,7 +200,7 @@ "404 status code"); //$NON-NLS-1$ // Repeat 4 times, because of retries. for (int i = 1; i < RETRY_COUNT; i++) { - verify(mockService, times(i)).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService, times(i)).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); // Call the failure handler. callback.getValue().onFailure(exception); } @@ -220,7 +220,7 @@ * </ol> */ @Test - public void testRunQuery_failure_404_with_pending() { + public void testrunQuery_failure_404_with_pending() { VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); @@ -229,7 +229,7 @@ // Repeat 4 times, because of retries. for (int i = 1; i < RETRY_COUNT; i++) { // Verify that only one request is executed, until the first one is complete. - verify(mockService, times(i)).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService, times(i)).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); // Now finish the first request. // Call the failure handler. callback.getValue().onFailure(exception); @@ -249,7 +249,7 @@ * </ol> */ @Test - public void testRunQuery_failure_404_with_pending_3times() { + public void testrunQuery_failure_404_with_pending_3times() { VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); @@ -259,7 +259,7 @@ // Repeat 4 times, because of retries. for (int i = 1; i < RETRY_COUNT; i++) { // Verify that only one request is executed, until the first one is complete. - verify(mockService, times(i)).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService, times(i)).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); // Call the failure handler. callback.getValue().onFailure(exception); } @@ -278,7 +278,7 @@ * </ol> */ @Test - public void testRunQuery_failure_404_with_pending_5times() { + public void testrunQuery_failure_404_with_pending_5times() { VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); @@ -290,7 +290,7 @@ // Repeat 4 times, because of retries. for (int i = 1; i < RETRY_COUNT; i++) { // Verify that only one request is executed, until the first one is complete. - verify(mockService, times(i)).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService, times(i)).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); // Call the failure handler. callback.getValue().onFailure(exception); } @@ -308,10 +308,10 @@ * </ol> */ @Test - public void testRunQuery_success_not_succeeded_noeventshandler_nocallbackhandler() { + public void testrunQuery_success_not_succeeded_noeventshandler_nocallbackhandler() { VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); VdcQueryReturnValue mockReturnValue = new VdcQueryReturnValue(); mockReturnValue.setExceptionString("Fake failure for test"); //$NON-NLS-1$ // Return value set to failure @@ -332,10 +332,10 @@ * </ol> */ @Test - public void testRunQuery_success_not_succeeded_eventshandler_nocallbackhandler() { + public void testrunQuery_success_not_succeeded_eventshandler_nocallbackhandler() { VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); VdcQueryReturnValue mockReturnValue = new VdcQueryReturnValue(); mockReturnValue.setExceptionString("USER_IS_NOT_LOGGED_IN"); //$NON-NLS-1$ // Return value set to failure @@ -357,13 +357,13 @@ * </ol> */ @Test - public void testRunQuery_success_not_succeeded_eventshandler_callbackhandler() { + public void testrunQuery_success_not_succeeded_eventshandler_callbackhandler() { Object mockModel = new Object(); when(mockAsyncQuery.isHandleFailure()).thenReturn(true); when(mockAsyncQuery.getModel()).thenReturn(mockModel); VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); VdcQueryReturnValue mockReturnValue = new VdcQueryReturnValue(); mockReturnValue.setExceptionString("USER_IS_NOT_LOGGED_IN"); //$NON-NLS-1$ // Return value set to failure @@ -384,12 +384,12 @@ * </ol> */ @Test - public void testRunQuery_success_succeeded_eventshandler_noconverter() { + public void testrunQuery_success_succeeded_eventshandler_noconverter() { Object mockModel = new Object(); when(mockAsyncQuery.getModel()).thenReturn(mockModel); VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); VdcQueryReturnValue mockReturnValue = new VdcQueryReturnValue(); mockReturnValue.setSucceeded(true); callback.getValue().onSuccess(mockReturnValue); @@ -408,7 +408,7 @@ * </ol> */ @Test - public void testRunQuery_success_succeeded_eventshandler_converter() { + public void testrunQuery_success_succeeded_eventshandler_converter() { Object mockModel = new Object(); Object mockResultModel = new Object(); Object mockConvertedModel = new Object(); @@ -416,7 +416,7 @@ when(mockAsyncQuery.getConverter()).thenReturn(mockConverter); VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); VdcQueryReturnValue mockReturnValue = new VdcQueryReturnValue(); mockReturnValue.setReturnValue(mockResultModel); mockReturnValue.setExceptionString("USER_IS_NOT_LOGGED_IN"); //$NON-NLS-1$ @@ -440,13 +440,13 @@ * </ol> */ @Test - public void testRunQuery_success_succeeded_multiple_same_eventshandler_noconverter() { + public void testrunQuery_success_succeeded_multiple_same_eventshandler_noconverter() { Object mockModel = new Object(); when(mockAsyncQuery.getModel()).thenReturn(mockModel); VdcQueryParametersBase testParameters = new SearchParameters("*win*", SearchType.VM); //$NON-NLS-1$ frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); frontend.runQuery(VdcQueryType.Search, testParameters, mockAsyncQuery, false); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), callback.capture()); VdcQueryReturnValue mockReturnValue = new VdcQueryReturnValue(); mockReturnValue.setExceptionString("USER_IS_NOT_LOGGED_IN"); //$NON-NLS-1$ // Return value set to success @@ -465,7 +465,7 @@ * </ol> */ @Test - public void testRunMultipleQueries_ignored_failure() { + public void testrunMultipleQueries_ignored_failure() { ArrayList<VdcQueryType> queryTypeList = new ArrayList<VdcQueryType>(); queryTypeList.add(VdcQueryType.Search); ArrayList<VdcQueryParametersBase> queryParamsList = new ArrayList<VdcQueryParametersBase>(); @@ -474,7 +474,7 @@ StatusCodeException exception = new StatusCodeException(0, "0 status code"); //$NON-NLS-1$ // Repeat 4 times, because of retries. for (int i = 1; i < RETRY_COUNT; i++) { - verify(mockService, times(i)).RunMultipleQueries(eq(queryTypeList), eq(queryParamsList), + verify(mockService, times(i)).runMultipleQueries(eq(queryTypeList), eq(queryParamsList), callbackMultipleQueries.capture()); // Call the failure handler. callbackMultipleQueries.getValue().onFailure(exception); @@ -492,7 +492,7 @@ * </ol> */ @Test - public void testRunMultipleQueries_ignored_failure_multiple() { + public void testrunMultipleQueries_ignored_failure_multiple() { // Don't immediately call process until both queries are in the queue. fakeScheduler.setThreshold(2); ArrayList<VdcQueryType> queryTypeList = new ArrayList<VdcQueryType>(); @@ -507,7 +507,7 @@ for (int i = 1; i < RETRY_COUNT; i++) { // Reset the count so we can re-add both entries again. fakeScheduler.resetCount(); - verify(mockService, times(i)).RunMultipleQueries(eq(queryTypeList), eq(queryParamsList), + verify(mockService, times(i)).runMultipleQueries(eq(queryTypeList), eq(queryParamsList), callbackMultipleQueries.capture()); // Call the failure handler. callbackMultipleQueries.getValue().onFailure(exception); @@ -525,7 +525,7 @@ * </ol> */ @Test - public void testRunMultipleQueries_404_failure() { + public void testrunMultipleQueries_404_failure() { // Don't immediately call process until both queries are in the queue. fakeScheduler.setThreshold(2); when(mockConstants.requestToServerFailedWithCode()). @@ -543,7 +543,7 @@ for (int i = 1; i < RETRY_COUNT; i++) { // Reset the count so we can re-add both entries again. fakeScheduler.resetCount(); - verify(mockService, times(i)).RunMultipleQueries(eq(queryTypeList), eq(queryParamsList), + verify(mockService, times(i)).runMultipleQueries(eq(queryTypeList), eq(queryParamsList), callbackMultipleQueries.capture()); // Call the failure handler. callbackMultipleQueries.getValue().onFailure(exception); @@ -565,7 +565,7 @@ * </ol> */ @Test - public void testRunMultipleQueries_multiple_success() { + public void testrunMultipleQueries_multiple_success() { // Don't immediately call process until both queries are in the queue. fakeScheduler.setThreshold(2); ArrayList<VdcQueryType> queryTypeList = new ArrayList<VdcQueryType>(); @@ -575,7 +575,7 @@ queryParamsList.add(new SearchParameters("*win*", SearchType.VM)); //$NON-NLS-1$ queryParamsList.add(new SearchParameters("*lin*", SearchType.VM)); //$NON-NLS-1$ frontend.runMultipleQueries(queryTypeList, queryParamsList, mockMultipleQueryCallback, "test"); //$NON-NLS-1$ - verify(mockService).RunMultipleQueries(eq(queryTypeList), + verify(mockService).runMultipleQueries(eq(queryTypeList), eq(queryParamsList), callbackMultipleQueries.capture()); // Call the failure handler. @@ -602,7 +602,7 @@ * </ol> */ @Test - public void testRunMultipleQueries_multiple_success_and_failure() { + public void testrunMultipleQueries_multiple_success_and_failure() { // Don't immediately call process until both queries are in the queue. fakeScheduler.setThreshold(2); ArrayList<VdcQueryType> queryTypeList = new ArrayList<VdcQueryType>(); @@ -612,7 +612,7 @@ queryParamsList.add(new SearchParameters("*win*", SearchType.VM)); //$NON-NLS-1$ queryParamsList.add(new SearchParameters("*lin*", SearchType.VM)); //$NON-NLS-1$ frontend.runMultipleQueries(queryTypeList, queryParamsList, mockMultipleQueryCallback, "test"); //$NON-NLS-1$ - verify(mockService).RunMultipleQueries(eq(queryTypeList), eq(queryParamsList), + verify(mockService).runMultipleQueries(eq(queryTypeList), eq(queryParamsList), callbackMultipleQueries.capture()); // Call the failure handler. List<VdcQueryReturnValue> result = new ArrayList<VdcQueryReturnValue>(); diff --git a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProviderTest.java b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProviderTest.java index b26526b..c247537 100644 --- a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProviderTest.java +++ b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProviderTest.java @@ -94,7 +94,7 @@ }); operationList.add(testOperation); testProvider.transmitOperation(testOperation); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters), actionCallback.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters), actionCallback.capture()); actionCallback.getValue().onSuccess(testResult); } @@ -122,7 +122,7 @@ }); operationList.add(testOperation); testProvider.transmitOperation(testOperation); - verify(mockService).RunAction(eq(VdcActionType.AddDisk), eq(testParameters), actionCallback.capture()); + verify(mockService).runAction(eq(VdcActionType.AddDisk), eq(testParameters), actionCallback.capture()); actionCallback.getValue().onFailure(testException); } @@ -150,7 +150,7 @@ }); operationList.add(testOperation); testProvider.transmitOperation(testOperation); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), queryCallback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), queryCallback.capture()); queryCallback.getValue().onSuccess(testResult); } @@ -178,7 +178,7 @@ }); operationList.add(testOperation); testProvider.transmitOperation(testOperation); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), queryCallback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), queryCallback.capture()); queryCallback.getValue().onFailure(testException); } @@ -242,7 +242,7 @@ VdcActionParametersBase>(VdcActionType.ActivateVds, testParameters, mockOperationCallbackSingle1); testList.add(testOperation1); testProvider.transmitOperationList(testList); - verify(mockService).RunAction(eq(VdcActionType.ActivateVds), eq(testParameters), actionCallback.capture()); + verify(mockService).runAction(eq(VdcActionType.ActivateVds), eq(testParameters), actionCallback.capture()); actionCallback.getValue().onSuccess(testResult); verify(mockOperationCallbackSingle1).onSuccess(testOperation1, testResult); } @@ -255,7 +255,7 @@ VdcActionParametersBase>(VdcActionType.ActivateVds, testParameters, mockOperationCallbackSingle1); testList.add(testOperation1); testProvider.transmitOperationList(testList); - verify(mockService).RunAction(eq(VdcActionType.ActivateVds), eq(testParameters), actionCallback.capture()); + verify(mockService).runAction(eq(VdcActionType.ActivateVds), eq(testParameters), actionCallback.capture()); Exception testException = new Exception("Failure"); //$NON-NLS-1$ actionCallback.getValue().onFailure(testException); verify(mockOperationCallbackSingle1).onFailure(testOperation1, testException); @@ -277,7 +277,7 @@ testList.add(testOperation1); testList.add(testOperation2); testProvider.transmitOperationList(testList); - verify(mockService).RunMultipleActions(eq(VdcActionType.ActivateVds), + verify(mockService).runMultipleActions(eq(VdcActionType.ActivateVds), (ArrayList<VdcActionParametersBase>) eq(testParameterList), eq(false), eq(true), actionCallbackList.capture()); actionCallbackList.getValue().onSuccess((ArrayList<VdcReturnValueBase>) testResultList); @@ -298,7 +298,7 @@ testList.add(testOperation1); testList.add(testOperation2); testProvider.transmitOperationList(testList); - verify(mockService).RunMultipleActions(eq(VdcActionType.ActivateVds), + verify(mockService).runMultipleActions(eq(VdcActionType.ActivateVds), (ArrayList<VdcActionParametersBase>) eq(testParameterList), eq(false), eq(true), actionCallbackList.capture()); Exception testException = new Exception("Failure"); //$NON-NLS-1$ @@ -330,10 +330,10 @@ List<VdcReturnValueBase> testResultList = createActionResultList(testResult, 3); List<VdcReturnValueBase> activateVdsResultList = createActionResultList(testResult, 2); testProvider.transmitOperationList(testList); - verify(mockService).RunMultipleActions(eq(VdcActionType.ActivateVds), + verify(mockService).runMultipleActions(eq(VdcActionType.ActivateVds), (ArrayList<VdcActionParametersBase>) eq(activateVdsParameterList), eq(false), eq(true), actionCallbackList.capture()); - verify(mockService).RunAction(eq(VdcActionType.ActivateStorageDomain), eq(testParameters), + verify(mockService).runAction(eq(VdcActionType.ActivateStorageDomain), eq(testParameters), actionCallback.capture()); actionCallbackList.getValue().onSuccess((ArrayList<VdcReturnValueBase>) testResultList); actionCallback.getValue().onSuccess(testResult); @@ -365,10 +365,10 @@ List<VdcReturnValueBase> testResultList = createActionResultList(testResult, 3); List<VdcReturnValueBase> activateVdsResultList = createActionResultList(testResult, 2); testProvider.transmitOperationList(testList); - verify(mockService).RunMultipleActions(eq(VdcActionType.ActivateVds), + verify(mockService).runMultipleActions(eq(VdcActionType.ActivateVds), (ArrayList<VdcActionParametersBase>) eq(activateVdsParameterList), eq(false), eq(true), actionCallbackList.capture()); - verify(mockService).RunAction(eq(VdcActionType.ActivateStorageDomain), eq(testParameters), + verify(mockService).runAction(eq(VdcActionType.ActivateStorageDomain), eq(testParameters), actionCallback.capture()); actionCallbackList.getValue().onSuccess((ArrayList<VdcReturnValueBase>) testResultList); Exception testException = new Exception("This is an exception"); //$NON-NLS-1$ @@ -386,7 +386,7 @@ mockOperationCallbackSingle1); testList.add(testOperation1); testProvider.transmitOperationList(testList); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), queryCallback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), queryCallback.capture()); VdcQueryReturnValue testResult = new VdcQueryReturnValue(); queryCallback.getValue().onSuccess(testResult); verify(mockOperationCallbackSingle1).onSuccess(testOperation1, testResult); @@ -401,7 +401,7 @@ mockOperationCallbackSingle1); testList.add(testOperation1); testProvider.transmitOperationList(testList); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testParameters), queryCallback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testParameters), queryCallback.capture()); Exception testException = new Exception("This is an exception"); //$NON-NLS-1$ queryCallback.getValue().onFailure(testException); verify(mockOperationCallbackSingle1).onFailure(testOperation1, testException); @@ -430,7 +430,7 @@ List<VdcQueryReturnValue> resultList = createQueryResultList(returnValue, 2); List<VdcQueryReturnValue> return1List = createQueryResultList(returnValue, 1); List<VdcQueryReturnValue> return2List = createQueryResultList(returnValue, 1); - verify(mockService).RunMultipleQueries(eq((ArrayList<VdcQueryType>) testQueryList), + verify(mockService).runMultipleQueries(eq((ArrayList<VdcQueryType>) testQueryList), (ArrayList<VdcQueryParametersBase>) eq(testParameterList), queryCallbackList.capture()); queryCallbackList.getValue().onSuccess((ArrayList<VdcQueryReturnValue>) resultList); verify(mockOperationCallbackList1).onSuccess(eq(operation1List), eq(return1List)); @@ -456,7 +456,7 @@ List<VdcQueryParametersBase> testParameterList = createQueryParameterList(testParameters, 2); List<VdcQueryType> testQueryList = createQueryList(VdcQueryType.Search, 2); testProvider.transmitOperationList(testList); - verify(mockService).RunMultipleQueries(eq((ArrayList<VdcQueryType>) testQueryList), + verify(mockService).runMultipleQueries(eq((ArrayList<VdcQueryType>) testQueryList), (ArrayList<VdcQueryParametersBase>) eq(testParameterList), queryCallbackList.capture()); Exception testException = new Exception("This is an exception"); //$NON-NLS-1$ queryCallbackList.getValue().onFailure(testException); @@ -478,12 +478,12 @@ operationList.add(testOperation1); operationList.add(testOperation2); testProvider.transmitOperationList(operationList); - verify(mockService).RunQuery(eq(VdcQueryType.Search), eq(testQueryParameters), queryCallback.capture()); + verify(mockService).runQuery(eq(VdcQueryType.Search), eq(testQueryParameters), queryCallback.capture()); VdcQueryReturnValue testQueryResult = new VdcQueryReturnValue(); queryCallback.getValue().onSuccess(testQueryResult); verify(mockOperationCallbackSingle1).onSuccess(testOperation1, testQueryResult); VdcReturnValueBase testActionResult = new VdcReturnValueBase(); - verify(mockService).RunAction(eq(VdcActionType.ActivateVds), eq(testActionParameters), + verify(mockService).runAction(eq(VdcActionType.ActivateVds), eq(testActionParameters), actionCallback.capture()); actionCallback.getValue().onSuccess(testActionResult); verify(mockOperationCallbackSingle2).onSuccess(testOperation2, testActionResult); @@ -498,7 +498,7 @@ List<VdcOperation<?, ?>> operationList = new ArrayList<VdcOperation<?, ?>>(); operationList.add(testOperation1); testProvider.transmitOperationList(operationList); - verify(mockService).RunPublicQuery(eq(VdcQueryType.Search), eq(testQueryParameters), queryCallback.capture()); + verify(mockService).runPublicQuery(eq(VdcQueryType.Search), eq(testQueryParameters), queryCallback.capture()); VdcQueryReturnValue testQueryResult = new VdcQueryReturnValue(); queryCallback.getValue().onSuccess(testQueryResult); verify(mockOperationCallbackSingle1).onSuccess(testOperation1, testQueryResult); @@ -517,12 +517,14 @@ operationList.add(testOperation1); operationList.add(testOperation2); testProvider.transmitOperationList(operationList); - verify(mockService).RunPublicQuery(eq(VdcQueryType.Search), eq(testQueryParameters), queryCallback.capture()); + verify(mockService).runPublicQuery(eq(VdcQueryType.Search), eq(testQueryParameters), queryCallback.capture()); VdcQueryReturnValue testQueryResult = new VdcQueryReturnValue(); queryCallback.getValue().onSuccess(testQueryResult); verify(mockOperationCallbackSingle1).onSuccess(testOperation1, testQueryResult); - verify(mockService).RunPublicQuery(eq(VdcQueryType.GetConfigurationValues), eq(testQueryParameters), queryCallback.capture()); + verify(mockService).runPublicQuery(eq(VdcQueryType.GetConfigurationValues), + eq(testQueryParameters), + queryCallback.capture()); testQueryResult = new VdcQueryReturnValue(); queryCallback.getValue().onSuccess(testQueryResult); verify(mockOperationCallbackSingle2).onSuccess(testOperation2, testQueryResult); -- To view, visit http://gerrit.ovirt.org/28323 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8446c08e623285de17ae0cea6292fa293839bfea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
