Skip to content

Commit 85a32cb

Browse files
committed
Fixed tests
1 parent 495eaf1 commit 85a32cb

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceCancelCallback.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.scalecube.services.examples;
22

33
import io.scalecube.services.api.ServiceMessage;
4+
import io.scalecube.services.exceptions.BadRequestException;
45
import java.util.List;
56
import reactor.core.publisher.Flux;
67
import reactor.core.publisher.Mono;
@@ -16,6 +17,9 @@ public GreetingServiceCancelCallback(Runnable onCancel) {
1617

1718
@Override
1819
public Mono<String> one(String name) {
20+
if (name == null) {
21+
throw new BadRequestException("Wrong request");
22+
}
1923
return greetingService.one(name).doOnCancel(onCancel);
2024
}
2125

services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.scalecube.services.RequestContext;
44
import io.scalecube.services.api.ServiceMessage;
5+
import io.scalecube.services.exceptions.BadRequestException;
56
import java.time.Duration;
67
import java.util.Collections;
78
import java.util.List;
@@ -14,6 +15,9 @@ public class GreetingServiceImpl implements GreetingService {
1415

1516
@Override
1617
public Mono<String> one(String name) {
18+
if (name == null) {
19+
throw new BadRequestException("Wrong request");
20+
}
1721
return Mono.defer(() -> Mono.just("Echo:" + name));
1822
}
1923

services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void shouldReturnErrorDataWhenRequestDataIsEmpty() {
181181
.verifyErrorSatisfies(
182182
ex -> {
183183
assertInstanceOf(BadRequestException.class, ex);
184-
assertThat(ex.getMessage(), startsWith("Wrong request data type"));
184+
assertThat(ex.getMessage(), startsWith("Wrong request"));
185185
});
186186
}
187187

services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void shouldReturnErrorDataWhenRequestDataIsEmpty() {
161161
.verifyErrorSatisfies(
162162
ex -> {
163163
assertInstanceOf(BadRequestException.class, ex);
164-
assertThat(ex.getMessage(), startsWith("Wrong request data type"));
164+
assertThat(ex.getMessage(), startsWith("Wrong request"));
165165
});
166166
}
167167

0 commit comments

Comments
 (0)