diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java index 450a707f8..cc13cd5c7 100644 --- a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java +++ b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java @@ -90,6 +90,10 @@ public static Collection getInstances() { return Collections.unmodifiableCollection(metrics.values()); } + public static void resetAll() { + metrics.clear(); + } + private final HystrixThreadPoolKey threadPoolKey; private final HystrixRollingNumber counter; private final ThreadPoolExecutor threadPool; diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java new file mode 100644 index 000000000..18f088839 --- /dev/null +++ b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java @@ -0,0 +1,69 @@ +package com.netflix.hystrix; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.util.Collection; + +import static org.junit.Assert.assertEquals; + +/** + * Copyright 2013 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class HystrixThreadPoolMetricsTest { + + @Before + public void resetAll() { + HystrixThreadPoolMetrics.resetAll(); + } + + @Test + public void shouldYieldNoExecutedTasksOnStartup() throws Exception { + //given + final Collection instances = HystrixThreadPoolMetrics.getInstances(); + + //then + assertEquals(0, instances.size()); + + } + @Test + public void shouldReturnOneExecutedTask() throws Exception { + //given + final Collection instances = HystrixThreadPoolMetrics.getInstances(); + + //when + new NoOpHystrixCommand().execute(); + + //then + assertEquals(1, instances.size()); + assertEquals(1, instances.iterator().next().getRollingCountThreadsExecuted()); + } + + private static class NoOpHystrixCommand extends HystrixCommand { + public NoOpHystrixCommand() { + super( + Setter.withGroupKey( + HystrixCommandGroupKey.Factory.asKey("HystrixThreadPoolMetrics-UnitTest"))); + } + + @Override + protected Void run() throws Exception { + return null; + } + } + + +} \ No newline at end of file