Skip to content

Commit

Permalink
Fixed unit tests in HystrixObservableCommandTest
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Jacobs committed Jan 7, 2015
1 parent 595639b commit b5adfab
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4285,7 +4285,7 @@ public void testExecutionFailureWithFallbackImplementedButDisabled() {
/**
* Test that we can still use thread isolation if desired.
*/
@Test(timeout = 500)
@Test
public void testSynchronousExecutionTimeoutValueViaExecute() {
HystrixObservableCommand.Setter properties = HystrixObservableCommand.Setter
.withGroupKey(HystrixCommandGroupKey.Factory.asKey("TestKey"))
Expand All @@ -4298,6 +4298,7 @@ public void testSynchronousExecutionTimeoutValueViaExecute() {
HystrixObservableCommand<String> command = new HystrixObservableCommand<String>(properties) {
@Override
protected Observable<String> construct() {

return Observable.create(new OnSubscribe<String>() {

@Override
Expand Down Expand Up @@ -4336,7 +4337,7 @@ protected Observable<String> resumeWithFallback() {
assertEquals(1, HystrixRequestLog.getCurrentRequest().getAllExecutedCommands().size());
}

@Test(timeout = 500)
@Test
public void testSynchronousExecutionUsingThreadIsolationTimeoutValueViaObserve() {
HystrixObservableCommand.Setter properties = HystrixObservableCommand.Setter
.withGroupKey(HystrixCommandGroupKey.Factory.asKey("TestKey"))
Expand Down Expand Up @@ -4383,7 +4384,7 @@ protected Observable<String> resumeWithFallback() {
assertEquals(1, HystrixRequestLog.getCurrentRequest().getAllExecutedCommands().size());
}

@Test(timeout = 500)
@Test
public void testAsyncExecutionTimeoutValueViaObserve() {
HystrixObservableCommand.Setter properties = HystrixObservableCommand.Setter
.withGroupKey(HystrixCommandGroupKey.Factory.asKey("TestKey"))
Expand Down

0 comments on commit b5adfab

Please sign in to comment.