Skip to content

Commit

Permalink
Merge pull request #546 from rsocket/0.11.9-plus-stream-fix
Browse files Browse the repository at this point in the history
0.11.9 plus stream fix
  • Loading branch information
kbahr authored Nov 2, 2018
2 parents 94d2e48 + ff64e43 commit 406eb96
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ plugins {
subprojects {
apply plugin: 'io.spring.dependency-management'

ext['reactor-bom.version'] = 'Californium-BUILD-SNAPSHOT'
ext['reactor-bom.version'] = 'Californium-SR1'
ext['logback.version'] = '1.2.3'
ext['findbugs.version'] = '3.0.2'
ext['netty.version'] = '4.1.29.Final'
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
version=0.11.12.BUILD-SNAPSHOT

version=0.11.12.BUILD-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

import io.rsocket.RSocketClientTest.ClientSocketRule;
import io.rsocket.util.EmptyPayload;
import java.nio.channels.ClosedChannelException;
import java.time.Duration;
import java.util.Arrays;
import java.util.function.Function;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -15,10 +11,17 @@
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;


import java.nio.channels.ClosedChannelException;
import java.time.Duration;
import java.util.Arrays;
import java.util.function.Function;

@RunWith(Parameterized.class)
public class RSocketClientTerminationTest {

@Rule public final ClientSocketRule rule = new ClientSocketRule();
@Rule
public final ClientSocketRule rule = new ClientSocketRule();
private Function<RSocket, ? extends Publisher<?>> interaction;

public RSocketClientTerminationTest(Function<RSocket, ? extends Publisher<?>> interaction) {
Expand All @@ -29,7 +32,9 @@ public RSocketClientTerminationTest(Function<RSocket, ? extends Publisher<?>> in
public void testCurrentStreamIsTerminatedOnConnectionClose() {
RSocketClient rSocket = rule.socket;

Mono.delay(Duration.ofSeconds(1)).doOnNext(v -> rule.connection.dispose()).subscribe();
Mono.delay(Duration.ofSeconds(1))
.doOnNext(v -> rule.connection.dispose())
.subscribe();

StepVerifier.create(interaction.apply(rSocket))
.expectError(ClosedChannelException.class)
Expand Down

0 comments on commit 406eb96

Please sign in to comment.