From 331be07fbc404e85319a2f03dcca2b0f98d4fc1d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 21 Sep 2018 12:22:07 +0200 Subject: [PATCH] Fixed wrong merge --- .../async/ExecutorBeanPostProcessorTests.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessorTests.java index a5ba16000..454d8a94e 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessorTests.java @@ -176,28 +176,4 @@ public class ExecutorBeanPostProcessorTests { } } - @Test - public void should_throw_real_exception_when_using_proxy() throws Exception { - // for LazyTraceExecutor - Mockito.when(this.beanFactory.getBean(Tracing.class)) - .thenReturn(Tracing.newBuilder().build()); - Mockito.when(this.beanFactory.getBean(SpanNamer.class)) - .thenReturn(new DefaultSpanNamer()); - - Object o = new ExecutorBeanPostProcessor(this.beanFactory) - .postProcessAfterInitialization(new RejectedExecutionExecutor(), "fooExecutor"); - - then(o).isInstanceOf(RejectedExecutionExecutor.class); - then(ClassUtils.isCglibProxy(o)).isTrue(); - thenThrownBy(() -> ((RejectedExecutionExecutor) o).execute(() -> {})) - .isInstanceOf(RejectedExecutionException.class) - .hasMessage("rejected"); - } - - class RejectedExecutionExecutor implements Executor { - @Override public void execute(Runnable task) { - throw new RejectedExecutionException("rejected"); - } - } - } \ No newline at end of file