From 22b61227083dc01c7eb759fc31c2c6946726db3b Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 27 Jul 2018 17:50:25 +0200 Subject: [PATCH] Build with Mockito 2.1 This adjusts to Mockito changes, including most tests. Change-Id: I75bea532168c68a4a468f2b41a458d40429ccbe8 Signed-off-by: Stephen Kitt --- .../yangtools/concepts/CheckedValueTest.java | 2 +- .../ArgumentsExtractorVerifier.java | 10 ++++++-- .../ArgumentsExtractorVerifierTest.java | 2 +- .../mockito/ThrowsMethodExceptionAnswer.java | 4 +--- .../mockito/UnstubbedMethodException.java | 2 +- .../tests/MockitoExampleTutorialTest.java | 10 +++----- .../data/api/schema/NormalizedNodesTest.java | 2 +- .../stream/NormalizedNodeWriterTest.java | 2 +- .../tree/DataTreeCandidateNodesTest.java | 23 ++++++++++--------- .../schema/tree/DataTreeCandidatesTest.java | 11 +++++---- ...rmalizedNodeDataTreeCandidateNodeTest.java | 2 +- .../yang/data/codec/gson/Bug8083Test.java | 2 +- .../plugin/GenerateSourcesTest.java | 2 +- .../yang2sources/plugin/UtilTest.java | 6 ++--- .../plugin/YangToSourcesMojoTest.java | 2 +- .../plugin/YangToSourcesProcessorTest.java | 4 ++-- .../util/FilesystemSchemaSourceCacheTest.java | 2 +- .../util/InMemorySchemaSourceCacheTest.java | 4 ++-- .../repo/util/RefcountedRegistrationTest.java | 2 +- .../util/SchemaSourceTransformerTest.java | 2 +- .../yang/model/util/BitsTypeTest.java | 2 +- .../yang/model/util/DataNodeIteratorTest.java | 4 +--- .../model/util/ModuleDependencySortTest.java | 10 +------- .../model/util/SchemaContextProxyTest.java | 2 +- .../model/util/SchemaContextUtilTest.java | 2 +- .../rfc7950/repo/SchemaContextUtilTest.java | 2 +- 26 files changed, 55 insertions(+), 63 deletions(-) diff --git a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java index 382c8cb321..48ae0dab55 100644 --- a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java +++ b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java index ffc4a5d486..af15537645 100644 --- a/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java +++ b/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java @@ -10,6 +10,7 @@ package org.mockito.configuration; import java.util.List; import org.mockito.exceptions.base.MockitoException; import org.mockito.internal.invocation.InvocationsFinder; +import org.mockito.internal.verification.VerificationModeFactory; import org.mockito.internal.verification.api.VerificationData; import org.mockito.invocation.Invocation; import org.mockito.verification.VerificationMode; @@ -22,8 +23,8 @@ public class ArgumentsExtractorVerifier implements VerificationMode { @Override public void verify(final VerificationData data) { - InvocationsFinder finder = new InvocationsFinder(); - List actualInvocations = finder.findInvocations(data.getAllInvocations(), data.getWanted()); + List actualInvocations = + InvocationsFinder.findInvocations(data.getAllInvocations(), data.getWanted()); if (actualInvocations.size() != 1) { throw new MockitoException("This verifier can only be used with 1 invocation, got " + actualInvocations.size()); @@ -34,6 +35,11 @@ public class ArgumentsExtractorVerifier implements VerificationMode { } + @Override + public VerificationMode description(String description) { + return VerificationModeFactory.description(this, description); + } + public Object[] getArguments() { return arguments; } diff --git a/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java index bb1d7430a2..6a88e902d2 100644 --- a/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java +++ b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java @@ -8,7 +8,7 @@ package org.mockito.configuration; import static org.junit.Assert.assertArrayEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/ThrowsMethodExceptionAnswer.java b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/ThrowsMethodExceptionAnswer.java index f8fbdcdafd..271d5a0ed9 100644 --- a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/ThrowsMethodExceptionAnswer.java +++ b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/ThrowsMethodExceptionAnswer.java @@ -11,7 +11,6 @@ import com.google.common.annotations.Beta; import java.io.Serializable; import org.mockito.Mockito; import org.mockito.internal.stubbing.answers.ThrowsException; -import org.mockito.internal.stubbing.answers.ThrowsExceptionClass; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -31,7 +30,6 @@ import org.mockito.stubbing.Answer; * @see Mockito#mock(Class, Answer) * * @see ThrowsException - * @see ThrowsExceptionClass * * @author Michael Vorburger */ @@ -45,7 +43,7 @@ public final class ThrowsMethodExceptionAnswer implements Answer, Serial } @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { throw new UnstubbedMethodException(invocation.getMethod()); } diff --git a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/UnstubbedMethodException.java b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/UnstubbedMethodException.java index f20b079e12..f4f6b64d05 100644 --- a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/UnstubbedMethodException.java +++ b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/UnstubbedMethodException.java @@ -24,6 +24,6 @@ public class UnstubbedMethodException extends UnsupportedOperationException { public UnstubbedMethodException(final Method method, final Object mockAbstractFakeObject) { super(MethodExtensions.toString(method) + " is not implemented in " - + new MockUtil().getMockName(mockAbstractFakeObject).toString()); + + MockUtil.getMockName(mockAbstractFakeObject).toString()); } } diff --git a/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java b/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java index f8c78be12b..aad4655bcf 100644 --- a/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java +++ b/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.testutils.mockito.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -60,9 +60,7 @@ public class MockitoExampleTutorialTest { public void usingMockitoToStubComplexCase() { SomeService service = mock(SomeService.class); when(service.foobar(any())).thenAnswer(invocation -> { - // Urgh! This is ugly.. (Mockito 2.0 may be better, - // see http://site.mockito.org/mockito/docs/current/org/mockito/ArgumentMatcher.html) - File file = invocation.getArgumentAt(0, File.class); + File file = invocation.getArgument(0); return "hello.txt".equals(file.getName()) ? 123 : 0; }); assertEquals(0, service.foobar(new File("belo.txt"))); @@ -92,9 +90,7 @@ public class MockitoExampleTutorialTest { public void usingMockitoToStubComplexCaseAndExceptionIfNotStubbed() { SomeService service = mock(SomeService.class, exception()); doAnswer(invocation -> { - // Urgh! This is ugly. Mockito may be better, - // see http://site.mockito.org/mockito/docs/current/org/mockito/ArgumentMatcher.html - File file = (File) invocation.getArguments()[0]; + File file = invocation.getArgument(0); return "hello.txt".equals(file.getName()) ? 123 : 0; }).when(service).foobar(any()); assertEquals(123, service.foobar(new File("hello.txt"))); diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodesTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodesTest.java index d673558b74..52e2b22cb3 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodesTest.java +++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodesTest.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.data.api.schema; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriterTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriterTest.java index 5248c3daff..ee1fd52393 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriterTest.java +++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriterTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodesTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodesTest.java index d7a3a4fbf2..6123c2d19c 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodesTest.java +++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodesTest.java @@ -11,7 +11,8 @@ package org.opendaylight.yangtools.yang.data.api.schema.tree; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -45,7 +46,7 @@ public class DataTreeCandidateNodesTest { final NormalizedNode mockedNormalizedNode = mock(NormalizedNode.class); doReturn(Optional.of(mockedNormalizedNode)).when(mockedDataTreeCandidateNode).getDataAfter(); DataTreeCandidateNodes.applyToCursor(mockedCursor, mockedDataTreeCandidateNode); - verify(mockedCursor, times(1)).write(any(PathArgument.class), any(NormalizedNode.class)); + verify(mockedCursor, times(1)).write(isNull(), any(NormalizedNode.class)); } @Test @@ -55,7 +56,7 @@ public class DataTreeCandidateNodesTest { doReturn(ModificationType.DELETE).when(mockedDataTreeCandidateNode).getModificationType(); DataTreeCandidateNodes.applyToCursor(mockedCursor, mockedDataTreeCandidateNode); - verify(mockedCursor, times(1)).delete(any(PathArgument.class)); + verify(mockedCursor, times(1)).delete(isNull()); } @Test @@ -84,9 +85,9 @@ public class DataTreeCandidateNodesTest { doReturn(childNodes).when(mockedDataTreeCandidateNode).getChildNodes(); DataTreeCandidateNodes.applyToCursor(mockedCursor, mockedDataTreeCandidateNode); - verify(mockedCursor, times(2)).enter(any(PathArgument.class)); - verify(mockedCursor, times(2)).delete(any(PathArgument.class)); - verify(mockedCursor, times(1)).write(any(PathArgument.class), any(NormalizedNode.class)); + verify(mockedCursor, times(2)).enter((PathArgument) isNull()); + verify(mockedCursor, times(2)).delete(isNull()); + verify(mockedCursor, times(1)).write(isNull(), any(NormalizedNode.class)); } @Test @@ -113,7 +114,7 @@ public class DataTreeCandidateNodesTest { final NormalizedNode mockedNormalizedNode = mock(NormalizedNode.class); doReturn(Optional.of(mockedNormalizedNode)).when(mockedDataTreeCandidateNode).getDataAfter(); DataTreeCandidateNodes.applyRootedNodeToCursor(mockedCursor, mockedRootPath, mockedDataTreeCandidateNode); - verify(mockedCursor, times(1)).write(any(PathArgument.class), any(NormalizedNode.class)); + verify(mockedCursor, times(1)).write(isNull(), any(NormalizedNode.class)); } @Test @@ -124,7 +125,7 @@ public class DataTreeCandidateNodesTest { doReturn(ModificationType.DELETE).when(mockedDataTreeCandidateNode).getModificationType(); DataTreeCandidateNodes.applyRootedNodeToCursor(mockedCursor, mockedRootPath, mockedDataTreeCandidateNode); - verify(mockedCursor, times(1)).delete(any(PathArgument.class)); + verify(mockedCursor, times(1)).delete(isNull()); } @Test @@ -140,8 +141,8 @@ public class DataTreeCandidateNodesTest { doReturn(Collections.singletonList(mockedChildNode1)).when(mockedDataTreeCandidateNode).getChildNodes(); DataTreeCandidateNodes.applyRootedNodeToCursor(mockedCursor, mockedRootPath, mockedDataTreeCandidateNode); - verify(mockedCursor, times(1)).enter(any(PathArgument.class)); - verify(mockedCursor, times(1)).delete(any(PathArgument.class)); + verify(mockedCursor, times(1)).enter((PathArgument) isNull()); + verify(mockedCursor, times(1)).delete(isNull()); } @Test @@ -171,7 +172,7 @@ public class DataTreeCandidateNodesTest { doReturn(Collections.singletonList(mockedChildNode1)).when(mockedDataTreeCandidateNode).getChildNodes(); DataTreeCandidateNodes.applyRootToCursor(mockedCursor, mockedDataTreeCandidateNode); - verify(mockedCursor, times(1)).delete(any(PathArgument.class)); + verify(mockedCursor, times(1)).delete(isNull()); } @Test diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidatesTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidatesTest.java index e1874e390e..c5944c2066 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidatesTest.java +++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidatesTest.java @@ -12,7 +12,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -66,7 +67,7 @@ public class DataTreeCandidatesTest { doReturn(ModificationType.DELETE).when(mockedDataTreeCandidateNode).getModificationType(); doReturn(mockedDataTreeCandidateNode).when(mockedDataTreeCandidate).getRootNode(); DataTreeCandidates.applyToCursor(mockedCursor, mockedDataTreeCandidate); - verify(mockedCursor, times(1)).delete(any(PathArgument.class)); + verify(mockedCursor, times(1)).delete(isNull()); } @Test @@ -77,15 +78,15 @@ public class DataTreeCandidatesTest { final YangInstanceIdentifier mockedRootPath = mock(YangInstanceIdentifier.class); doReturn(mockedRootPath).when(mockedDataTreeCandidate).getRootPath(); final DataTreeModificationCursor mockedCursor = mock(DataTreeModificationCursor.class); - doReturn(Optional.of(mockedCursor)).when(mockedModification).openCursor(any(YangInstanceIdentifier.class)); + doReturn(Optional.of(mockedCursor)).when(mockedModification).openCursor(isNull()); final DataTreeCandidateNode mockedDataTreeCandidateNode = mock(DataTreeCandidateNode.class); doReturn(mockedDataTreeCandidateNode).when(mockedDataTreeCandidate).getRootNode(); doReturn(ModificationType.DELETE).when(mockedDataTreeCandidateNode).getModificationType(); DataTreeCandidates.applyToModification(mockedModification, mockedDataTreeCandidate); - verify(mockedModification, times(1)).openCursor(any(YangInstanceIdentifier.class)); - verify(mockedCursor, times(1)).delete(any(PathArgument.class)); + verify(mockedModification, times(1)).openCursor(isNull()); + verify(mockedCursor, times(1)).delete(isNull()); doReturn(Boolean.TRUE).when(mockedRootPath).isEmpty(); try { diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNodeTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNodeTest.java index 8741b5311d..4ddaa57a70 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNodeTest.java +++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNodeTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug8083Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug8083Test.java index b5db7b97ad..5f12e74833 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug8083Test.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug8083Test.java @@ -11,7 +11,7 @@ package org.opendaylight.yangtools.yang.data.codec.gson; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java index 9aa31ded9f..9e01fb824e 100644 --- a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java +++ b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java index 52c189cb8b..68e9c89654 100644 --- a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java +++ b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java @@ -9,8 +9,8 @@ package org.opendaylight.yangtools.yang2sources.plugin; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -30,7 +30,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.repository.RepositorySystem; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java index 041b24198b..cf70f75066 100644 --- a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java +++ b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang2sources.plugin.ConfigArg.CodeGeneratorArg; import org.opendaylight.yangtools.yang2sources.plugin.GenerateSourcesTest.GeneratorMock; diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java index a3ca3f0c05..2250ed4ddd 100644 --- a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java +++ b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java @@ -16,11 +16,11 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang2sources.plugin.ConfigArg.CodeGeneratorArg; import org.opendaylight.yangtools.yang2sources.plugin.GenerateSourcesTest.GeneratorMock; -@RunWith(MockitoJUnitRunner.class) +@RunWith(MockitoJUnitRunner.Silent.class) public class YangToSourcesProcessorTest { private final File buildContext = Mockito.mock(File.class); diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java index 06fc1150f0..13b5c27ccb 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java @@ -14,7 +14,7 @@ import static org.hamcrest.CoreMatchers.either; import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java index 6f86695ebe..e615aa88c3 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.yangtools.yang.model.repo.util; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation; diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/RefcountedRegistrationTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/RefcountedRegistrationTest.java index 3bd3a7b45f..df0de0ca49 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/RefcountedRegistrationTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/RefcountedRegistrationTest.java @@ -17,7 +17,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistration; @RunWith(MockitoJUnitRunner.class) diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java index 51b8f91978..adb7b5b532 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java @@ -17,7 +17,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactoryConfiguration; diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java index 66f41f838d..e3c139b06f 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java @@ -18,7 +18,7 @@ import java.util.Optional; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java index bab599b3ee..a53ee589b0 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java @@ -22,7 +22,7 @@ import java.util.SortedMap; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; @@ -55,9 +55,7 @@ public class DataNodeIteratorTest { } private static T mockOperationDefinition(final T mock) { - doReturn(Collections.emptySet()).when(mock).getGroupings(); doReturn(Collections.emptySet()).when(mock).getTypeDefinitions(); - doReturn(mockDataNodeContainer(ContainerSchemaNode.class)).when(mock).getInput(); doReturn(mockDataNodeContainer(ContainerSchemaNode.class)).when(mock).getOutput(); return mock; } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySortTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySortTest.java index c95bb141a8..b8b4f602ce 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySortTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySortTest.java @@ -19,7 +19,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.model.api.Module; @@ -45,10 +45,8 @@ public class ModuleDependencySortTest { @Before public void before() { doReturn("foo").when(fooNoRev).getName(); - doReturn(FOO_MODULE).when(fooNoRev).getQNameModule(); doReturn(FOO_MODULE.getNamespace()).when(fooNoRev).getNamespace(); doReturn(FOO_MODULE.getRevision()).when(fooNoRev).getRevision(); - doReturn(YangVersion.VERSION_1).when(fooNoRev).getYangVersion(); doReturn(ImmutableSet.of()).when(fooNoRev).getImports(); doReturn(ImmutableSet.of()).when(fooNoRev).getSubmodules(); @@ -56,19 +54,13 @@ public class ModuleDependencySortTest { doReturn(Optional.empty()).when(fooNoRevImport).getRevision(); doReturn("bar").when(bar).getName(); - doReturn(BAR_MODULE).when(bar).getQNameModule(); doReturn(BAR_MODULE.getNamespace()).when(bar).getNamespace(); doReturn(BAR_MODULE.getRevision()).when(bar).getRevision(); doReturn(YangVersion.VERSION_1).when(bar).getYangVersion(); doReturn(ImmutableSet.of()).when(bar).getImports(); doReturn(ImmutableSet.of(barSubmodule)).when(bar).getSubmodules(); - doReturn("bar-submodule").when(barSubmodule).getName(); - doReturn(BAR_MODULE).when(barSubmodule).getQNameModule(); - doReturn(BAR_MODULE.getNamespace()).when(barSubmodule).getNamespace(); - doReturn(BAR_MODULE.getRevision()).when(barSubmodule).getRevision(); doReturn(ImmutableSet.of(fooNoRevImport)).when(barSubmodule).getImports(); - doReturn(ImmutableSet.of()).when(barSubmodule).getSubmodules(); } @Test diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java index 8b50485610..94501704b0 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java index f455b253b9..4e27022d4d 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.model.util; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import java.net.URI; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/SchemaContextUtilTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/SchemaContextUtilTest.java index acd7f70080..f387062e29 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/SchemaContextUtilTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/SchemaContextUtilTest.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.repo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import java.io.IOException; -- 2.36.6