Merge pull request Netflix#1007 from mattrjacobs/unit-tests-assert-ev…

…ents-instead-of-metrics

Modify unit tests to assert on event counts and ordering instead of metrics gathered

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

@@ -30,6 +30,8 @@
 import rx.functions.Action1;
 import rx.functions.Func0;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
@@ -171,6 +173,40 @@ protected void assertSaneHystrixRequestLog(final int numCommands) {
         }
     }
 
+    protected void assertCommandExecutionEvents(HystrixInvokableInfo<?> command, HystrixEventType... expectedEventTypes) {
+        boolean emitExpected = false;
+        int expectedEmitCount = 0;
+
+        boolean fallbackEmitExpected = false;
+        int expectedFallbackEmitCount = 0;
+
+        List<HystrixEventType> condensedEmitExpectedEventTypes = new ArrayList<HystrixEventType>();
+
+        for (HystrixEventType expectedEventType: expectedEventTypes) {
+            if (expectedEventType.equals(HystrixEventType.EMIT)) {
+                if (!emitExpected) {
+                    //first EMIT encountered, add it to condensedEmitExpectedEventTypes
+                    condensedEmitExpectedEventTypes.add(HystrixEventType.EMIT);
+                }
+                emitExpected = true;
+                expectedEmitCount++;
+            } else if (expectedEventType.equals(HystrixEventType.FALLBACK_EMIT)) {
+                if (!fallbackEmitExpected) {
+                    //first FALLBACK_EMIT encountered, add it to condensedEmitExpectedEventTypes
+                    condensedEmitExpectedEventTypes.add(HystrixEventType.FALLBACK_EMIT);
+                }
+                fallbackEmitExpected = true;
+                expectedFallbackEmitCount++;
+            } else {
+                condensedEmitExpectedEventTypes.add(expectedEventType);
+            }
+        }
+        List<HystrixEventType> actualEventTypes = command.getExecutionEvents();
+        assertEquals(expectedEmitCount, command.getNumberEmissions());
+        assertEquals(expectedFallbackEmitCount, command.getNumberFallbackEmissions());
+        assertEquals(condensedEmitExpectedEventTypes, actualEventTypes);
+    }
+
     /**
      * Threadpool with 1 thread, queue of size 1
      */

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

@@ -47,6 +47,12 @@ public TestCircuitBreaker() {
             forceShortCircuit = false;
         }
 
+        public TestCircuitBreaker(HystrixCommandKey commandKey) {
+            this.metrics = getMetrics(commandKey, HystrixCommandPropertiesTest.getUnitTestPropertiesSetter());
+            forceShortCircuit = false;
+        }
+
+
         public TestCircuitBreaker setForceShortCircuit(boolean value) {
             this.forceShortCircuit = value;
             return this;
@@ -57,7 +63,7 @@ public boolean isOpen() {
             if (forceShortCircuit) {
                 return true;
             } else {
-                return metrics.getCumulativeCount(HystrixRollingNumberEvent.FAILURE) >= 3;
+                return metrics.getHealthCounts().getErrorCount() >= 3;
             }
         }
 
@@ -497,6 +503,14 @@ private static HystrixCommandMetrics getMetrics(HystrixCommandProperties.Setter
         return new HystrixCommandMetrics(CommandKeyForUnitTest.KEY_ONE, CommandOwnerForUnitTest.OWNER_ONE, ThreadPoolKeyForUnitTest.THREAD_POOL_ONE, HystrixCommandPropertiesTest.asMock(properties), HystrixEventNotifierDefault.getInstance());
     }
 
+
+    /**
+     * Utility method for creating {@link HystrixCommandMetrics} for unit tests.
+     */
+    private static HystrixCommandMetrics getMetrics(HystrixCommandKey commandKey, HystrixCommandProperties.Setter properties) {
+        return new HystrixCommandMetrics(commandKey, CommandOwnerForUnitTest.OWNER_ONE, ThreadPoolKeyForUnitTest.THREAD_POOL_ONE, HystrixCommandPropertiesTest.asMock(properties), HystrixEventNotifierDefault.getInstance());
+    }
+
     /**
      * Utility method for creating {@link HystrixCircuitBreaker} for unit tests.
      */

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

@@ -31,15 +31,14 @@ public enum ThreadPoolKeyForUnitTest implements HystrixThreadPoolKey {
     }
 
     public static class TestCommandBuilder {
-        HystrixCircuitBreakerTest.TestCircuitBreaker _cb = new HystrixCircuitBreakerTest.TestCircuitBreaker();
         HystrixCommandGroupKey owner = CommandGroupForUnitTest.OWNER_ONE;
         HystrixCommandKey dependencyKey = null;
         HystrixThreadPoolKey threadPoolKey = null;
-        HystrixCircuitBreaker circuitBreaker = _cb;
+        HystrixCircuitBreaker circuitBreaker;
         HystrixThreadPool threadPool = null;
         HystrixCommandProperties.Setter commandPropertiesDefaults = HystrixCommandPropertiesTest.getUnitTestPropertiesSetter();
         HystrixThreadPoolProperties.Setter threadPoolPropertiesDefaults = HystrixThreadPoolProperties.Setter.getUnitTestPropertiesBuilder();
-        HystrixCommandMetrics metrics = _cb.metrics;
+        HystrixCommandMetrics metrics;
         AbstractCommand.TryableSemaphore fallbackSemaphore = null;
         AbstractCommand.TryableSemaphore executionSemaphore = null;
         TestableExecutionHook executionHook = new TestableExecutionHook();
@@ -63,8 +62,11 @@ TestCommandBuilder setThreadPoolKey(HystrixThreadPoolKey threadPoolKey) {
             return this;
         }
 
-        TestCommandBuilder setCircuitBreaker(HystrixCircuitBreaker circuitBreaker) {
+        TestCommandBuilder setCircuitBreaker(HystrixCircuitBreakerTest.TestCircuitBreaker circuitBreaker) {
             this.circuitBreaker = circuitBreaker;
+            if (circuitBreaker != null) {
+                this.metrics = circuitBreaker.metrics;
+            }
             return this;
         }
 

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

@@ -43,6 +43,10 @@ static TestCommandBuilder testPropsBuilder() {
         return new TestCommandBuilder(HystrixCommandProperties.ExecutionIsolationStrategy.THREAD);
     }
 
+    static TestCommandBuilder testPropsBuilder(HystrixCircuitBreakerTest.TestCircuitBreaker circuitBreaker) {
+        return new TestCommandBuilder(HystrixCommandProperties.ExecutionIsolationStrategy.THREAD).setCircuitBreaker(circuitBreaker);
+    }
+
     static TestCommandBuilder testPropsBuilder(HystrixCommandProperties.ExecutionIsolationStrategy isolationStrategy) {
         return new TestCommandBuilder(isolationStrategy);
     }

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

@@ -34,7 +34,11 @@ static TestCommandBuilder testPropsBuilder() {
         return new TestCommandBuilder(HystrixCommandProperties.ExecutionIsolationStrategy.SEMAPHORE);
     }
 
-    static TestCommandBuilder testPropsBuilder(HystrixCommandProperties.ExecutionIsolationStrategy isolationStrategy) {
-        return new TestCommandBuilder(isolationStrategy);
+    static TestCommandBuilder testPropsBuilder(HystrixCircuitBreakerTest.TestCircuitBreaker circuitBreaker) {
+        return new TestCommandBuilder(HystrixCommandProperties.ExecutionIsolationStrategy.SEMAPHORE).setCircuitBreaker(circuitBreaker);
+    }
+
+    static TestCommandBuilder testPropsBuilder(HystrixCommandProperties.ExecutionIsolationStrategy isolationStrategy, HystrixCircuitBreakerTest.TestCircuitBreaker circuitBreaker) {
+        return new TestCommandBuilder(isolationStrategy).setCircuitBreaker(circuitBreaker);
     }
 }

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

@@ -89,6 +89,7 @@ public Throwable getFallbackException() {
     private Throwable getException(List<Notification<?>> l) {
         for (Notification<?> n: l) {
             if (n.isOnError()) {
+                n.getThrowable().printStackTrace();
                 return n.getThrowable();
             }
         }