Merge pull request #1055 from mattrjacobs/deflake-pool-filling-tests

Made HystrixCommandTest.testRejectedThreadWithFallback more deterministic

Author: mattrjacobs

hystrix-core/src/test/java/com/netflix/hystrix/AbstractTestHystrixCommand.java

@@ -19,21 +19,21 @@
 
 public interface AbstractTestHystrixCommand<R> extends HystrixObservable<R>, InspectableBuilder {
 
-    public static enum ExecutionResult {
+    enum ExecutionResult {
         SUCCESS, FAILURE, ASYNC_FAILURE, HYSTRIX_FAILURE, ASYNC_HYSTRIX_FAILURE, RECOVERABLE_ERROR, ASYNC_RECOVERABLE_ERROR, UNRECOVERABLE_ERROR, ASYNC_UNRECOVERABLE_ERROR, BAD_REQUEST, ASYNC_BAD_REQUEST, MULTIPLE_EMITS_THEN_SUCCESS, MULTIPLE_EMITS_THEN_FAILURE, NO_EMITS_THEN_SUCCESS
     }
 
-    public static enum FallbackResult {
+    enum FallbackResult {
         UNIMPLEMENTED, SUCCESS, FAILURE, ASYNC_FAILURE, MULTIPLE_EMITS_THEN_SUCCESS, MULTIPLE_EMITS_THEN_FAILURE, NO_EMITS_THEN_SUCCESS
     }
 
-    public static enum CacheEnabled {
+    enum CacheEnabled {
         YES, NO
     }
 
-    static HystrixPropertiesStrategy TEST_PROPERTIES_FACTORY = new TestPropertiesFactory();
+    HystrixPropertiesStrategy TEST_PROPERTIES_FACTORY = new TestPropertiesFactory();
 
-    static class TestPropertiesFactory extends HystrixPropertiesStrategy {
+    class TestPropertiesFactory extends HystrixPropertiesStrategy {
 
         @Override
         public HystrixCommandProperties getCommandProperties(HystrixCommandKey commandKey, HystrixCommandProperties.Setter builder) {
@@ -72,5 +72,4 @@ public String getCollapserPropertiesCacheKey(HystrixCollapserKey collapserKey, c
         }
 
     }
-
 }

hystrix-core/src/test/java/com/netflix/hystrix/CommonHystrixCommandTests.java

@@ -46,7 +46,7 @@
  * Place to share code and tests between {@link HystrixCommandTest} and {@link HystrixObservableCommandTest}.
  * @param <C>
  */
-public abstract class CommonHystrixCommandTests<C extends AbstractTestHystrixCommand<?>> {
+public abstract class CommonHystrixCommandTests<C extends AbstractTestHystrixCommand<Integer>> {
 
     /**
      * Run the command in multiple modes and check that the hook assertions hold in each and that the command succeeds
@@ -116,9 +116,9 @@ protected void assertNonBlockingObserve(C command, Action1<C> assertion, boolean
         System.out.println("Running command.observe(), awaiting terminal state of Observable, then running assertions...");
         final CountDownLatch latch = new CountDownLatch(1);
 
-        Observable<?> o = command.observe();
+        Observable<Integer> o = command.observe();
 
-        o.subscribe(new Subscriber<Object>() {
+        o.subscribe(new Subscriber<Integer>() {
             @Override
             public void onCompleted() {
                 latch.countDown();
@@ -130,7 +130,7 @@ public void onError(Throwable e) {
             }
 
             @Override
-            public void onNext(Object t) {
+            public void onNext(Integer i) {
                 //do nothing
             }
         });