iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes after review

This commit is contained in:
Alex Theedom 2016-08-09 23:58:55 +01:00
parent f2f2b48782
commit fa68a02d60
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hystrix/pom.xml
View File

@ -21,7 +21,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<!-- Hystrix --> <!-- Hystrix -->
<hystrix-core.version>1.4.10</hystrix-core.version> <hystrix-core.version>1.5.4</hystrix-core.version>
<rxjava-core.version>0.20.7</rxjava-core.version> <rxjava-core.version>0.20.7</rxjava-core.version>
<!-- Testing --> <!-- Testing -->

11
hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java
View File

@ -1,16 +1,15 @@
package com.baeldung.hystrix; package com.baeldung.hystrix;
import com.netflix.hystrix.*; import com.netflix.hystrix.HystrixCommand;
import com.netflix.hystrix.collapser.RequestCollapserFactory; import com.netflix.hystrix.HystrixCommandGroupKey;
import com.netflix.hystrix.HystrixCommandProperties;
import com.netflix.hystrix.HystrixThreadPoolProperties;
import com.netflix.hystrix.exception.HystrixRuntimeException; import com.netflix.hystrix.exception.HystrixRuntimeException;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import java.util.concurrent.ExecutionException;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
@ -48,7 +47,7 @@ public class HystrixTimeoutTest {
} }
@Test @Test
public void givenServiceTimeoutEqualTo5000_andExecutionTimeoutEqualTo10000_thenReturnSuccess() public void givenServiceTimeoutEqualTo500_andExecutionTimeoutEqualTo10000_thenReturnSuccess()
throws InterruptedException { throws InterruptedException {
commandProperties.withExecutionTimeoutInMilliseconds(10_000); commandProperties.withExecutionTimeoutInMilliseconds(10_000);
config.andCommandPropertiesDefaults(commandProperties); config.andCommandPropertiesDefaults(commandProperties);