You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/10/04 07:22:54 UTC
[2/2] camel git commit: CAMEL-11845: Remove incorrect Mockito#verfiy
call in DefaultFactoryFinderTest#shouldCreateNewInstancesWithInjector which
caused subsequent DefaultManagementAgentMockTest tests to be flaky
CAMEL-11845: Remove incorrect Mockito#verfiy call in DefaultFactoryFinderTest#shouldCreateNewInstancesWithInjector which caused subsequent DefaultManagementAgentMockTest tests to be flaky
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e8d346c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e8d346c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e8d346c
Branch: refs/heads/master
Commit: 3e8d346c991950fdb9d86b8a9201a1527d1372d8
Parents: dbbdc49
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Tue Oct 3 18:51:53 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Oct 4 09:21:43 2017 +0200
----------------------------------------------------------------------
.../test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java | 3 ---
.../apache/camel/management/DefaultManagementAgentMockTest.java | 2 --
2 files changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3e8d346c/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
index e3fb507..88f67ee 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
@@ -34,7 +34,6 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
public class DefaultFactoryFinderTest {
@@ -128,8 +127,6 @@ public class DefaultFactoryFinderTest {
final List<TestType> instances = factoryFinder.newInstances("TestImplA", injector, TestType.class);
- verify(injector);
-
assertEquals(1, instances.size());
assertThat(instances, hasItem(expected));
http://git-wip-us.apache.org/repos/asf/camel/blob/3e8d346c/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java b/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
index 3af9334..5066a63 100644
--- a/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
@@ -24,7 +24,6 @@ import javax.management.ObjectName;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.ManagementAgent;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -38,7 +37,6 @@ import static org.mockito.Mockito.when;
* {@link MBeanServer#registerMBean(Object, ObjectName)} returns an
* {@link ObjectInstance} with a different ObjectName
*/
-@Ignore("Is flaky with mockito")
public class DefaultManagementAgentMockTest {
@Test