Repository: incubator-wave Updated Branches: refs/heads/fix/dependendices-2016 314ddcc70 -> 25c755633
fix tests which rely on the older version of mockito (requires changing some matchers and some uses of all()) Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/0294aafa Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/0294aafa Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/0294aafa Branch: refs/heads/fix/dependendices-2016 Commit: 0294aafa02a1f4af5b7d95ac015999eb4cc6c5cb Parents: 314ddcc Author: wisebaldone <[email protected]> Authored: Sat Nov 19 02:52:24 2016 +1000 Committer: wisebaldone <[email protected]> Committed: Sat Nov 19 02:52:24 2016 +1000 ---------------------------------------------------------------------- wave/build.gradle | 11 +++-------- .../src/test/java/com/google/wave/api/BlipRobotTest.java | 2 +- .../box/server/frontend/ClientFrontendImplTest.java | 3 +-- .../box/server/robots/active/ActiveApiServletTest.java | 2 +- .../box/server/robots/dataapi/DataApiServletTest.java | 2 +- .../robots/operations/FetchProfilesServiceTest.java | 2 +- .../box/server/robots/operations/SearchServiceTest.java | 2 +- .../box/server/robots/passive/RobotTest.java | 2 +- .../box/server/rpc/AuthenticationServletTest.java | 2 +- 9 files changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index 1b1971a..ab146b7 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -94,14 +94,8 @@ sourceSets { repositories { mavenCentral() maven { - url 'http://archiva.comunes.org/repository/comunes-snapshots/' - } - maven { url 'https://oauth.googlecode.com/svn/code/maven/' } - maven { - url 'https://oss.sonatype.org/service/local/repositories/snapshots/content/' - } } configurations.compile { resolutionStrategy { @@ -175,10 +169,11 @@ dependencies { ) testCompile( [group: 'junit', name: 'junit', version: '4.12'], // [?, ?] - [group: "org.hamcrest", name: "hamcrest-all", version: "1.3"], // [?, ?] + [group: "org.hamcrest", name: "hamcrest-junit", version: "2.0.0.0"], // [?, ?] + // Todo: change to mockito [group: "org.jmock", name: "jmock-junit3", version: "2.6.0"], // [?, ?] [group: "org.jmock", name: "jmock", version: "2.6.0"], // [?, ?] - [group: "org.mockito", name: "mockito-all", version: "1.9.5"], // [?, ?] + [group: "org.mockito", name: "mockito-core", version: "2.2.21"], // [?, ?] ) } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/src/test/java/com/google/wave/api/BlipRobotTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/com/google/wave/api/BlipRobotTest.java b/wave/src/test/java/com/google/wave/api/BlipRobotTest.java index d8b33f8..1d48b25 100644 --- a/wave/src/test/java/com/google/wave/api/BlipRobotTest.java +++ b/wave/src/test/java/com/google/wave/api/BlipRobotTest.java @@ -458,7 +458,7 @@ public class BlipRobotTest extends TestCase { Blip expectedBlip = new Blip("blip1", Arrays.asList("blip2", "blip3"), "\nhello world!\n another line", Arrays.asList("[email protected]", "[email protected]"), - "[email protected]", 1000l, 123l, null, null, Arrays.asList(new Annotation("key", "val", 2, 3)), + "[email protected]", 1000l, 123l, null, "<some string>", Arrays.asList(new Annotation("key", "val", 2, 3)), elements, new ArrayList<String>(), wavelet); Blip actualBlip = Blip.deserialize(wavelet.getOperationQueue(), wavelet, http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/src/test/java/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java b/wave/src/test/java/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java index 8a3f1d6..54556e8 100644 --- a/wave/src/test/java/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java +++ b/wave/src/test/java/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java @@ -330,8 +330,7 @@ public class ClientFrontendImplTest extends TestCase { private static List<TransformedWaveletDelta> isDeltasStartingAt(final long version) { return argThat(new ArgumentMatcher<List<TransformedWaveletDelta>>() { - @Override - public boolean matches(Object sequence) { + public boolean matches(List<TransformedWaveletDelta> sequence) { if (sequence != null) { DeltaSequence s = (DeltaSequence) sequence; return (s.size() > 0) && (s.getStartVersion() == version); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/src/test/java/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java b/wave/src/test/java/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java index 9c60294..540ed7b 100644 --- a/wave/src/test/java/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java +++ b/wave/src/test/java/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java @@ -119,7 +119,7 @@ public class ActiveApiServletTest extends TestCase { String operationId = "op1"; OperationRequest operation = new OperationRequest("wavelet.create", operationId); List<OperationRequest> operations = Collections.singletonList(operation); - when(robotSerializer.deserializeOperations(anyString())).thenReturn(operations); + when(robotSerializer.deserializeOperations(any())).thenReturn(operations); String responseValue = "response value"; when(robotSerializer.serialize(any(), any(Type.class), any(ProtocolVersion.class))).thenReturn( responseValue); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/src/test/java/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java b/wave/src/test/java/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java index 40e2e63..3bd3e52 100644 --- a/wave/src/test/java/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java +++ b/wave/src/test/java/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java @@ -121,7 +121,7 @@ public class DataApiServletTest extends TestCase { String operationId = "op1"; OperationRequest operation = new OperationRequest("wavelet.create", operationId); List<OperationRequest> operations = Collections.singletonList(operation); - when(robotSerializer.deserializeOperations(anyString())).thenReturn(operations); + when(robotSerializer.deserializeOperations(any())).thenReturn(operations); String responseValue = "response value"; when(robotSerializer.serialize(any(), any(Type.class), any(ProtocolVersion.class))).thenReturn( responseValue); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/src/test/java/org/waveprotocol/box/server/robots/operations/FetchProfilesServiceTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/org/waveprotocol/box/server/robots/operations/FetchProfilesServiceTest.java b/wave/src/test/java/org/waveprotocol/box/server/robots/operations/FetchProfilesServiceTest.java index 6b55728..da6fc93 100644 --- a/wave/src/test/java/org/waveprotocol/box/server/robots/operations/FetchProfilesServiceTest.java +++ b/wave/src/test/java/org/waveprotocol/box/server/robots/operations/FetchProfilesServiceTest.java @@ -19,7 +19,7 @@ package org.waveprotocol.box.server.robots.operations; -import static org.mockito.Matchers.argThat; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/src/test/java/org/waveprotocol/box/server/robots/operations/SearchServiceTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/org/waveprotocol/box/server/robots/operations/SearchServiceTest.java b/wave/src/test/java/org/waveprotocol/box/server/robots/operations/SearchServiceTest.java index 7b2f848..bc5113f 100644 --- a/wave/src/test/java/org/waveprotocol/box/server/robots/operations/SearchServiceTest.java +++ b/wave/src/test/java/org/waveprotocol/box/server/robots/operations/SearchServiceTest.java @@ -19,7 +19,7 @@ package org.waveprotocol.box.server.robots.operations; -import static org.mockito.Matchers.argThat; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/src/test/java/org/waveprotocol/box/server/robots/passive/RobotTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/org/waveprotocol/box/server/robots/passive/RobotTest.java b/wave/src/test/java/org/waveprotocol/box/server/robots/passive/RobotTest.java index d551a3e..c5fa248 100644 --- a/wave/src/test/java/org/waveprotocol/box/server/robots/passive/RobotTest.java +++ b/wave/src/test/java/org/waveprotocol/box/server/robots/passive/RobotTest.java @@ -204,7 +204,7 @@ public class RobotTest extends TestCase { EventMessageBundle messages = new EventMessageBundle(ROBOT_NAME.toEmailAddress(), ""); messages.addEvent(new DocumentChangedEvent(null, null, ALEX.getAddress(), 0L, "b+1234")); when(eventGenerator.generateEvents( - any(WaveletAndDeltas.class), anyMap(), any(EventDataConverter.class))).thenReturn(messages); + any(), anyMap(), any())).thenReturn(messages); OperationRequest op = new OperationRequest("wavelet.fetch", "op1"); List<OperationRequest> ops = Collections.singletonList(op); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0294aafa/wave/src/test/java/org/waveprotocol/box/server/rpc/AuthenticationServletTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/org/waveprotocol/box/server/rpc/AuthenticationServletTest.java b/wave/src/test/java/org/waveprotocol/box/server/rpc/AuthenticationServletTest.java index 89c705e..3b006c2 100644 --- a/wave/src/test/java/org/waveprotocol/box/server/rpc/AuthenticationServletTest.java +++ b/wave/src/test/java/org/waveprotocol/box/server/rpc/AuthenticationServletTest.java @@ -185,7 +185,7 @@ public class AuthenticationServletTest extends TestCase { // Servlet control flow forces us to set these return values first and // verify the logged in user was set afterwards. if (expectSuccess) { - when(manager.getLoggedInUser(Mockito.any(HttpSession.class))).thenReturn(USER); + when(manager.getLoggedInUser(Mockito.any())).thenReturn(USER); when(session.getAttribute("user")).thenReturn(USER); } servlet.doPost(req, resp);
