[Engine-patches] Change in ovirt-engine[ovirt-engine-3.5]: webadmin: fix broken unit tests

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: webadmin: fix broken unit tests
......................................................................

webadmin: fix broken unit tests

- Fixed broken unit tests caused by the clean token
  on error patch (b9143f69efd4da2c48c9cfcd3a07b6fbdf736f08).

Change-Id: Idb993b8b5f96e1ea99dd91982dd87921d94b445b
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
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
2 files changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/29969/1

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 f1bfb72..5b9f2ed 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
@@ -94,6 +94,8 @@
     INewAsyncCallback mockAsyncCallback;
     @Mock
     EventBus mockEventBus;
+    @Mock
+    XsrfRpcRequestBuilder mockXsrfRpcRequestBuilder;
     @Captor
     ArgumentCaptor<AsyncCallback<ArrayList<VdcReturnValueBase>>> 
callbackMultipleActions;
     @Captor
@@ -109,10 +111,9 @@
     public void setUp() throws Exception {
         mockService = mock(GenericApiGWTServiceAsync.class, 
withSettings().extraInterfaces(ServiceDefTarget.class));
         fakeScheduler = new FakeGWTScheduler();
-        XsrfRpcRequestBuilder mockXsrfRpcRequestBuilder = new 
XsrfRpcRequestBuilder();
         CommunicationProvider communicationsProvider = new 
GWTRPCCommunicationProvider(mockService, mockXsrfService,
                 mockXsrfRpcRequestBuilder);
-        mockXsrfRpcRequestBuilder.setXsrfToken(new XsrfToken("Something")); 
//$NON-NLS-1$
+        when(mockXsrfRpcRequestBuilder.getXsrfToken()).thenReturn(new 
XsrfToken("Something")); //$NON-NLS-1$
         OperationProcessor operationProcessor = new 
OperationProcessor(communicationsProvider);
         operationProcessor.setScheduler(fakeScheduler);
         VdcOperationManager operationsManager = new 
VdcOperationManager(operationProcessor);
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 e8051d6..189c228 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
@@ -93,6 +93,8 @@
     IAsyncConverter<Object> mockConverter;
     @Mock
     EventBus mockEventBus;
+    @Mock
+    XsrfRpcRequestBuilder mockXsrfRpcRequestBuilder;
     @Captor
     ArgumentCaptor<AsyncCallback<VdcQueryReturnValue>> callback;
     @Captor
@@ -102,10 +104,9 @@
     public void setUp() throws Exception {
         mockService = mock(GenericApiGWTServiceAsync.class, 
withSettings().extraInterfaces(ServiceDefTarget.class));
         fakeScheduler = new FakeGWTScheduler();
-        XsrfRpcRequestBuilder mockXsrfRpcRequestBuilder = new 
XsrfRpcRequestBuilder();
         CommunicationProvider communicationsProvider = new 
GWTRPCCommunicationProvider(mockService, mockXsrfService,
                 mockXsrfRpcRequestBuilder);
-        mockXsrfRpcRequestBuilder.setXsrfToken(new XsrfToken("Something")); 
//$NON-NLS-1$
+        when(mockXsrfRpcRequestBuilder.getXsrfToken()).thenReturn(new 
XsrfToken("Something")); //$NON-NLS-1$
         OperationProcessor operationProcessor = new 
OperationProcessor(communicationsProvider);
         operationProcessor.setScheduler(fakeScheduler);
         VdcOperationManager operationsManager = new 
VdcOperationManager(operationProcessor);


-- 
To view, visit http://gerrit.ovirt.org/29969
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb993b8b5f96e1ea99dd91982dd87921d94b445b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches