opendev/gerrit
Code Issues Proposed changes

Merge "Establish library compliance for powermock and its dependencies"

Browse Source
This commit is contained in:
David Pursehouse
2016-09-22 08:08:34 +00:00
committed by Gerrit Code Review
parent ae4a8a0d8f 3ef6bc7f99
commit f84710dff5
5 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.httpd;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.newCapture;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.registration.ReloadableRegistrationHandle;
@@ -145,7 +144,7 @@ public class AllRequestFilterFilterProxyTest {
IMocksControl mockControl = ems.createStrictControl();
FilterChain chain = mockControl.createMock(FilterChain.class);
Capture<FilterChain> capturedChain = newCapture();
Capture<FilterChain> capturedChain = new Capture();
AllRequestFilter filter = mockControl.createMock(AllRequestFilter.class);
filter.init(config);
@@ -210,8 +209,8 @@ public class AllRequestFilterFilterProxyTest {
IMocksControl mockControl = ems.createStrictControl();
FilterChain chain = mockControl.createMock(FilterChain.class);
Capture<FilterChain> capturedChainA = newCapture();
Capture<FilterChain> capturedChainB = newCapture();
Capture<FilterChain> capturedChainA = new Capture();
Capture<FilterChain> capturedChainB = new Capture();
AllRequestFilter filterA = mockControl.createMock(AllRequestFilter.class);
AllRequestFilter filterB = mockControl.createMock(AllRequestFilter.class);
@@ -252,9 +251,9 @@ public class AllRequestFilterFilterProxyTest {
IMocksControl mockControl = ems.createStrictControl();
FilterChain chain = mockControl.createMock("chain", FilterChain.class);
Capture<FilterChain> capturedChainA1 = newCapture();
Capture<FilterChain> capturedChainA2 = newCapture();
Capture<FilterChain> capturedChainB = newCapture();
Capture<FilterChain> capturedChainA1 = new Capture();
Capture<FilterChain> capturedChainA2 = new Capture();
Capture<FilterChain> capturedChainB = new Capture();
AllRequestFilter filterA = mockControl.createMock("filterA", AllRequestFilter.class);
AllRequestFilter filterB = mockControl.createMock("filterB", AllRequestFilter.class);
@@ -308,9 +307,9 @@ public class AllRequestFilterFilterProxyTest {
IMocksControl mockControl = ems.createStrictControl();
FilterChain chain = mockControl.createMock("chain", FilterChain.class);
Capture<FilterChain> capturedChainA1 = newCapture();
Capture<FilterChain> capturedChainB1 = newCapture();
Capture<FilterChain> capturedChainB2 = newCapture();
Capture<FilterChain> capturedChainA1 = new Capture();
Capture<FilterChain> capturedChainB1 = new Capture();
Capture<FilterChain> capturedChainB2 = new Capture();
AllRequestFilter filterA = mockControl.createMock("filterA", AllRequestFilter.class);
AllRequestFilter filterB = mockControl.createMock("filterB", AllRequestFilter.class);