Skip to content

Commit

Permalink
Merge pull request #11 from streamingpool/dependency-update
Browse files Browse the repository at this point in the history
Dependency update
  • Loading branch information
jcgarnier authored Jan 17, 2019
2 parents f04b7db + a86f090 commit d4a71dc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ dependencies {
compile 'org.reactivestreams:reactive-streams:1.0.0'
compile 'io.reactivex.rxjava2:rxjava:2.1.16'

compile 'org.springframework:spring-core:4.3.13.RELEASE'
compile 'org.springframework:spring-context:4.3.13.RELEASE'
compile 'org.springframework:spring-test:4.3.13.RELEASE' // Testing utils in /src/java for the moment
compile 'org.springframework:spring-core:5.1.2.RELEASE'
compile 'org.springframework:spring-context:5.1.2.RELEASE'
compile 'org.springframework:spring-test:5.1.2.RELEASE' // Testing utils in /src/java for the moment

compile 'org.slf4j:slf4j-api:1.7.25'

compile 'com.google.guava:guava:22.0'
compile 'com.google.guava:guava:27.0.1-jre'

compile 'junit:junit:4.12' // Testing utils in /src/java for the moment
compile 'org.mockito:mockito-core:1.10.19' // Testing utils in /src/java for the moment
compile 'org.mockito:mockito-core:2.23.+' // Testing utils in /src/java for the moment
testCompile 'org.assertj:assertj-core:3.8.+'
testCompile 'pl.pragmatists:JUnitParams:1.1.0'
testCompile 'com.openpojo:openpojo:0.8.10'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public StreamFactoryMock<T> withIdInvoke(StreamId<T> id,
public StreamFactory build() {
final StreamFactory factoryMock = mock(StreamFactory.class);
when(factoryMock.create(any(), any())).thenAnswer(args -> {
StreamId<T> streamId = args.getArgumentAt(0, StreamId.class);
DiscoveryService discovery = args.getArgumentAt(1, DiscoveryService.class);
StreamId<T> streamId = args.getArgument(0);
DiscoveryService discovery = args.getArgument(1);

if (withIdDiscover.containsKey(streamId)) {
return ErrorStreamPair.ofData(Flowable.merge(
Expand Down

0 comments on commit d4a71dc

Please sign in to comment.