feedback-to-code/mozzarella · Datasets at Fast360
{
// 获取包含Hugging Face文本的span元素
const spans = link.querySelectorAll('span.whitespace-nowrap, span.hidden.whitespace-nowrap');
spans.forEach(span => {
if (span.textContent && span.textContent.trim().match(/Hugging\s*Face/i)) {
span.textContent = 'AI快站';
}
});
});
// 替换logo图片的alt属性
document.querySelectorAll('img[alt*="Hugging"], img[alt*="Face"]').forEach(img => {
if (img.alt.match(/Hugging\s*Face/i)) {
img.alt = 'AI快站 logo';
}
});
}
// 替换导航栏中的链接
function replaceNavigationLinks() {
// 已替换标记，防止重复运行
if (window._navLinksReplaced) {
return;
}
// 已经替换过的链接集合，防止重复替换
const replacedLinks = new Set();
// 只在导航栏区域查找和替换链接
const headerArea = document.querySelector('header') || document.querySelector('nav');
if (!headerArea) {
return;
}
// 在导航区域内查找链接
const navLinks = headerArea.querySelectorAll('a');
navLinks.forEach(link => {
// 如果已经替换过，跳过
if (replacedLinks.has(link)) return;
const linkText = link.textContent.trim();
const linkHref = link.getAttribute('href') || '';
// 替换Spaces链接 - 仅替换一次
if (
(linkHref.includes('/spaces') || linkHref === '/spaces' ||
linkText === 'Spaces' || linkText.match(/^s*Spacess*$/i)) &&
linkText !== 'OCR模型免费转Markdown' &&
linkText !== 'OCR模型免费转Markdown'
) {
link.textContent = 'OCR模型免费转Markdown';
link.href = 'https://fast360.xyz';
link.setAttribute('target', '_blank');
link.setAttribute('rel', 'noopener noreferrer');
replacedLinks.add(link);
}
// 删除Posts链接
else if (
(linkHref.includes('/posts') || linkHref === '/posts' ||
linkText === 'Posts' || linkText.match(/^s*Postss*$/i))
) {
if (link.parentNode) {
link.parentNode.removeChild(link);
}
replacedLinks.add(link);
}
// 替换Docs链接 - 仅替换一次
else if (
(linkHref.includes('/docs') || linkHref === '/docs' ||
linkText === 'Docs' || linkText.match(/^s*Docss*$/i)) &&
linkText !== '模型下载攻略'
) {
link.textContent = '模型下载攻略';
link.href = '/';
replacedLinks.add(link);
}
// 删除Enterprise链接
else if (
(linkHref.includes('/enterprise') || linkHref === '/enterprise' ||
linkText === 'Enterprise' || linkText.match(/^s*Enterprises*$/i))
) {
if (link.parentNode) {
link.parentNode.removeChild(link);
}
replacedLinks.add(link);
}
});
// 查找可能嵌套的Spaces和Posts文本
const textNodes = [];
function findTextNodes(element) {
if (element.nodeType === Node.TEXT_NODE) {
const text = element.textContent.trim();
if (text === 'Spaces' || text === 'Posts' || text === 'Enterprise') {
textNodes.push(element);
}
} else {
for (const child of element.childNodes) {
findTextNodes(child);
}
}
}
// 只在导航区域内查找文本节点
findTextNodes(headerArea);
// 替换找到的文本节点
textNodes.forEach(node => {
const text = node.textContent.trim();
if (text === 'Spaces') {
node.textContent = node.textContent.replace(/Spaces/g, 'OCR模型免费转Markdown');
} else if (text === 'Posts') {
// 删除Posts文本节点
if (node.parentNode) {
node.parentNode.removeChild(node);
}
} else if (text === 'Enterprise') {
// 删除Enterprise文本节点
if (node.parentNode) {
node.parentNode.removeChild(node);
}
}
});
// 标记已替换完成
window._navLinksReplaced = true;
}
// 替换代码区域中的域名
function replaceCodeDomains() {
// 特别处理span.hljs-string和span.njs-string元素
document.querySelectorAll('span.hljs-string, span.njs-string, span[class*="hljs-string"], span[class*="njs-string"]').forEach(span => {
if (span.textContent && span.textContent.includes('huggingface.co')) {
span.textContent = span.textContent.replace(/huggingface.co/g, 'aifasthub.com');
}
});
// 替换hljs-string类的span中的域名（移除多余的转义符号）
document.querySelectorAll('span.hljs-string, span[class*="hljs-string"]').forEach(span => {
if (span.textContent && span.textContent.includes('huggingface.co')) {
span.textContent = span.textContent.replace(/huggingface.co/g, 'aifasthub.com');
}
});
// 替换pre和code标签中包含git clone命令的域名
document.querySelectorAll('pre, code').forEach(element => {
if (element.textContent && element.textContent.includes('git clone')) {
const text = element.innerHTML;
if (text.includes('huggingface.co')) {
element.innerHTML = text.replace(/huggingface.co/g, 'aifasthub.com');
}
}
});
// 处理特定的命令行示例
document.querySelectorAll('pre, code').forEach(element => {
const text = element.innerHTML;
if (text.includes('huggingface.co')) {
// 针对git clone命令的专门处理
if (text.includes('git clone') || text.includes('GIT_LFS_SKIP_SMUDGE=1')) {
element.innerHTML = text.replace(/huggingface.co/g, 'aifasthub.com');
}
}
});
// 特别处理模型下载页面上的代码片段
document.querySelectorAll('.flex.border-t, .svelte_hydrator, .inline-block').forEach(container => {
const content = container.innerHTML;
if (content && content.includes('huggingface.co')) {
container.innerHTML = content.replace(/huggingface.co/g, 'aifasthub.com');
}
});
// 特别处理模型仓库克隆对话框中的代码片段
try {
// 查找包含"Clone this model repository"标题的对话框
const cloneDialog = document.querySelector('.svelte_hydration_boundary, [data-target="MainHeader"]');
if (cloneDialog) {
// 查找对话框中所有的代码片段和命令示例
const codeElements = cloneDialog.querySelectorAll('pre, code, span');
codeElements.forEach(element => {
if (element.textContent && element.textContent.includes('huggingface.co')) {
if (element.innerHTML.includes('huggingface.co')) {
element.innerHTML = element.innerHTML.replace(/huggingface.co/g, 'aifasthub.com');
} else {
element.textContent = element.textContent.replace(/huggingface.co/g, 'aifasthub.com');
}
}
});
}
// 更精确地定位克隆命令中的域名
document.querySelectorAll('[data-target]').forEach(container => {
const codeBlocks = container.querySelectorAll('pre, code, span.hljs-string');
codeBlocks.forEach(block => {
if (block.textContent && block.textContent.includes('huggingface.co')) {
if (block.innerHTML.includes('huggingface.co')) {
block.innerHTML = block.innerHTML.replace(/huggingface.co/g, 'aifasthub.com');
} else {
block.textContent = block.textContent.replace(/huggingface.co/g, 'aifasthub.com');
}
}
});
});
} catch (e) {
// 错误处理但不打印日志
}
}
// 当DOM加载完成后执行替换
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', () => {
replaceHeaderBranding();
replaceNavigationLinks();
replaceCodeDomains();
// 只在必要时执行替换 - 3秒后再次检查
setTimeout(() => {
if (!window._navLinksReplaced) {
console.log('[Client] 3秒后重新检查导航链接');
replaceNavigationLinks();
}
}, 3000);
});
} else {
replaceHeaderBranding();
replaceNavigationLinks();
replaceCodeDomains();
// 只在必要时执行替换 - 3秒后再次检查
setTimeout(() => {
if (!window._navLinksReplaced) {
console.log('[Client] 3秒后重新检查导航链接');
replaceNavigationLinks();
}
}, 3000);
}
// 增加一个MutationObserver来处理可能的动态元素加载
const observer = new MutationObserver(mutations => {
// 检查是否导航区域有变化
const hasNavChanges = mutations.some(mutation => {
// 检查是否存在header或nav元素变化
return Array.from(mutation.addedNodes).some(node => {
if (node.nodeType === Node.ELEMENT_NODE) {
// 检查是否是导航元素或其子元素
if (node.tagName === 'HEADER' || node.tagName === 'NAV' ||
node.querySelector('header, nav')) {
return true;
}
// 检查是否在导航元素内部
let parent = node.parentElement;
while (parent) {
if (parent.tagName === 'HEADER' || parent.tagName === 'NAV') {
return true;
}
parent = parent.parentElement;
}
}
return false;
});
});
// 只在导航区域有变化时执行替换
if (hasNavChanges) {
// 重置替换状态，允许再次替换
window._navLinksReplaced = false;
replaceHeaderBranding();
replaceNavigationLinks();
}
});
// 开始观察document.body的变化，包括子节点
if (document.body) {
observer.observe(document.body, { childList: true, subtree: true });
} else {
document.addEventListener('DOMContentLoaded', () => {
observer.observe(document.body, { childList: true, subtree: true });
});
}
})();
\n@@ -256,6 +257,12 @@ public interface Then {\n * @since 2.0\n */\n void shouldHaveZeroInteractions();\n+\n+ /**\n+ * @see #verifyNoMoreInteractions(Object...)\n+ * @since 2.0\n+ */\n+ void shouldHaveNoMoreInteractions();\n }\n \n /**\n@@ -309,6 +316,14 @@ public T should(InOrder inOrder, VerificationMode mode) {\n public void shouldHaveZeroInteractions() {\n verifyZeroInteractions(mock);\n }\n+\n+ /**\n+ * @see #verifyNoMoreInteractions(Object...)\n+ * @since 2.0\n+ */\n+ public void shouldHaveNoMoreInteractions() {\n+ verifyNoMoreInteractions(mock);\n+ }\n }\n \n /**\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockitousage/customization/BDDMockitoTest.java b/src/test/java/org/mockitousage/customization/BDDMockitoTest.java\nindex c207361c9d..b74487ef04 100644\n--- a/src/test/java/org/mockitousage/customization/BDDMockitoTest.java\n+++ b/src/test/java/org/mockitousage/customization/BDDMockitoTest.java\n@@ -246,6 +246,7 @@ public void should_pass_for_expected_behavior_that_happened() {\n mock.booleanObjectReturningMethod();\n \n then(mock).should().booleanObjectReturningMethod();\n+ then(mock).shouldHaveNoMoreInteractions();\n }\n \n @Test\n@@ -263,6 +264,18 @@ public void should_fail_when_mock_had_unwanted_interactions() {\n } catch (NoInteractionsWanted expected) { }\n }\n \n+ @Test\n+ public void should_fail_when_mock_had_more_interactions_than_expected() {\n+ mock.booleanObjectReturningMethod();\n+ mock.byteObjectReturningMethod();\n+\n+ then(mock).should().booleanObjectReturningMethod();\n+ try {\n+ then(mock).shouldHaveNoMoreInteractions();\n+ fail(\"should have reported that no more interactions were wanted\");\n+ } catch (NoInteractionsWanted expected) { }\n+ }\n+\n @Test\n public void should_pass_for_interactions_that_happened_in_correct_order() {\n mock.booleanObjectReturningMethod();\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2015-10-21T22:46:49","string":"2015-10-21T22:46:49"},"issue_created_at":{"kind":"timestamp","value":"2015-10-29T22:05:44Z","string":"2015-10-29T22:05:44Z"},"issue_by_user":{"kind":"string","value":"mkordas"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":460,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/316_317"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/316"},"pr_id":{"kind":"string","value":"mockito/mockito/317"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=0.0, similarity=0.9396315082112713)","keyword_pr_to_issue"],"string":"[\n \"timestamp(timedelta=0.0, similarity=0.9396315082112713)\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"971be4d8184ec916a5ebc2395050804da22b5b33"},"merge_commit":{"kind":"string","value":"8017ee1ff766b96725a64d0a2fff79e26300a19b"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2015-11-10T12:21:38Z","string":"2015-11-10T12:21:38Z"},"labeled_as":{"kind":"list like","value":["enhancement"],"string":"[\n \"enhancement\"\n]"},"problem_title":{"kind":"string","value":"modify StackTraceFilter to not strip away \"good\" elements from the middle"},"problem_statement":{"kind":"string","value":"according to javadoc of org.mockito.internal.exceptions.stacktrace.StackTraceFilter, filter works like this:\n[a+, b+, c-, d+, e+, f-, g+] -> [a+, b+, g+]\nit would be better to not strip away \"good\" d and e elements:\n[a+, b+, c-, d+, e+, f-, g+] -> [a+, b+, d+, e+, g+]\nWhat do you think about this? For me current behaviour is very inconvenient, I had to turn it off.\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java"],"string":"[\n \"src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java"],"string":"[\n \"src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java b/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java\nindex cd462dcee1..2b5bb658cc 100644\n--- a/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java\n+++ b/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java\n@@ -10,8 +10,6 @@\n \n import java.io.Serializable;\n import java.util.ArrayList;\n-import java.util.Arrays;\n-import java.util.LinkedList;\n import java.util.List;\n \n public class StackTraceFilter implements Serializable {\n@@ -20,38 +18,22 @@ public class StackTraceFilter implements Serializable {\n \n private static final StackTraceCleaner CLEANER =\n Plugins.getStackTraceCleanerProvider().getStackTraceCleaner(new DefaultStackTraceCleaner());\n- \n+\n /**\n * Example how the filter works (+/- means good/bad):\n- * [a+, b+, c-, d+, e+, f-, g+] -> [a+, b+, g+]\n- * Basically removes all bad from the middle. If any good are in the middle of bad those are also removed. \n+ * [a+, b+, c-, d+, e+, f-, g+] -> [a+, b+, d+, e+, g+]\n+ * Basically removes all bad from the middle.\n+ * If any good are in the middle of bad those are also removed. \n */\n public StackTraceElement[] filter(StackTraceElement[] target, boolean keepTop) {\n //TODO: profile\n- List unfilteredStackTrace = Arrays.asList(target);\n- \n- int lastBad = -1;\n- int firstBad = -1;\n- for (int i = 0; i < unfilteredStackTrace.size(); i++) {\n- if (!CLEANER.isOut(unfilteredStackTrace.get(i))) {\n- continue;\n- }\n- lastBad = i;\n- if (firstBad == -1) {\n- firstBad = i;\n+ final List filtered = new ArrayList();\n+ for (StackTraceElement aTarget : target) {\n+ if (!CLEANER.isOut(aTarget)) {\n+ filtered.add(aTarget);\n }\n }\n- \n- List top;\n- if (keepTop && firstBad != -1) {\n- top = unfilteredStackTrace.subList(0, firstBad);\n- } else {\n- top = new LinkedList();\n- }\n- \n- List bottom = unfilteredStackTrace.subList(lastBad + 1, unfilteredStackTrace.size());\n- List filtered = new ArrayList(top);\n- filtered.addAll(bottom);\n- return filtered.toArray(new StackTraceElement[]{});\n+ StackTraceElement[] result = new StackTraceElement[filtered.size()];\n+ return filtered.toArray(result);\n }\n }\n\\ No newline at end of file\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java b/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java\nindex 3d4185e7c9..0b1e588d86 100644\n--- a/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java\n+++ b/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java\n@@ -40,7 +40,7 @@ public void shouldFilterOutMockitoPackage() {\n }\n \n @Test\n- public void shouldFilterOutTracesMiddleBadTraces() {\n+ public void shouldNotFilterOutTracesMiddleGoodTraces() {\n StackTraceElement[] t = new TraceBuilder().classes(\n \"org.test.MockitoSampleTest\",\n \"org.test.TestSupport\",\n@@ -51,7 +51,7 @@ public void shouldFilterOutTracesMiddleBadTraces() {\n \n StackTraceElement[] filtered = filter.filter(t, false);\n \n- assertThat(filtered, hasOnlyThoseClasses(\"org.test.TestSupport\", \"org.test.MockitoSampleTest\"));\n+ assertThat(filtered, hasOnlyThoseClasses(\"org.test.TestSupport\", \"org.test.TestSupport\", \"org.test.MockitoSampleTest\"));\n }\n \n @Test\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2015-12-08T12:52:28","string":"2015-12-08T12:52:28"},"issue_created_at":{"kind":"timestamp","value":"2015-11-06T05:47:44Z","string":"2015-11-06T05:47:44Z"},"issue_by_user":{"kind":"string","value":"astafev"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":461,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/256_342"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/256"},"pr_id":{"kind":"string","value":"mockito/mockito/342"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"7b62390fec00c46fa8924354c27686a1a44fe2ab"},"merge_commit":{"kind":"string","value":"b3648078d7adeb4277bbaf75a87b2a272335d5bf"},"hints_text":{"kind":"list like","value":["I think most of us work on Linux/OSX, it probably has to do with the JDK\nversion and windows line endings.\n\nSo minifying this javascript code may work ?\n\n-- Brice\n\nOn Fri, Jul 10, 2015 at 8:19 AM, Meang Akira Tanaka <\nnotifications@github.com> wrote:\n\n> When compiling the mockito project using gradle in a command line in\n> Windows following compile error occurs:\n> \n> javadoc: error - Illegal package name: \" javadoc: error - Illegal package\n> name: \"type=\"\n> javadoc: error - Illegal package name: \"text/javascript\"\n> javadoc: error - Illegal package name: \"src=\"\n> javadoc: error - Illegal package name:\n> \"{@docRoot}/js/jdk6-project-version-insert.js\"\n> javadoc: error - Illegal package name: \">\"\n> javadoc: error - Illegal package name: \" javadoc: error - Illegal package\n> name: \"type=\"\n> javadoc: error - Illegal package name: \"text/javascript\"\n> javadoc: error - Illegal package name: \"src=\"\n> javadoc: error - Illegal package name: \"{@docRoot}/js/jquery-1.7.min.js\"\n> javadoc: error - Illegal package name: \">\"\n> javadoc: error - Illegal package name: \" javadoc: error - Illegal package\n> name: \"type=\"\n> javadoc: error - Illegal package name: \"text/javascript\"\n> javadoc: error - Illegal package name: \"src=\"\n> javadoc: error - Illegal package name:\n> \"{@docRoot}/js/highlight-8.6-java/highlight.pack.js\"\n> javadoc: error - Illegal package name: \">\"\n> javadoc: error - Illegal package name: \" javadoc: error - Illegal package\n> name: \"rel=\"\n> javadoc: error - Illegal package name: \"type=\"\n> javadoc: error - Illegal package name: \"text/css\"\n> javadoc: error - Illegal package name: \"href=\"\n> javadoc: error - Illegal package name:\n> \"{@docRoot}/js/highlight-8.6-java/styles/obsidian.css\"\n> javadoc: error - Illegal package name: \"/>\"\n> javadoc: error - Illegal package name: \" javadoc: error - Illegal package\n> name: \"type=\"\n> javadoc: error - Illegal package name: \"text/javascript\"\n> javadoc: error - Illegal package name: \">\"\n> javadoc: error - Illegal package name: \"=\"\n> javadoc: error - Illegal package name: \"&&\"\n> javadoc: error - Illegal package name: \"parseInt($.browser.version)\"\n> javadoc: error - Illegal package name: \"<\"\n> javadoc: error - Illegal package name: \"9;\"\n> javadoc: error - Illegal package name: \"if(!usingOldIE)\"\n> javadoc: error - Illegal package name: \"{\"\n> javadoc: error - Illegal package name: \"$(\"\n> javadoc: error - Illegal package name: \").append(\"\n> javadoc: error - Illegal package name: \" javadoc: error - Illegal package\n> name: \"icon\\\"\n> javadoc: error - Illegal package name: \" href=\\\"\n> javadoc: error - Illegal package name:\n> \"{@docRoot}/favicon.ico?v=cafebabe\\\"\n> javadoc: error - Illegal package name: \">\"\n> javadoc: error - Illegal package name: \")\"\n> javadoc: error - Illegal package name: \"$(\"\n> javadoc: error - Illegal package name: \",\"\n> javadoc: error - Illegal package name: \"window.parent.document).append(\"\n> javadoc: error - Illegal package name: \" javadoc: error - Illegal package\n> name: \"icon\\\"\n> javadoc: error - Illegal package name: \" href=\\\"\n> javadoc: error - Illegal package name:\n> \"{@docRoot}/favicon.ico?v=cafebabe\\\"\n> javadoc: error - Illegal package name: \">\"\n> javadoc: error - Illegal package name: \")\"\n> javadoc: error - Illegal package name: \"hljs.initHighlightingOnLoad();\"\n> javadoc: error - Illegal package name:\n> \"injectProjectVersionForJavadocJDK6(\"\n> javadoc: error - Illegal package name: \"Mockito 2.0.29-beta API\"\n> javadoc: error - Illegal package name: \",\"\n> javadoc: error - Illegal package name:\n> \"em#mockito-version-header-javadoc7-header\"\n> javadoc: error - Illegal package name: \",\"\n> javadoc: error - Illegal package name:\n> \"em#mockito-version-header-javadoc7-footer\"\n> javadoc: error - Illegal package name: \");\"\n> javadoc: error - Illegal package name: \"}\"\n> javadoc: error - Illegal package name: \"\"\n> javadoc: error - Illegal package name: \"\"\n> javadoc: warning - No source files for package stylesheet\n> javadoc: warning - No source files for package var\n> javadoc: warning - No source files for package usingOldIE\n> javadoc: warning - No source files for package $.browser.msie\n> javadoc: warning - No source files for package head\n> javadoc: warning - No source files for package shortcut\n> javadoc: warning - No source files for package head\n> javadoc: warning - No source files for package shortcut\n> 64 errors\n> 8 warnings\n> \n> I tracked the issue down to gradle/javadoc.gradle where the gradle scripts\n> sets the bottom property to a java script with multiple lines.\n> \n> Changing that to a single line seems to be make it possible to complete\n> the mockitoJavaDoc task without any errors.\n> \n> —\n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/256.\n","Fixed via 34f8c69\n","Hi Brice\n\nUnfortunately it did not work... I have submitted an alternative suggestion\n\nbr\n\nMeang\n"],"string":"[\n \"I think most of us work on Linux/OSX, it probably has to do with the JDK\\nversion and windows line endings.\\n\\nSo minifying this javascript code may work ?\\n\\n-- Brice\\n\\nOn Fri, Jul 10, 2015 at 8:19 AM, Meang Akira Tanaka <\\nnotifications@github.com> wrote:\\n\\n> When compiling the mockito project using gradle in a command line in\\n> Windows following compile error occurs:\\n> \\n> javadoc: error - Illegal package name: \\\" javadoc: error - Illegal package\\n> name: \\\"type=\\\"\\n> javadoc: error - Illegal package name: \\\"text/javascript\\\"\\n> javadoc: error - Illegal package name: \\\"src=\\\"\\n> javadoc: error - Illegal package name:\\n> \\\"{@docRoot}/js/jdk6-project-version-insert.js\\\"\\n> javadoc: error - Illegal package name: \\\">\\\"\\n> javadoc: error - Illegal package name: \\\" javadoc: error - Illegal package\\n> name: \\\"type=\\\"\\n> javadoc: error - Illegal package name: \\\"text/javascript\\\"\\n> javadoc: error - Illegal package name: \\\"src=\\\"\\n> javadoc: error - Illegal package name: \\\"{@docRoot}/js/jquery-1.7.min.js\\\"\\n> javadoc: error - Illegal package name: \\\">\\\"\\n> javadoc: error - Illegal package name: \\\" javadoc: error - Illegal package\\n> name: \\\"type=\\\"\\n> javadoc: error - Illegal package name: \\\"text/javascript\\\"\\n> javadoc: error - Illegal package name: \\\"src=\\\"\\n> javadoc: error - Illegal package name:\\n> \\\"{@docRoot}/js/highlight-8.6-java/highlight.pack.js\\\"\\n> javadoc: error - Illegal package name: \\\">\\\"\\n> javadoc: error - Illegal package name: \\\" javadoc: error - Illegal package\\n> name: \\\"rel=\\\"\\n> javadoc: error - Illegal package name: \\\"type=\\\"\\n> javadoc: error - Illegal package name: \\\"text/css\\\"\\n> javadoc: error - Illegal package name: \\\"href=\\\"\\n> javadoc: error - Illegal package name:\\n> \\\"{@docRoot}/js/highlight-8.6-java/styles/obsidian.css\\\"\\n> javadoc: error - Illegal package name: \\\"/>\\\"\\n> javadoc: error - Illegal package name: \\\" javadoc: error - Illegal package\\n> name: \\\"type=\\\"\\n> javadoc: error - Illegal package name: \\\"text/javascript\\\"\\n> javadoc: error - Illegal package name: \\\">\\\"\\n> javadoc: error - Illegal package name: \\\"=\\\"\\n> javadoc: error - Illegal package name: \\\"&&\\\"\\n> javadoc: error - Illegal package name: \\\"parseInt($.browser.version)\\\"\\n> javadoc: error - Illegal package name: \\\"<\\\"\\n> javadoc: error - Illegal package name: \\\"9;\\\"\\n> javadoc: error - Illegal package name: \\\"if(!usingOldIE)\\\"\\n> javadoc: error - Illegal package name: \\\"{\\\"\\n> javadoc: error - Illegal package name: \\\"$(\\\"\\n> javadoc: error - Illegal package name: \\\").append(\\\"\\n> javadoc: error - Illegal package name: \\\" javadoc: error - Illegal package\\n> name: \\\"icon\\\\\\\"\\n> javadoc: error - Illegal package name: \\\" href=\\\\\\\"\\n> javadoc: error - Illegal package name:\\n> \\\"{@docRoot}/favicon.ico?v=cafebabe\\\\\\\"\\n> javadoc: error - Illegal package name: \\\">\\\"\\n> javadoc: error - Illegal package name: \\\")\\\"\\n> javadoc: error - Illegal package name: \\\"$(\\\"\\n> javadoc: error - Illegal package name: \\\",\\\"\\n> javadoc: error - Illegal package name: \\\"window.parent.document).append(\\\"\\n> javadoc: error - Illegal package name: \\\" javadoc: error - Illegal package\\n> name: \\\"icon\\\\\\\"\\n> javadoc: error - Illegal package name: \\\" href=\\\\\\\"\\n> javadoc: error - Illegal package name:\\n> \\\"{@docRoot}/favicon.ico?v=cafebabe\\\\\\\"\\n> javadoc: error - Illegal package name: \\\">\\\"\\n> javadoc: error - Illegal package name: \\\")\\\"\\n> javadoc: error - Illegal package name: \\\"hljs.initHighlightingOnLoad();\\\"\\n> javadoc: error - Illegal package name:\\n> \\\"injectProjectVersionForJavadocJDK6(\\\"\\n> javadoc: error - Illegal package name: \\\"Mockito 2.0.29-beta API\\\"\\n> javadoc: error - Illegal package name: \\\",\\\"\\n> javadoc: error - Illegal package name:\\n> \\\"em#mockito-version-header-javadoc7-header\\\"\\n> javadoc: error - Illegal package name: \\\",\\\"\\n> javadoc: error - Illegal package name:\\n> \\\"em#mockito-version-header-javadoc7-footer\\\"\\n> javadoc: error - Illegal package name: \\\");\\\"\\n> javadoc: error - Illegal package name: \\\"}\\\"\\n> javadoc: error - Illegal package name: \\\"\\\"\\n> javadoc: error - Illegal package name: \\\"\\\"\\n> javadoc: warning - No source files for package stylesheet\\n> javadoc: warning - No source files for package var\\n> javadoc: warning - No source files for package usingOldIE\\n> javadoc: warning - No source files for package $.browser.msie\\n> javadoc: warning - No source files for package head\\n> javadoc: warning - No source files for package shortcut\\n> javadoc: warning - No source files for package head\\n> javadoc: warning - No source files for package shortcut\\n> 64 errors\\n> 8 warnings\\n> \\n> I tracked the issue down to gradle/javadoc.gradle where the gradle scripts\\n> sets the bottom property to a java script with multiple lines.\\n> \\n> Changing that to a single line seems to be make it possible to complete\\n> the mockitoJavaDoc task without any errors.\\n> \\n> —\\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/256.\\n\",\n \"Fixed via 34f8c69\\n\",\n \"Hi Brice\\n\\nUnfortunately it did not work... I have submitted an alternative suggestion\\n\\nbr\\n\\nMeang\\n\"\n]"},"resolved_comments":{"kind":"list like","value":["Good idea !\n"],"string":"[\n \"Good idea !\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-01-20T00:39:52Z","string":"2016-01-20T00:39:52Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"task mockitoJavadoc fails when compiling in windows"},"problem_statement":{"kind":"string","value":"When compiling the mockito project using gradle in a command line in Windows following compile error occurs:\n\njavadoc: error - Illegal package name: \"\"\njavadoc: error - Illegal package name: \"\"\njavadoc: error - Illegal package name: \"\"\njavadoc: error - Illegal package name: \"\"\njavadoc: error - Illegal package name: \"=\"\njavadoc: error - Illegal package name: \"&&\"\njavadoc: error - Illegal package name: \"parseInt($.browser.version)\"\njavadoc: error - Illegal package name: \"<\"\njavadoc: error - Illegal package name: \"9;\"\njavadoc: error - Illegal package name: \"if(!usingOldIE)\"\njavadoc: error - Illegal package name: \"{\"\njavadoc: error - Illegal package name: \"$(\"\njavadoc: error - Illegal package name: \").append(\"\njavadoc: error - Illegal package name: \" stringArgumentCaptor;\n\n @Before\n public void doBeforeTest() {\n requestSender = mock(RequestSender.class);\n requestProcessor = new RequestProcessor(requestSender);\n stringArgumentCaptor = ArgumentCaptor.forClass(String.class);\n }\n\n @Test\n public void shouldVerifyUsingAfterAndArgumentCaptor() {\n // when\n requestProcessor.process(\"first_request\");\n requestProcessor.process(\"second_request\");\n\n // then\n verify(requestSender, after(2500).times(2)).send(stringArgumentCaptor.capture());\n assertEquals(\"first_request\", stringArgumentCaptor.getAllValues().get(0));\n assertEquals(\"second_request\", stringArgumentCaptor.getAllValues().get(1));\n\n assertEquals(2, stringArgumentCaptor.getAllValues().size());\n }\n\n public static class RequestProcessor {\n private final RequestSender requestSender;\n\n public RequestProcessor(RequestSender requestSender) {\n this.requestSender = requestSender;\n }\n\n public void process(String request) {\n requestSender.send(request);\n }\n }\n\n public interface RequestSender {\n void send(String request);\n }\n}\n```\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/verification/AtMost.java"],"string":"[\n \"src/main/java/org/mockito/internal/verification/AtMost.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/verification/AtMost.java"],"string":"[\n \"src/main/java/org/mockito/internal/verification/AtMost.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java"],"string":"[\n \"src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/verification/AtMost.java b/src/main/java/org/mockito/internal/verification/AtMost.java\nindex 54a5285c47..25a7fc59d1 100644\n--- a/src/main/java/org/mockito/internal/verification/AtMost.java\n+++ b/src/main/java/org/mockito/internal/verification/AtMost.java\n@@ -5,6 +5,7 @@\n \n package org.mockito.internal.verification;\n \n+import java.util.Iterator;\n import java.util.List;\n \n import org.mockito.exceptions.Reporter;\n@@ -38,7 +39,8 @@ public void verify(VerificationData data) {\n if (foundSize > maxNumberOfInvocations) {\n new Reporter().wantedAtMostX(maxNumberOfInvocations, foundSize);\n }\n- \n+\n+ removeAlreadyVerified(found);\n invocationMarker.markVerified(found, wanted);\n }\n \n@@ -46,4 +48,13 @@ public void verify(VerificationData data) {\n public VerificationMode description(String description) {\n return VerificationModeFactory.description(this, description);\n }\n+\n+ private void removeAlreadyVerified(List invocations) {\n+ for (Iterator iterator = invocations.iterator(); iterator.hasNext(); ) {\n+ Invocation i = iterator.next();\n+ if (i.isVerified()) {\n+ iterator.remove();\n+ }\n+ }\n+ }\n }\n\\ No newline at end of file\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java b/src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java\nindex d20c39d8ba..e0d4f76c71 100644\n--- a/src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java\n+++ b/src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java\n@@ -15,6 +15,8 @@\n import org.junit.Rule;\n import org.junit.Test;\n import org.junit.rules.ExpectedException;\n+import org.mockito.ArgumentCaptor;\n+import org.mockito.Captor;\n import org.mockito.Mock;\n import org.mockito.exceptions.base.MockitoAssertionError;\n import org.mockitoutil.TestBase;\n@@ -29,6 +31,9 @@ public class VerificationAfterDelayTest extends TestBase {\n \n private List exceptions = new LinkedList();\n \n+ @Captor\n+ private ArgumentCaptor stringArgumentCaptor;\n+\n @After\n public void teardown() {\n // making sure there are no threading related exceptions\n@@ -106,6 +111,31 @@ public void shouldStopEarlyIfTestIsDefinitelyFailed() throws Exception {\n verify(mock, after(10000).never()).clear();\n }\n \n+ /**\n+ * Test for issue #345.\n+ */\n+ @Test\n+ public void shouldReturnListOfArgumentsWithSameSizeAsGivenInAtMostVerification() {\n+ // given\n+ int n = 3;\n+\n+ // when\n+ exerciseMockNTimes(n);\n+\n+ // then\n+ verify(mock, after(200).atMost(n)).add(stringArgumentCaptor.capture());\n+ assertEquals(n, stringArgumentCaptor.getAllValues().size());\n+ assertEquals(\"0\", stringArgumentCaptor.getAllValues().get(0));\n+ assertEquals(\"1\", stringArgumentCaptor.getAllValues().get(1));\n+ assertEquals(\"2\", stringArgumentCaptor.getAllValues().get(2));\n+ }\n+\n+ private void exerciseMockNTimes(int n) {\n+ for (int i = 0; i < n; i++) {\n+ mock.add(String.valueOf(i));\n+ }\n+ }\n+\n private Thread waitAndExerciseMock(final int sleep) {\n Thread t = new Thread() {\n \n"},"split_random":{"kind":"string","value":"test"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-01-26T23:52:50","string":"2016-01-26T23:52:50"},"issue_created_at":{"kind":"timestamp","value":"2016-01-26T22:23:46Z","string":"2016-01-26T22:23:46Z"},"issue_by_user":{"kind":"string","value":"tarnowskijan"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":463,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/365_373"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/365"},"pr_id":{"kind":"string","value":"mockito/mockito/373"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"196ff979da156caa07e19f57e4849637d8bede1a"},"merge_commit":{"kind":"string","value":"f2ec9da14192fa98f534dd8e01d4921fcc5c8c14"},"hints_text":{"kind":"list like","value":["I would like to mention that sometimes class argument can be useful.\r\n\r\nIn my case I would like to catch object passed to mock and write to mongo database.\r\nThe code I would like to have is:\r\n\r\n```\r\n// test setup\r\ndoAnswer(invocation -> mongoTemplate.insert(invocation.getArgument(0, Person.class)))\r\n .when(mock)\r\n .myMethod(any());\r\n\r\n// test execution \r\nmock.myMethod(new Person(\"Joe\", \"Doe\"))\r\n```\r\nThe reason of problem is that `MongoTemplate` has 2 similar methods:\r\n```\r\npublic ExecutableInsert insert(Class domainType) {...) //(1)\r\npublic void insert(Object objectToSave) {..) //(2)\r\n```\r\nAFAIU, when I setup `doAnswer(invocation -> mongoTemplate.insert(invocation.getArgument(0))`, type inference will choose method (1) and finally I get class cast exception `Person` -> `Class`\r\n\r\nUnfortunately, code `doAnswer(invocation -> mongoTemplate.insert((Person)invocation.getArgument(0))` does not compile\r\n\r\nTo implement my test, I have to define anonymous class `Answer` so my code is long-winded - one-liner looks much better\r\n"],"string":"[\n \"I would like to mention that sometimes class argument can be useful.\\r\\n\\r\\nIn my case I would like to catch object passed to mock and write to mongo database.\\r\\nThe code I would like to have is:\\r\\n\\r\\n```\\r\\n// test setup\\r\\ndoAnswer(invocation -> mongoTemplate.insert(invocation.getArgument(0, Person.class)))\\r\\n .when(mock)\\r\\n .myMethod(any());\\r\\n\\r\\n// test execution \\r\\nmock.myMethod(new Person(\\\"Joe\\\", \\\"Doe\\\"))\\r\\n```\\r\\nThe reason of problem is that `MongoTemplate` has 2 similar methods:\\r\\n```\\r\\npublic ExecutableInsert insert(Class domainType) {...) //(1)\\r\\npublic void insert(Object objectToSave) {..) //(2)\\r\\n```\\r\\nAFAIU, when I setup `doAnswer(invocation -> mongoTemplate.insert(invocation.getArgument(0))`, type inference will choose method (1) and finally I get class cast exception `Person` -> `Class`\\r\\n\\r\\nUnfortunately, code `doAnswer(invocation -> mongoTemplate.insert((Person)invocation.getArgument(0))` does not compile\\r\\n\\r\\nTo implement my test, I have to define anonymous class `Answer` so my code is long-winded - one-liner looks much better\\r\\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-03-11T20:56:56Z","string":"2016-03-11T20:56:56Z"},"labeled_as":{"kind":"list like","value":["1.* incompatible"],"string":"[\n \"1.* incompatible\"\n]"},"problem_title":{"kind":"string","value":"Simplify the InvocationOnMock-API to get a casted argument"},"problem_statement":{"kind":"string","value":"The 2nd argument of `InvocationOnMock.getArgumentAt(int,Class)` can be removed cause it is not neccessary.\n\nIntuitively on would write this to get a \"auto casted\" argument:\n`String text = invocation.getArgumentAt(1,String.class)`\n\nThe type can be ommited without side effects (the implementation of InvocationOnMock discards it anyway).\n`String text = invocation.getArgumentAt(1,null)`\n\nTherefore Mockito 2.0 should consider to simplify the API and ommit the `Class`-argument here. Maybe it is also a good chance to simplify the method name too. What about `getArgument(int index)` ?\n\nThis is how the 'new' API could look like:\n`String text = invocation.getArgument(1)`\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java","src/main/java/org/mockito/internal/invocation/InvocationImpl.java","src/main/java/org/mockito/internal/invocation/InvocationMatcher.java","src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java","src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java","src/main/java/org/mockito/invocation/InvocationOnMock.java"],"string":"[\n \"src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java\",\n \"src/main/java/org/mockito/internal/invocation/InvocationImpl.java\",\n \"src/main/java/org/mockito/internal/invocation/InvocationMatcher.java\",\n \"src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java\",\n \"src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java\",\n \"src/main/java/org/mockito/invocation/InvocationOnMock.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java","src/main/java/org/mockito/internal/invocation/InvocationImpl.java","src/main/java/org/mockito/internal/invocation/InvocationMatcher.java","src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java","src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java","src/main/java/org/mockito/invocation/InvocationOnMock.java"],"string":"[\n \"src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java\",\n \"src/main/java/org/mockito/internal/invocation/InvocationImpl.java\",\n \"src/main/java/org/mockito/internal/invocation/InvocationMatcher.java\",\n \"src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java\",\n \"src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java\",\n \"src/main/java/org/mockito/invocation/InvocationOnMock.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/AllInvocationsFinderTest.java","src/test/java/org/mockito/internal/invocation/InvocationImplTest.java","src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java","src/test/java/org/mockitousage/customization/BDDMockitoTest.java","src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/AllInvocationsFinderTest.java\",\n \"src/test/java/org/mockito/internal/invocation/InvocationImplTest.java\",\n \"src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java\",\n \"src/test/java/org/mockitousage/customization/BDDMockitoTest.java\",\n \"src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java b/src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java\nindex b0687142e3..8445e4b70b 100644\n--- a/src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java\n+++ b/src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java\n@@ -113,9 +113,14 @@ public Object[] getArguments() {\n }\n \n @Override\n- @SuppressWarnings(\"unchecked\")\n+ @Deprecated\n public T getArgumentAt(int index, Class clazz) {\n- return (T) arguments[index];\n+ return (T) getArgument(index);\n+ }\n+\n+ @Override\n+ public T getArgument(int index) {\n+ return (T)arguments[index];\n }\n \n @Override\ndiff --git a/src/main/java/org/mockito/internal/invocation/InvocationImpl.java b/src/main/java/org/mockito/internal/invocation/InvocationImpl.java\nindex dc77a57e25..b7bf096249 100644\n--- a/src/main/java/org/mockito/internal/invocation/InvocationImpl.java\n+++ b/src/main/java/org/mockito/internal/invocation/InvocationImpl.java\n@@ -62,10 +62,17 @@ public Object[] getArguments() {\n return arguments;\n }\n \n+ @Deprecated\n public T getArgumentAt(int index, Class clazz) {\n- return (T) arguments[index];\n+ return (T) getArgument(index);\n }\n \n+ public T getArgument(int index) {\n+ return (T)arguments[index];\n+ }\n+\n+\n+\n public boolean isVerified() {\n return verified || isIgnoredForVerification;\n }\ndiff --git a/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java b/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java\nindex a18f1b62e2..112c7dd5a9 100644\n--- a/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java\n+++ b/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java\n@@ -122,7 +122,7 @@ private void captureRegularArguments(Invocation invocation) {\n for (int position = 0; position < regularArgumentsSize(invocation); position++) {\n ArgumentMatcher m = matchers.get(position);\n if (m instanceof CapturesArguments) {\n- ((CapturesArguments) m).captureFrom(invocation.getArgumentAt(position, Object.class));\n+ ((CapturesArguments) m).captureFrom(invocation.getArgument(position));\n }\n }\n }\ndiff --git a/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java b/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java\nindex 059074d254..6db6db8899 100644\n--- a/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java\n+++ b/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java\n@@ -39,7 +39,7 @@ public ReturnsArgumentAt(int wantedArgumentPosition) {\n \n public Object answer(InvocationOnMock invocation) throws Throwable {\n validateIndexWithinInvocationRange(invocation);\n- return invocation.getArguments()[actualArgumentPosition(invocation)];\n+ return invocation.getArgument(actualArgumentPosition(invocation));\n }\n \n \ndiff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java b/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java\nindex 11304afce1..4b8b9474c5 100644\n--- a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java\n+++ b/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java\n@@ -72,7 +72,7 @@ public Object answer(InvocationOnMock invocation) {\n //see issue 184.\n //mocks by default should return 0 if references are the same, otherwise some other value because they are not the same. Hence we return 1 (anything but 0 is good).\n //Only for compareTo() method by the Comparable interface\n- return invocation.getMock() == invocation.getArguments()[0] ? 0 : 1;\n+ return invocation.getMock() == invocation.getArgument(0) ? 0 : 1;\n }\n \n Class returnType = invocation.getMethod().getReturnType();\ndiff --git a/src/main/java/org/mockito/invocation/InvocationOnMock.java b/src/main/java/org/mockito/invocation/InvocationOnMock.java\nindex 815b8a4422..95f7667c5d 100644\n--- a/src/main/java/org/mockito/invocation/InvocationOnMock.java\n+++ b/src/main/java/org/mockito/invocation/InvocationOnMock.java\n@@ -41,9 +41,18 @@ public interface InvocationOnMock extends Serializable {\n * @param index argument position\n * @param clazz argument type\n * @return casted argument on position\n+ * @deprecated use {@link #getArgument(int)}\n */\n+ @Deprecated\n T getArgumentAt(int index, Class clazz);\n \n+ /**\n+ * Returns casted argument at the given index\n+ * @param index argument index\n+ * @return casted argument at the given index\n+ */\n+ T getArgument(int index);\n+\n \n /**\n * calls real method\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/AllInvocationsFinderTest.java b/src/test/java/org/mockito/internal/AllInvocationsFinderTest.java\nindex c5230db380..8eea369948 100644\n--- a/src/test/java/org/mockito/internal/AllInvocationsFinderTest.java\n+++ b/src/test/java/org/mockito/internal/AllInvocationsFinderTest.java\n@@ -54,6 +54,6 @@ public void shouldNotCountDuplicatedInteractions() throws Exception {\n }\n \n private void assertArgumentEquals(Object argumentValue, Invocation invocation) {\n- assertEquals(argumentValue, invocation.getArguments()[0]);\n+ assertEquals(argumentValue, invocation.getArgument(0));\n }\n }\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockito/internal/invocation/InvocationImplTest.java b/src/test/java/org/mockito/internal/invocation/InvocationImplTest.java\nindex 0317dea5fe..57f229fd32 100644\n--- a/src/test/java/org/mockito/internal/invocation/InvocationImplTest.java\n+++ b/src/test/java/org/mockito/internal/invocation/InvocationImplTest.java\n@@ -156,7 +156,7 @@ public void shouldReturnCastedArgumentAt(){\n argTypes(int.class, int.class).args(1, argument).toInvocation();\n \n //when\n- int secondArgument = invocationOnInterface.getArgumentAt(1, int.class);\n+ int secondArgument = invocationOnInterface.getArgument(1);\n \n //then\n assertTrue(secondArgument == argument);\ndiff --git a/src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java b/src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java\nindex 882d235c81..a446bda754 100644\n--- a/src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java\n+++ b/src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java\n@@ -75,7 +75,7 @@ public void shouldAlterFinalLog() {\n private Answer byCheckingLogEquals(final ImportLogBean status) {\n return new Answer() {\n public Object answer(InvocationOnMock invocation) throws Throwable {\n- ImportLogBean bean = (ImportLogBean) invocation.getArguments()[0];\n+ ImportLogBean bean = invocation.getArgument(0);\n assertEquals(status, bean);\n return null;\n }\ndiff --git a/src/test/java/org/mockitousage/customization/BDDMockitoTest.java b/src/test/java/org/mockitousage/customization/BDDMockitoTest.java\nindex b74487ef04..b932bd0b33 100644\n--- a/src/test/java/org/mockitousage/customization/BDDMockitoTest.java\n+++ b/src/test/java/org/mockitousage/customization/BDDMockitoTest.java\n@@ -68,7 +68,7 @@ public void should_stub_with_throwable_classes() throws Exception {\n public void should_stub_with_answer() throws Exception {\n given(mock.simpleMethod(anyString())).willAnswer(new Answer() {\n public String answer(InvocationOnMock invocation) throws Throwable {\n- return (String) invocation.getArguments()[0];\n+ return invocation.getArgument(0);\n }});\n \n Assertions.assertThat(mock.simpleMethod(\"foo\")).isEqualTo(\"foo\");\n@@ -78,7 +78,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {\n public void should_stub_with_will_answer_alias() throws Exception {\n given(mock.simpleMethod(anyString())).will(new Answer() {\n public String answer(InvocationOnMock invocation) throws Throwable {\n- return (String) invocation.getArguments()[0];\n+ return invocation.getArgument(0);\n }\n });\n \n@@ -184,7 +184,7 @@ public void should_stub_using_do_return_style() throws Exception {\n public void should_stub_using_do_answer_style() throws Exception {\n willAnswer(new Answer() {\n public String answer(InvocationOnMock invocation) throws Throwable {\n- return (String) invocation.getArguments()[0];\n+ return invocation.getArgument(0);\n }\n })\n .given(mock).simpleMethod(anyString());\ndiff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java b/src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java\nindex 8ca965d148..10486b7971 100644\n--- a/src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java\n+++ b/src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java\n@@ -28,7 +28,7 @@ public class StubbingWithCustomAnswerTest extends TestBase {\n public void shouldAnswer() throws Exception {\n when(mock.simpleMethod(anyString())).thenAnswer(new Answer() {\n public String answer(InvocationOnMock invocation) throws Throwable {\n- String arg = (String) invocation.getArguments()[0];\n+ String arg = invocation.getArgument(0);\n \n return invocation.getMethod().getName() + \"-\" + arg;\n }\n"},"split_random":{"kind":"string","value":"val"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-03-09T16:56:37","string":"2016-03-09T16:56:37"},"issue_created_at":{"kind":"timestamp","value":"2016-03-01T12:19:49Z","string":"2016-03-01T12:19:49Z"},"issue_by_user":{"kind":"string","value":"ChristianSchwarz"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":464,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/379_380"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/379"},"pr_id":{"kind":"string","value":"mockito/mockito/380"},"linking_methods":{"kind":"list like","value":["keyword_issue_to_pr","keyword_pr_to_issue"],"string":"[\n \"keyword_issue_to_pr\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"196ff979da156caa07e19f57e4849637d8bede1a"},"merge_commit":{"kind":"string","value":"31c7876f0693a1335c8e41b340e8580aa9a510ae"},"hints_text":{"kind":"list like","value":["@thesnowgoose \nThat a bug in VerificationOverTimeImpl#verify(VerificationData). The passed `VerificationData` contains all invocations, in your case \"0\",\"1\" and \"2\". During the specified 200ms these invocations are verified in a loop without delay. That means if your CPU is able to verify the VerificationData 10,000 times during that 200ms the captor captures 30,000 arguments (10000 \\* 3 arguments ). \n\nThe implementation of `After` uses `VerificationOverTimeImpl` and that class performs the verify-loop until the time is elapsed. This behaviour is fine for `Timeout` but violates the specification of `Mockito.after(long)`, this is what the JavaDoc says:\n\n> Allows verifying over a given period. It causes a verify to **wait for a specified period of time** for a desired interaction\n\nIn other words the `After` implementation must use some kind of `VerificationAfterDelayImpl`, that simply waits and than verify the invocations.\n\nI have a solution and will provide a PR.\n","PR #380 relates to this issue.\n","Fixed by #380 \n","Why is this closed? I ran into the issue and lost about an hour before realizing it is a Mockito bug. What is the current status? It is not fixed in the 1.x branch. I am using 1.10.19 which seems the most recent version.\n","@jmborer can you test it with the latest 2.0.0-beta build, it should be fixed\n","OK. Thanx for the info, but I don't feel confortable to use a beta version to test operational sofware...\n","The beta is almost over, I hope to publish a release candidate in the\ncoming days. You should be able to upgrade without much problems, since the\nbreaking changes are kept at a minimum.\n\nOn Thu, 18 Aug 2016, 16:12 Jean-Marc Borer, notifications@github.com\nwrote:\n\n> OK. Thanx for the info, but I don't feel confortable to use a beta version\n> to test operational sofware...\n> \n> —\n> You are receiving this because you are subscribed to this thread.\n> Reply to this email directly, view it on GitHub\n> https://github.com/mockito/mockito/issues/379#issuecomment-240735180,\n> or mute the thread\n> https://github.com/notifications/unsubscribe-auth/AFrDb3NREzSakS3dFBKOKP-cyi5DMdb5ks5qhGhXgaJpZM4H4c7l\n> .\n","@jmborer mockito 2 beta is fairly stable, the API should not move much. Yet there's some incompatible change with 1.x\n\n> I don't feel confortable to use a beta version to test operational sofware...\n\nRemember it's for tests not to run on your production servers/containers\n","Sure. I won't use in production. I'll wait a little until RC is out to do the migration. I already noticed it is no longer compatible with PowerMock. I have to check if I need it anymore then my problem is solved. \n","Was this actually merged into a release? I initially found the issue while running 2.0.41-beta, so I tried 2.4.0 and 2.8.9, but I'm still seeing the issue, specifically with after() and times(). \r\n\r\n","Still encounter this issue in 3.6.0 (also tested latest 3.12.4) when using `after()`"],"string":"[\n \"@thesnowgoose \\nThat a bug in VerificationOverTimeImpl#verify(VerificationData). The passed `VerificationData` contains all invocations, in your case \\\"0\\\",\\\"1\\\" and \\\"2\\\". During the specified 200ms these invocations are verified in a loop without delay. That means if your CPU is able to verify the VerificationData 10,000 times during that 200ms the captor captures 30,000 arguments (10000 \\\\* 3 arguments ). \\n\\nThe implementation of `After` uses `VerificationOverTimeImpl` and that class performs the verify-loop until the time is elapsed. This behaviour is fine for `Timeout` but violates the specification of `Mockito.after(long)`, this is what the JavaDoc says:\\n\\n> Allows verifying over a given period. It causes a verify to **wait for a specified period of time** for a desired interaction\\n\\nIn other words the `After` implementation must use some kind of `VerificationAfterDelayImpl`, that simply waits and than verify the invocations.\\n\\nI have a solution and will provide a PR.\\n\",\n \"PR #380 relates to this issue.\\n\",\n \"Fixed by #380 \\n\",\n \"Why is this closed? I ran into the issue and lost about an hour before realizing it is a Mockito bug. What is the current status? It is not fixed in the 1.x branch. I am using 1.10.19 which seems the most recent version.\\n\",\n \"@jmborer can you test it with the latest 2.0.0-beta build, it should be fixed\\n\",\n \"OK. Thanx for the info, but I don't feel confortable to use a beta version to test operational sofware...\\n\",\n \"The beta is almost over, I hope to publish a release candidate in the\\ncoming days. You should be able to upgrade without much problems, since the\\nbreaking changes are kept at a minimum.\\n\\nOn Thu, 18 Aug 2016, 16:12 Jean-Marc Borer, notifications@github.com\\nwrote:\\n\\n> OK. Thanx for the info, but I don't feel confortable to use a beta version\\n> to test operational sofware...\\n> \\n> —\\n> You are receiving this because you are subscribed to this thread.\\n> Reply to this email directly, view it on GitHub\\n> https://github.com/mockito/mockito/issues/379#issuecomment-240735180,\\n> or mute the thread\\n> https://github.com/notifications/unsubscribe-auth/AFrDb3NREzSakS3dFBKOKP-cyi5DMdb5ks5qhGhXgaJpZM4H4c7l\\n> .\\n\",\n \"@jmborer mockito 2 beta is fairly stable, the API should not move much. Yet there's some incompatible change with 1.x\\n\\n> I don't feel confortable to use a beta version to test operational sofware...\\n\\nRemember it's for tests not to run on your production servers/containers\\n\",\n \"Sure. I won't use in production. I'll wait a little until RC is out to do the migration. I already noticed it is no longer compatible with PowerMock. I have to check if I need it anymore then my problem is solved. \\n\",\n \"Was this actually merged into a release? I initially found the issue while running 2.0.41-beta, so I tried 2.4.0 and 2.8.9, but I'm still seeing the issue, specifically with after() and times(). \\r\\n\\r\\n\",\n \"Still encounter this issue in 3.6.0 (also tested latest 3.12.4) when using `after()`\"\n]"},"resolved_comments":{"kind":"list like","value":["Since this method is duplicate from the method added in the class below, maybe we can extract an superclass `InvocationsChecker`. This class abstracts away all the logic regarding obtaining and reporting the failures, the constructor as well as this new method.\n"],"string":"[\n \"Since this method is duplicate from the method added in the class below, maybe we can extract an superclass `InvocationsChecker`. This class abstracts away all the logic regarding obtaining and reporting the failures, the constructor as well as this new method.\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-03-25T01:04:42Z","string":"2016-03-25T01:04:42Z"},"labeled_as":{"kind":"list like","value":["enhancement"],"string":"[\n \"enhancement\"\n]"},"problem_title":{"kind":"string","value":"Verification using After and ArgumentCaptor with Times or AtLeast methods returns unexpected size of captured values list."},"problem_statement":{"kind":"string","value":"Hi!\nI was looking issue #345 and found that the test \"shouldReturnListOfArgumentsWithSameSizeAsGivenInAtMostVerification\" (located in VerificationAfterDelayTest.java) fails if you use atLeast() or times() instead of atMost().\nI created these tests:\n\n\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/verification/Times.java","src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java","src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java"],"string":"[\n \"src/main/java/org/mockito/internal/verification/Times.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/verification/Times.java","src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java","src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java"],"string":"[\n \"src/main/java/org/mockito/internal/verification/Times.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java"],"string":"[\n \"src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/verification/Times.java b/src/main/java/org/mockito/internal/verification/Times.java\nindex 62a7ed753f..f43ce4286c 100644\n--- a/src/main/java/org/mockito/internal/verification/Times.java\n+++ b/src/main/java/org/mockito/internal/verification/Times.java\n@@ -31,12 +31,16 @@ public Times(int wantedNumberOfInvocations) {\n }\n \n public void verify(VerificationData data) {\n+ List invocations = data.getAllInvocations();\n+ InvocationMatcher wanted = data.getWanted();\n+\n if (wantedCount > 0) {\n MissingInvocationChecker missingInvocation = new MissingInvocationChecker();\n- missingInvocation.check(data.getAllInvocations(), data.getWanted());\n+ missingInvocation.check(invocations, wanted);\n }\n+\n NumberOfInvocationsChecker numberOfInvocations = new NumberOfInvocationsChecker();\n- numberOfInvocations.check(data.getAllInvocations(), data.getWanted(), wantedCount);\n+ numberOfInvocations.check(invocations, wanted, wantedCount);\n }\n \n public void verifyInOrder(VerificationDataInOrder data) {\ndiff --git a/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java b/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\nindex cc29e0963c..f21489edf8 100644\n--- a/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\n+++ b/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\n@@ -5,6 +5,7 @@\n \n package org.mockito.internal.verification.checkers;\n \n+import java.util.Iterator;\n import java.util.List;\n \n import org.mockito.exceptions.Reporter;\n@@ -28,7 +29,17 @@ public void check(List invocations, InvocationMatcher wanted, int wa\n Location lastLocation = finder.getLastLocation(actualInvocations);\n reporter.tooLittleActualInvocations(new AtLeastDiscrepancy(wantedCount, actualCount), wanted, lastLocation); \n }\n- \n+\n+ removeAlreadyVerified(actualInvocations);\n invocationMarker.markVerified(actualInvocations, wanted);\n }\n+\n+ private void removeAlreadyVerified(List invocations) {\n+ for (Iterator iterator = invocations.iterator(); iterator.hasNext(); ) {\n+ Invocation i = iterator.next();\n+ if (i.isVerified()) {\n+ iterator.remove();\n+ }\n+ }\n+ }\n }\n\\ No newline at end of file\ndiff --git a/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java b/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\nindex 17dec9ff2e..2529095c46 100644\n--- a/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\n+++ b/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\n@@ -5,6 +5,7 @@\n \n package org.mockito.internal.verification.checkers;\n \n+import java.util.Iterator;\n import java.util.List;\n \n import org.mockito.exceptions.Reporter;\n@@ -44,7 +45,17 @@ public void check(List invocations, InvocationMatcher wanted, int wa\n Location firstUndesired = actualInvocations.get(wantedCount).getLocation();\n reporter.tooManyActualInvocations(wantedCount, actualCount, wanted, firstUndesired);\n }\n- \n+\n+ removeAlreadyVerified(actualInvocations);\n invocationMarker.markVerified(actualInvocations, wanted);\n }\n+\n+ private void removeAlreadyVerified(List invocations) {\n+ for (Iterator iterator = invocations.iterator(); iterator.hasNext(); ) {\n+ Invocation i = iterator.next();\n+ if (i.isVerified()) {\n+ iterator.remove();\n+ }\n+ }\n+ }\n }\n\\ No newline at end of file\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java b/src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java\nindex e0d4f76c71..2462f28e45 100644\n--- a/src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java\n+++ b/src/test/java/org/mockitousage/verification/VerificationAfterDelayTest.java\n@@ -130,6 +130,38 @@ public void shouldReturnListOfArgumentsWithSameSizeAsGivenInAtMostVerification()\n assertEquals(\"2\", stringArgumentCaptor.getAllValues().get(2));\n }\n \n+ @Test\n+ public void shouldReturnListOfArgumentsWithSameSizeAsGivenInTimesVerification() {\n+ // given\n+ int n = 3;\n+\n+ // when\n+ exerciseMockNTimes(n);\n+\n+ //Then\n+ verify(mock, after(200).times(n)).add(stringArgumentCaptor.capture());\n+ assertEquals(n, stringArgumentCaptor.getAllValues().size());\n+ assertEquals(\"0\", stringArgumentCaptor.getAllValues().get(0));\n+ assertEquals(\"1\", stringArgumentCaptor.getAllValues().get(1));\n+ assertEquals(\"2\", stringArgumentCaptor.getAllValues().get(2));\n+ }\n+\n+ @Test\n+ public void shouldReturnListOfArgumentsWithSameSizeAsGivenInAtLeastVerification() {\n+ // given\n+ int n = 3;\n+\n+ // when\n+ exerciseMockNTimes(n);\n+\n+ //Then\n+ verify(mock, after(200).atLeast(n)).add(stringArgumentCaptor.capture());\n+ assertEquals(n, stringArgumentCaptor.getAllValues().size());\n+ assertEquals(\"0\", stringArgumentCaptor.getAllValues().get(0));\n+ assertEquals(\"1\", stringArgumentCaptor.getAllValues().get(1));\n+ assertEquals(\"2\", stringArgumentCaptor.getAllValues().get(2));\n+ }\n+\n private void exerciseMockNTimes(int n) {\n for (int i = 0; i < n; i++) {\n mock.add(String.valueOf(i));\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-03-09T16:56:37","string":"2016-03-09T16:56:37"},"issue_created_at":{"kind":"timestamp","value":"2016-03-24T23:42:00Z","string":"2016-03-24T23:42:00Z"},"issue_by_user":{"kind":"string","value":"thesnowgoose"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":465,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/374_386"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/374"},"pr_id":{"kind":"string","value":"mockito/mockito/386"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"196ff979da156caa07e19f57e4849637d8bede1a"},"merge_commit":{"kind":"string","value":"66a7205945d201e01aa6043d5cfe1aa0ae08e622"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-04-09T19:47:00Z","string":"2016-04-09T19:47:00Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"Remove deprecated API from Mockito 2 "},"problem_statement":{"kind":"string","value":"# This is a reminder to remove all deprecated API's from the upcoming mockito 2.\n\nThis issue blocks #123 [Release Mockito 2.0](123)\n\nRelates to \n- #273 [Get rid of ReturnValues](273)\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/Answers.java","src/main/java/org/mockito/ArgumentCaptor.java","src/main/java/org/mockito/exceptions/Discrepancy.java","src/main/java/org/mockito/exceptions/Pluralizer.java","src/main/java/org/mockito/exceptions/PrintableInvocation.java","src/main/java/org/mockito/exceptions/verification/junit/JUnitTool.java","src/main/java/org/mockito/invocation/DescribedInvocation.java","src/main/java/org/mockito/listeners/MethodInvocationReport.java","src/main/java/org/mockito/runners/MockitoJUnit44Runner.java","src/main/java/org/mockito/stubbing/answers/ReturnsElementsOf.java"],"string":"[\n \"src/main/java/org/mockito/Answers.java\",\n \"src/main/java/org/mockito/ArgumentCaptor.java\",\n \"src/main/java/org/mockito/exceptions/Discrepancy.java\",\n \"src/main/java/org/mockito/exceptions/Pluralizer.java\",\n \"src/main/java/org/mockito/exceptions/PrintableInvocation.java\",\n \"src/main/java/org/mockito/exceptions/verification/junit/JUnitTool.java\",\n \"src/main/java/org/mockito/invocation/DescribedInvocation.java\",\n \"src/main/java/org/mockito/listeners/MethodInvocationReport.java\",\n \"src/main/java/org/mockito/runners/MockitoJUnit44Runner.java\",\n \"src/main/java/org/mockito/stubbing/answers/ReturnsElementsOf.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/Answers.java","src/main/java/org/mockito/ArgumentCaptor.java","src/main/java/org/mockito/invocation/DescribedInvocation.java","src/main/java/org/mockito/listeners/MethodInvocationReport.java"],"string":"[\n \"src/main/java/org/mockito/Answers.java\",\n \"src/main/java/org/mockito/ArgumentCaptor.java\",\n \"src/main/java/org/mockito/invocation/DescribedInvocation.java\",\n \"src/main/java/org/mockito/listeners/MethodInvocationReport.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/runners/RunnersValidateFrameworkUsageTest.java","src/test/java/org/mockitousage/matchers/CapturingArgumentsTest.java","src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java","src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java"],"string":"[\n \"src/test/java/org/mockito/runners/RunnersValidateFrameworkUsageTest.java\",\n \"src/test/java/org/mockitousage/matchers/CapturingArgumentsTest.java\",\n \"src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java\",\n \"src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/Answers.java b/src/main/java/org/mockito/Answers.java\nindex db3f5723ad..ff89b4b482 100644\n--- a/src/main/java/org/mockito/Answers.java\n+++ b/src/main/java/org/mockito/Answers.java\n@@ -87,15 +87,6 @@ public enum Answers implements Answer{\n this.implementation = implementation;\n }\n \n- /**\n- * @deprecated Use the enum-constant directly, instead of this getter. This method will be removed in a future releaseAnswers.CALLS_REAL_METHODS.get() use Answers.CALLS_REAL_METHODS .\n- */\n- @Deprecated\n- public Answer get() {\n- return this;\n- }\n-\n public Object answer(InvocationOnMock invocation) throws Throwable {\n return implementation.answer(invocation);\n }\ndiff --git a/src/main/java/org/mockito/ArgumentCaptor.java b/src/main/java/org/mockito/ArgumentCaptor.java\nindex e84de14c83..0bf639d414 100644\n--- a/src/main/java/org/mockito/ArgumentCaptor.java\n+++ b/src/main/java/org/mockito/ArgumentCaptor.java\n@@ -65,26 +65,6 @@ public class ArgumentCaptor {\n private final CapturingMatcher capturingMatcher = new CapturingMatcher();\n private final Class clazz;\n \n- /**\n- * @deprecated\n- * \n- * Please use factory method {@link ArgumentCaptor#forClass(Class)} to create captors \n- * \n- * This is required to avoid NullPointerExceptions when autoUnboxing primitive types.\n- * See issue 99.\n- *
\n- * Example:\n- *
\n- * ArgumentCaptor<Person> argument = ArgumentCaptor.forClass(Person.class);\n- * verify(mock).doSomething(argument.capture());\n- * assertEquals(\"John\", argument.getValue().getName());\n- * Deprecated: Simply use {@link MockitoJUnitRunner} \n- * \n- * Compatible only with JUnit 4.4 , this runner adds following behavior:\n- *
\n- * \n- * Initializes mocks annotated with {@link Mock},\n- * so that explicit usage of {@link MockitoAnnotations#initMocks(Object)} is not necessary. \n- * Mocks are initialized before each test method.\n- * \n- * validates framework usage after each test method. See javadoc for {@link Mockito#validateMockitoUsage()}.\n- * \n- * \n- * Runner is completely optional - there are other ways you can get @Mock working, for example by writing a base class.\n- * Explicitly validating framework usage is also optional because it is triggered automatically by Mockito every time you use the framework.\n- * See javadoc for {@link Mockito#validateMockitoUsage()}.\n- * \n- * Read more about @Mock annotation in javadoc for {@link MockitoAnnotations}\n- *
\n- * Example:\n- *
\n- * @RunWith(MockitoJUnitRunner.class)\n- * public class ExampleTest {\n- * \n- * @Mock\n- * private List list;\n- * \n- * @Test\n- * public void shouldDoSomething() {\n- * list.add(100);\n- * }\n- * }\n- * \n- * \n- *
\n- *
\n- * //this:\n- * when(mock.foo()).thenReturn(1, 2, 3);\n- * //is equivalent to:\n- * when(mock.foo()).thenReturn(new ReturnsElementsOf(Arrays.asList(1, 2, 3)));\n- * argument = new ArgumentCaptor();\n+ ArgumentCaptor argument = ArgumentCaptor.forClass(Person.class);\n \n //when\n bulkEmailService.email(12);\ndiff --git a/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java b/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java\nindex ea57e5e645..2522224197 100644\n--- a/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java\n+++ b/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java\n@@ -12,13 +12,12 @@\n import org.junit.runner.RunWith;\n import org.mockito.Mock;\n import org.mockito.exceptions.verification.NeverWantedButInvoked;\n-import org.mockito.runners.MockitoJUnit44Runner;\n+import org.mockito.runners.MockitoJUnitRunner;\n import org.mockitousage.IMethods;\n import org.mockitoutil.TestBase;\n \n //This is required to make sure stack trace is well filtered when runner is ON\n-@SuppressWarnings(\"deprecation\")\n-@RunWith(MockitoJUnit44Runner.class)\n+@RunWith(MockitoJUnitRunner.class)\n public class PointingStackTraceToActualInvocationTest extends TestBase {\n \n @Mock private IMethods mock;\ndiff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java b/src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java\nindex b85c2394eb..8fb8a89857 100644\n--- a/src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java\n+++ b/src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java\n@@ -11,9 +11,9 @@\n import java.util.List;\n \n import org.junit.Test;\n+import org.mockito.AdditionalAnswers;\n import org.mockito.Mock;\n import org.mockito.exceptions.base.MockitoException;\n-import org.mockito.stubbing.answers.ReturnsElementsOf;\n import org.mockitousage.IMethods;\n import org.mockitoutil.TestBase;\n \n@@ -25,7 +25,7 @@ public class StubbingWithExtraAnswersTest extends TestBase {\n public void shouldWorkAsStandardMockito() throws Exception {\n //when\n List list = asList(1, 2, 3);\n- when(mock.objectReturningMethodNoArgs()).thenAnswer(new ReturnsElementsOf(list));\n+ when(mock.objectReturningMethodNoArgs()).thenAnswer(AdditionalAnswers.returnsElementsOf(list));\n \n //then\n assertEquals(1, mock.objectReturningMethodNoArgs());\n@@ -40,7 +40,7 @@ public void shouldWorkAsStandardMockito() throws Exception {\n public void shouldReturnNullIfNecessary() throws Exception {\n //when\n List list = asList(1, null);\n- when(mock.objectReturningMethodNoArgs()).thenAnswer(new ReturnsElementsOf(list));\n+ when(mock.objectReturningMethodNoArgs()).thenAnswer(AdditionalAnswers.returnsElementsOf(list));\n \n //then\n assertEquals(1, mock.objectReturningMethodNoArgs());\n@@ -52,7 +52,7 @@ public void shouldReturnNullIfNecessary() throws Exception {\n public void shouldScreamWhenNullPassed() throws Exception {\n try {\n //when\n- new ReturnsElementsOf(null);\n+ AdditionalAnswers.returnsElementsOf(null);\n //then\n fail();\n } catch (MockitoException e) {}\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-03-09T16:56:37","string":"2016-03-09T16:56:37"},"issue_created_at":{"kind":"timestamp","value":"2016-03-14T12:38:43Z","string":"2016-03-14T12:38:43Z"},"issue_by_user":{"kind":"string","value":"ChristianSchwarz"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":466,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/407_412"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/407"},"pr_id":{"kind":"string","value":"mockito/mockito/412"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"8331e6e4bb37e459950dc12ef48ff4f5ed10f953"},"merge_commit":{"kind":"string","value":"3da645d2d38e6be82bdcd2ee2bb7abf08deb74d9"},"hints_text":{"kind":"list like","value":["This is a bug in [ForwardsInvocations](https://github.com/mockito/mockito/blob/master/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java#L41), as you already investigated the expanded varargs are passed to the delegate.\n\nThe current implementation does this:\n\n```\nresult = delegateMethod.invoke(delegatedObject, arguments);\n```\n\nMockito look for method with the signature `String,int,String,double` for the given arguments (\"baz\",12,\"45\",67.8), but such a method doesn't exists.\n\nTo fix the issue the raw/unexpanded arguments must be used\n\n```\nObject[] rawArguments = ((Invocation)invocation).getRawArguments(); \nresult = delegateMethod.invoke(delegatedObject, rawArguments);\n```\n\nNow Mockito looks for method signature `String,Object[]` which is the var args method you want. Note: It is safe to cast to `Invocation` here cause answers always get a Invocation-Instance passed from `MockHandlerImpl`. \n\nIf I find some time I will send a PR with a fix or you or some one else start to fix it. \n","Here is PR. I thought about cast, but may be better pull up method [org.mockito.invocation.Invocation#getRawArguments](https://github.com/mockito/mockito/blob/master/src/main/java/org/mockito/invocation/Invocation.java#L42) to interface [org.mockito.invocation.InvocationOnMock](https://github.com/mockito/mockito/blob/master/src/main/java/org/mockito/invocation/InvocationOnMock.java)?\n","@andreyrmg \nPulling `getRawArguments()` up to `InvocationOnMock` would help in this narrow use case. On the other side it bloat the public API and migth confuse clients that implement custom Answer's, which method to choose `getArguments()` or `getRawArguments()`. \n\nWDYT?\n","Yes, I agree with you. But I think, this is already a bit confusing that method `getArgument()` returns expanded varargs. Maybe we need two methods `getArguments()` and `getExpandedArguments()`?\n","Adding new API or changing existing behaviour need to be discussed with the core-members.\n\nI agree with you, `getArguments()` should return unaltered/not expanded arguments. The current `getArguments()` implementation has also the problem that is can't distinguish an null-vararg argument / `varArgMethod(new Type[]{null})` from an null-varag array / `varArgMethod((Type[])null)`.\n"],"string":"[\n \"This is a bug in [ForwardsInvocations](https://github.com/mockito/mockito/blob/master/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java#L41), as you already investigated the expanded varargs are passed to the delegate.\\n\\nThe current implementation does this:\\n\\n```\\nresult = delegateMethod.invoke(delegatedObject, arguments);\\n```\\n\\nMockito look for method with the signature `String,int,String,double` for the given arguments (\\\"baz\\\",12,\\\"45\\\",67.8), but such a method doesn't exists.\\n\\nTo fix the issue the raw/unexpanded arguments must be used\\n\\n```\\nObject[] rawArguments = ((Invocation)invocation).getRawArguments(); \\nresult = delegateMethod.invoke(delegatedObject, rawArguments);\\n```\\n\\nNow Mockito looks for method signature `String,Object[]` which is the var args method you want. Note: It is safe to cast to `Invocation` here cause answers always get a Invocation-Instance passed from `MockHandlerImpl`. \\n\\nIf I find some time I will send a PR with a fix or you or some one else start to fix it. \\n\",\n \"Here is PR. I thought about cast, but may be better pull up method [org.mockito.invocation.Invocation#getRawArguments](https://github.com/mockito/mockito/blob/master/src/main/java/org/mockito/invocation/Invocation.java#L42) to interface [org.mockito.invocation.InvocationOnMock](https://github.com/mockito/mockito/blob/master/src/main/java/org/mockito/invocation/InvocationOnMock.java)?\\n\",\n \"@andreyrmg \\nPulling `getRawArguments()` up to `InvocationOnMock` would help in this narrow use case. On the other side it bloat the public API and migth confuse clients that implement custom Answer's, which method to choose `getArguments()` or `getRawArguments()`. \\n\\nWDYT?\\n\",\n \"Yes, I agree with you. But I think, this is already a bit confusing that method `getArgument()` returns expanded varargs. Maybe we need two methods `getArguments()` and `getExpandedArguments()`?\\n\",\n \"Adding new API or changing existing behaviour need to be discussed with the core-members.\\n\\nI agree with you, `getArguments()` should return unaltered/not expanded arguments. The current `getArguments()` implementation has also the problem that is can't distinguish an null-vararg argument / `varArgMethod(new Type[]{null})` from an null-varag array / `varArgMethod((Type[])null)`.\\n\"\n]"},"resolved_comments":{"kind":"list like","value":["- Looks good, can you split the test cases (empty array/ non empty array) ?\n- Can you also add a test for `invocationOf(Foo.class, \"bar\", \"baz\", new Object[] {null})` and `invocationOf(Foo.class, \"bar\", \"baz\", null)` \n- Would you mind using AssertJ's Assertions.assertThat(..).is(..), it is more readable IMHO?\n","There is no need to extend from `TestBase`, right?\n"],"string":"[\n \"- Looks good, can you split the test cases (empty array/ non empty array) ?\\n- Can you also add a test for `invocationOf(Foo.class, \\\"bar\\\", \\\"baz\\\", new Object[] {null})` and `invocationOf(Foo.class, \\\"bar\\\", \\\"baz\\\", null)` \\n- Would you mind using AssertJ's Assertions.assertThat(..).is(..), it is more readable IMHO?\\n\",\n \"There is no need to extend from `TestBase`, right?\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-05-17T11:18:32Z","string":"2016-05-17T11:18:32Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"Vararg method call on mock object fails when used org.mockito.AdditionalAnswers#delegatesTo"},"problem_statement":{"kind":"string","value":"I try to mock interface with varargs method and default implementation in final class and get this error:\n\n```\njava.lang.IllegalArgumentException: wrong number of arguments\n\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n at java.lang.reflect.Method.invoke(Method.java:498)\n at org.mockito.internal.stubbing.defaultanswers.ForwardsInvocations.answer(ForwardsInvocations.java:31)\n at org.mockito.internal.handler.MockHandlerImpl.handle(MockHandlerImpl.java:93)\n at org.mockito.internal.handler.NullResultGuardian.handle(NullResultGuardian.java:29)\n at org.mockito.internal.handler.InvocationNotifierHandler.handle(InvocationNotifierHandler.java:38)\n at org.mockito.internal.creation.MethodInterceptorFilter.intercept(MethodInterceptorFilter.java:51)\n```\n\nI run the following code:\n\n``` java\npublic class DefaultAnswerDemo {\n\n public interface Foo {\n void bar(String baz, Object... args);\n }\n\n public static final class FooImpl implements Foo {\n\n @Override\n public void bar(String baz, Object... args) {\n System.out.println(\"bar\");\n }\n\n }\n\n @Test\n public void defaultAnswerTest() {\n Foo fooImpl = new FooImpl();\n\n Foo foo = mock(Foo.class, withSettings()\n .defaultAnswer(delegatesTo(fooImpl)));\n\n foo.bar(\"baz\", 12, \"45\", 67.8);\n }\n\n}\n```\n\nThis is happens because org.mockito.internal.invocation.InvocationImpl by default expands varargs arguments to flat list. And I have no idea, how correctly fix this.\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java"],"string":"[\n \"src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java"],"string":"[\n \"src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java","src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java\",\n \"src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java b/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java\nindex 1916a62ce2..95da223adf 100644\n--- a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java\n+++ b/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java\n@@ -9,6 +9,7 @@\n import java.lang.reflect.Method;\n \n import org.mockito.exceptions.Reporter;\n+import org.mockito.invocation.Invocation;\n import org.mockito.invocation.InvocationOnMock;\n import org.mockito.stubbing.Answer;\n \n@@ -37,8 +38,9 @@ public Object answer(InvocationOnMock invocation) throws Throwable {\n if (!compatibleReturnTypes(mockMethod.getReturnType(), delegateMethod.getReturnType())) {\n new Reporter().delegatedMethodHasWrongReturnType(mockMethod, delegateMethod, invocation.getMock(), delegatedObject);\n }\n- \n- result = delegateMethod.invoke(delegatedObject, invocation.getArguments());\n+\n+ Object[] rawArguments = ((Invocation) invocation).getRawArguments();\n+ result = delegateMethod.invoke(delegatedObject, rawArguments);\n } catch (NoSuchMethodException e) {\n new Reporter().delegatedMethodDoesNotExistOnDelegate(mockMethod, invocation.getMock(), delegatedObject);\n } catch (InvocationTargetException e) {\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java b/src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java\nnew file mode 100644\nindex 0000000000..42234edc08\n--- /dev/null\n+++ b/src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java\n@@ -0,0 +1,30 @@\n+package org.mockito.internal.stubbing.defaultanswers;\n+\n+import org.junit.Test;\n+import org.mockitoutil.TestBase;\n+\n+public class ForwardsInvocationsTest extends TestBase {\n+\n+ interface Foo {\n+ int bar(String baz, Object... args);\n+ }\n+\n+ private static final class FooImpl implements Foo {\n+ @Override\n+ public int bar(String baz, Object... args) {\n+ return baz.length() + args.length;\n+ }\n+ }\n+\n+ @Test\n+ public void should_call_method_with_varargs() throws Throwable {\n+ ForwardsInvocations forwardsInvocations = new ForwardsInvocations(new FooImpl());\n+ assertEquals(4, forwardsInvocations.answer(invocationOf(Foo.class, \"bar\", \"b\", new Object[] {12, \"3\", 4.5})));\n+ }\n+\n+ @Test\n+ public void should_call_method_with_empty_varargs() throws Throwable {\n+ ForwardsInvocations forwardsInvocations = new ForwardsInvocations(new FooImpl());\n+ assertEquals(1, forwardsInvocations.answer(invocationOf(Foo.class, \"bar\", \"b\", new Object[] {})));\n+ }\n+}\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java b/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java\nnew file mode 100644\nindex 0000000000..5f41d7178a\n--- /dev/null\n+++ b/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java\n@@ -0,0 +1,46 @@\n+package org.mockitousage.stubbing;\n+\n+import org.junit.Test;\n+\n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.mockito.AdditionalAnswers.delegatesTo;\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.withSettings;\n+\n+public class StubbingWithDelegateVarArgsTest {\n+\n+ public interface Foo {\n+ int bar(String baz, Object... args);\n+ }\n+\n+ private static final class FooImpl implements Foo {\n+\n+ @Override\n+ public int bar(String baz, Object... args) {\n+ return args != null ? args.length : -1; // simple return argument count\n+ }\n+\n+ }\n+\n+ @Test\n+ public void should_not_fail_when_calling_varargs_method() {\n+ Foo foo = mock(Foo.class, withSettings()\n+ .defaultAnswer(delegatesTo(new FooImpl())));\n+ assertThat(foo.bar(\"baz\", 12, \"45\", 67.8)).isEqualTo(3);\n+ }\n+\n+ @Test\n+ public void should_not_fail_when_calling_varargs_method_without_arguments() {\n+ Foo foo = mock(Foo.class, withSettings()\n+ .defaultAnswer(delegatesTo(new FooImpl())));\n+ assertThat(foo.bar(\"baz\")).isEqualTo(0);\n+ assertThat(foo.bar(\"baz\", new Object[0])).isEqualTo(0);\n+ }\n+\n+ @Test\n+ public void should_not_fail_when_calling_varargs_method_with_null_argument() {\n+ Foo foo = mock(Foo.class, withSettings()\n+ .defaultAnswer(delegatesTo(new FooImpl())));\n+ assertThat(foo.bar(\"baz\", (Object[]) null)).isEqualTo(-1);\n+ }\n+}\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-05-17T22:34:52","string":"2016-05-17T22:34:52"},"issue_created_at":{"kind":"timestamp","value":"2016-05-03T07:27:24Z","string":"2016-05-03T07:27:24Z"},"issue_by_user":{"kind":"string","value":"iam-afk"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":467,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/422_423"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/422"},"pr_id":{"kind":"string","value":"mockito/mockito/423"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=33028.0, similarity=0.8599980107043)"],"string":"[\n \"timestamp(timedelta=33028.0, similarity=0.8599980107043)\"\n]"},"base_commit":{"kind":"string","value":"74e312b7a9236a43eb543bd3184607b75375bc40"},"merge_commit":{"kind":"string","value":"d528d12806a460dd1a646e49afc09dab3cc1c8fe"},"hints_text":{"kind":"list like","value":["Hi! Why would you even want to do that? It sounds like a absolutely terrible idea to do that. Can you provide some use case?\n","Thank you for the fast reply!\nI need to test that a class behaves in different ways if the log level is debug or not and so I need to mock the logger. If debug is enabled my class will do some heavy computation. The logger is fetched with the classic SLF4J API `LogFactory.getLog(ClassToTest.class)`.\n\nI can use powermock to mock `LogFactory.getLog` but things get quite complicated quite fast since this is invoked only once when the class is loaded. A cleaner solution would be to set the mock logger before the test.\n\nI am working on a low level logging API so I cannot rely on dependency injection.\n","@andreicristianpetcu I think setter injection would be better and cleaner. In your test, you set the logger via this method. In your default behavior you only set it in your constructor.\n","Loggers are per class and not per instance. If I make my log field not a static final field SonarQube starts to complain. I can add a false positive to SonarQube but the rest of the company uses this behavior.\n","Well you have two options:\n1. Make the setter static too. In your `@Before` set the logger to your mock, but storing the original logger. In `@After` set the logger back to the original logger.\n2. Deal with the deficiency of SonarQube and make this an exception. It is a tool to assist you during development, but not a holy grail imo.\n","I know that SonarQube is not a holy grail but I cannot change the SonarQube settings.\nWould you refuse a pull request adding this feature? I imagine it is quite small.\n","Another solution is to wrap the logger in a class that you can inject. \n\n```\nclass LoggerProxy {\n\n private static final Logger log ....\n\n void debug(...) { log.debug(...); }\n void info(...) { log.info(...); }\n\n}\n```\n\nand then in your class you can call\n\n```\nclass YourClass {\n private final LoggerProxy proxy;\n\n YourClass(LoggerProxy proxy) {\n this.proxy = proxy;\n }\n\n void someMethod() {\n loggerProxy.debug(...); // <-- this you can stub\n }\n}\n```\n\nI'd vote strongly against such a feature as allowing to set private final static fields. But that's just my vote ;) \n\nAnd then everybody's happy! You have cleaner code, Sonar is not violated - life's beautiful :)\n","I don't feel comfortable to write code specially to make my code testable.\n\nBelieve me I tried all possible options. I think setting the LOG field using reflection is the simplest. Right now we do it with a class who's purpose is to only set this field in several places. The only two options that I have:\n- use this class;\n- add the feature to upstream (in this case Mockito).\n\nIf you would not accept such a feature I will not add it but I think it adds value. I think setting private instance fields using reflection as it is currently implemented in Mockito is a bad practice but I use it anyway since there are some really rare cases where this is the best option. Setting private static final fields is the same as setting private instance fields: bad practice but needed from time to time.\n","Normally you shouldn't actually verify if stuff has been logged. If that's so important to you then IMO you should use good practices to achieve that solution. Maybe @bric3 or @szczepiq has some other opinion on this but I don't think that allowing more hacks to test a logger without injecting it through a constructor is a good idea. \n","I understand you will not use this feature, but do you consider it harmful?\n[Here is a StackOverflow](http://stackoverflow.com/a/2474242/1387563) solution for setting private static final field and I want to implement it the same way.\n","I consider it allowing people write bad code. But that's only my opinion.\nIf others feel that this is a good feature to add then I'm not going to\nobject.\n","I have to side with @marcingrzejszczak here. Adding this functionality will likely result in bad code because the production code is not testable. I do not see making code testable as a problem.\n","Ok then. I'll try to make a pull request tonight and I hope it gets accepted :)\n","So I can assume that we can close this\n","> Hi! Why would you even want to do that? It sounds like a absolutely terrible idea to do that. Can you provide some use case?\r\n\r\nCould you please explain to me why using a static class variable is a terrible idea?","> I need to test that a class behaves in different ways if the log level is debug or not and so I need to mock the logger.\r\n\r\nIn this situation, you would set the logger's logging level to DEBUG from your logging framework, rather than mocking the logger. For example in Logback:\r\n\r\n```\r\nLoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();\r\nch.qos.logback.classic.Logger logger = loggerContext.getLogger(fullyQualifiedClassName);\r\nlogger.setLevel(Level.toLevel(logLevel));\r\n```"],"string":"[\n \"Hi! Why would you even want to do that? It sounds like a absolutely terrible idea to do that. Can you provide some use case?\\n\",\n \"Thank you for the fast reply!\\nI need to test that a class behaves in different ways if the log level is debug or not and so I need to mock the logger. If debug is enabled my class will do some heavy computation. The logger is fetched with the classic SLF4J API `LogFactory.getLog(ClassToTest.class)`.\\n\\nI can use powermock to mock `LogFactory.getLog` but things get quite complicated quite fast since this is invoked only once when the class is loaded. A cleaner solution would be to set the mock logger before the test.\\n\\nI am working on a low level logging API so I cannot rely on dependency injection.\\n\",\n \"@andreicristianpetcu I think setter injection would be better and cleaner. In your test, you set the logger via this method. In your default behavior you only set it in your constructor.\\n\",\n \"Loggers are per class and not per instance. If I make my log field not a static final field SonarQube starts to complain. I can add a false positive to SonarQube but the rest of the company uses this behavior.\\n\",\n \"Well you have two options:\\n1. Make the setter static too. In your `@Before` set the logger to your mock, but storing the original logger. In `@After` set the logger back to the original logger.\\n2. Deal with the deficiency of SonarQube and make this an exception. It is a tool to assist you during development, but not a holy grail imo.\\n\",\n \"I know that SonarQube is not a holy grail but I cannot change the SonarQube settings.\\nWould you refuse a pull request adding this feature? I imagine it is quite small.\\n\",\n \"Another solution is to wrap the logger in a class that you can inject. \\n\\n```\\nclass LoggerProxy {\\n\\n private static final Logger log ....\\n\\n void debug(...) { log.debug(...); }\\n void info(...) { log.info(...); }\\n\\n}\\n```\\n\\nand then in your class you can call\\n\\n```\\nclass YourClass {\\n private final LoggerProxy proxy;\\n\\n YourClass(LoggerProxy proxy) {\\n this.proxy = proxy;\\n }\\n\\n void someMethod() {\\n loggerProxy.debug(...); // <-- this you can stub\\n }\\n}\\n```\\n\\nI'd vote strongly against such a feature as allowing to set private final static fields. But that's just my vote ;) \\n\\nAnd then everybody's happy! You have cleaner code, Sonar is not violated - life's beautiful :)\\n\",\n \"I don't feel comfortable to write code specially to make my code testable.\\n\\nBelieve me I tried all possible options. I think setting the LOG field using reflection is the simplest. Right now we do it with a class who's purpose is to only set this field in several places. The only two options that I have:\\n- use this class;\\n- add the feature to upstream (in this case Mockito).\\n\\nIf you would not accept such a feature I will not add it but I think it adds value. I think setting private instance fields using reflection as it is currently implemented in Mockito is a bad practice but I use it anyway since there are some really rare cases where this is the best option. Setting private static final fields is the same as setting private instance fields: bad practice but needed from time to time.\\n\",\n \"Normally you shouldn't actually verify if stuff has been logged. If that's so important to you then IMO you should use good practices to achieve that solution. Maybe @bric3 or @szczepiq has some other opinion on this but I don't think that allowing more hacks to test a logger without injecting it through a constructor is a good idea. \\n\",\n \"I understand you will not use this feature, but do you consider it harmful?\\n[Here is a StackOverflow](http://stackoverflow.com/a/2474242/1387563) solution for setting private static final field and I want to implement it the same way.\\n\",\n \"I consider it allowing people write bad code. But that's only my opinion.\\nIf others feel that this is a good feature to add then I'm not going to\\nobject.\\n\",\n \"I have to side with @marcingrzejszczak here. Adding this functionality will likely result in bad code because the production code is not testable. I do not see making code testable as a problem.\\n\",\n \"Ok then. I'll try to make a pull request tonight and I hope it gets accepted :)\\n\",\n \"So I can assume that we can close this\\n\",\n \"> Hi! Why would you even want to do that? It sounds like a absolutely terrible idea to do that. Can you provide some use case?\\r\\n\\r\\nCould you please explain to me why using a static class variable is a terrible idea?\",\n \"> I need to test that a class behaves in different ways if the log level is debug or not and so I need to mock the logger.\\r\\n\\r\\nIn this situation, you would set the logger's logging level to DEBUG from your logging framework, rather than mocking the logger. For example in Logback:\\r\\n\\r\\n```\\r\\nLoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();\\r\\nch.qos.logback.classic.Logger logger = loggerContext.getLogger(fullyQualifiedClassName);\\r\\nlogger.setLevel(Level.toLevel(logLevel));\\r\\n```\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-05-31T18:51:04Z","string":"2016-05-31T18:51:04Z"},"labeled_as":{"kind":"list like","value":["on hold"],"string":"[\n \"on hold\"\n]"},"problem_title":{"kind":"string","value":"Whitebox.setInternalState for private static final fields"},"problem_statement":{"kind":"string","value":"Hello,\n\nCan you please add the ability for [Whitebox.setInternalState](https://github.com/mockito/mockito/blob/74e312b7a9236a43eb543bd3184607b75375bc40/src/main/java/org/mockito/internal/util/reflection/Whitebox.java#L22-L31) to be invokable on classes with private static final field?\n\n``` java\nWhitebox.setInternalState(ClassToTest.class, \"LOG\", mockLog);\n```\n\nI did not understand where is the best place to add a feature request. I hope this is the best place.\n\nThank you\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/util/reflection/Whitebox.java"],"string":"[\n \"src/main/java/org/mockito/internal/util/reflection/Whitebox.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/util/reflection/Whitebox.java"],"string":"[\n \"src/main/java/org/mockito/internal/util/reflection/Whitebox.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java","src/test/java/org/mockito/internal/util/reflection/WhiteboxTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java\",\n \"src/test/java/org/mockito/internal/util/reflection/WhiteboxTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/util/reflection/Whitebox.java b/src/main/java/org/mockito/internal/util/reflection/Whitebox.java\nindex c63f59b87a..14ea30be98 100644\n--- a/src/main/java/org/mockito/internal/util/reflection/Whitebox.java\n+++ b/src/main/java/org/mockito/internal/util/reflection/Whitebox.java\n@@ -5,31 +5,58 @@\n package org.mockito.internal.util.reflection;\n \n import java.lang.reflect.Field;\n+import java.lang.reflect.Modifier;\n \n public class Whitebox {\n \n- public static Object getInternalState(Object target, String field) {\n- Class c = target.getClass();\n+ public static Object getInternalState(Object targetInstance, String fieldName) {\n+ return getInternalState(targetInstance.getClass(), targetInstance, fieldName);\n+ }\n+\n+ public static Object getInternalState(Class targetClass, String fieldName) {\n+ return getInternalState(targetClass, null, fieldName);\n+ }\n+\n+ private static Object getInternalState(Class targetClass, Object targetInstance, String fieldName) {\n try {\n- Field f = getFieldFromHierarchy(c, field);\n+ Field f = getFieldFromHierarchy(targetClass, fieldName);\n f.setAccessible(true);\n- return f.get(target);\n+ return f.get(targetInstance);\n } catch (Exception e) {\n throw new RuntimeException(\"Unable to get internal state on a private field. Please report to mockito mailing list.\", e);\n }\n }\n \n- public static void setInternalState(Object target, String field, Object value) {\n- Class c = target.getClass();\n+ public static void setInternalState(Object targetInstance, String fieldName, Object value) {\n+ setInternalState(targetInstance.getClass(), targetInstance, fieldName, value);\n+ }\n+\n+ public static void setInternalState(Class targetClass, String fieldName, Object value) {\n+ setInternalState(targetClass, null, fieldName, value);\n+ }\n+\n+ private static void setInternalState(Class targetClass, Object targetInstance, String fieldName, Object value) {\n try {\n- Field f = getFieldFromHierarchy(c, field);\n+ Field f = getFieldFromHierarchy(targetClass, fieldName);\n f.setAccessible(true);\n- f.set(target, value);\n+ removeFinalModifierIfPresent(f);\n+ f.set(targetInstance, value);\n } catch (Exception e) {\n throw new RuntimeException(\"Unable to set internal state on a private field. Please report to mockito mailing list.\", e);\n }\n }\n \n+ private static void removeFinalModifierIfPresent(Field fieldToRemoveFinalFrom) throws IllegalAccessException, NoSuchFieldException {\n+ int fieldModifiersMask = fieldToRemoveFinalFrom.getModifiers();\n+ boolean isFinalModifierPresent = (fieldModifiersMask & Modifier.FINAL) == Modifier.FINAL;\n+ if (isFinalModifierPresent) {\n+ Field modifiersField = Field.class.getDeclaredField(\"modifiers\");\n+ modifiersField.setAccessible(true);\n+ int fieldModifiersMaskWithoutFinal = fieldModifiersMask & ~Modifier.FINAL;\n+ modifiersField.setInt(fieldToRemoveFinalFrom, fieldModifiersMaskWithoutFinal);\n+ }\n+ }\n+\n private static Field getFieldFromHierarchy(Class clazz, String field) {\n Field f = getField(clazz, field);\n while (f == null && clazz != Object.class) {\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java b/src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java\nindex 6967c02c8a..2b5da62228 100644\n--- a/src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java\n+++ b/src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java\n@@ -4,8 +4,13 @@\n */\n package org.mockito.internal.util.reflection;\n \n+import java.util.logging.Logger;\n+\n public class DummyParentClassForTests {\n \n+ @SuppressWarnings(\"unused\")//I know, I know. We're doing nasty reflection hacks here...\n+ private static final Logger LOG = Logger.getLogger(DummyParentClassForTests.class.toString());\n+\n @SuppressWarnings(\"unused\")//I know, I know. We're doing nasty reflection hacks here...\n private String somePrivateField;\n }\ndiff --git a/src/test/java/org/mockito/internal/util/reflection/WhiteboxTest.java b/src/test/java/org/mockito/internal/util/reflection/WhiteboxTest.java\nindex add464c140..97a07ea530 100644\n--- a/src/test/java/org/mockito/internal/util/reflection/WhiteboxTest.java\n+++ b/src/test/java/org/mockito/internal/util/reflection/WhiteboxTest.java\n@@ -5,10 +5,16 @@\n package org.mockito.internal.util.reflection;\n \n import org.junit.Test;\n+import org.mockito.Mock;\n import org.mockitoutil.TestBase;\n \n+import java.util.logging.Logger;\n+\n public class WhiteboxTest extends TestBase {\n \n+ @Mock\n+ Logger mockLogger;\n+\n @Test\n public void private_state() {\n //given\n@@ -19,4 +25,13 @@ public void private_state() {\n Object internalState = Whitebox.getInternalState(dummy, \"somePrivateField\");\n assertEquals(\"cool!\", internalState);\n }\n+\n+ @Test\n+ public void private_static_final_state() {\n+ //when\n+ Whitebox.setInternalState(DummyParentClassForTests.class, \"LOG\", mockLogger);\n+ //then\n+ Object internalState = Whitebox.getInternalState(DummyParentClassForTests.class, \"LOG\");\n+ assertEquals(mockLogger, internalState);\n+ }\n }\n\\ No newline at end of file\n"},"split_random":{"kind":"string","value":"test"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-05-27T20:52:55","string":"2016-05-27T20:52:55"},"issue_created_at":{"kind":"timestamp","value":"2016-05-31T10:59:45Z","string":"2016-05-31T10:59:45Z"},"issue_by_user":{"kind":"string","value":"andreicristianpetcu"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":468,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/426_432"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/426"},"pr_id":{"kind":"string","value":"mockito/mockito/432"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"a1de9a5e1d38774f2f3e343e60c56e8f000b71ca"},"merge_commit":{"kind":"string","value":"3c4edc6b49ce4a30dcaf00a78cf014c245f2eefa"},"hints_text":{"kind":"list like","value":["@raphw thanks for merging the PR that fast! Would you mind reopening this ticket? There are more classes that can be refactored that way, I would like to extend the list.\n","Big :+1: for me btw, but please keep the pull requests managable and as small as possible. Preferably refactoring 1 method at a time. That way it is a lot easier to review.\n","I agree, there is nothing wrong with multiple PRs, the quick merge is a reaction to an easy overview (and being stuck at an Ukrainian airport without access to the Eurocup).\n","There are still two unit tests failing, could you have a look @ChristianSchwarz - I just had a quick look and there are two unit tests failing which seems related to the way you refactored the previous stubbing of the `Reporter`.\n\nI should have checked more thoroughly before merging, hopefully you can fix the problem soon. Alternatively, I will just rollback the one commit (the first one is good) and we can reapply the patch once you fixed the two unit tests. Thank you, really, this was great clean-up.\n","I fixed the one test error. I push it tonight.\n\nPS: I also fixed a bug in the stack trace cleaner. Not a biggy but please do not `@Ignore` tests. Especially in big commits, it is easy to miss that single annotation.\n","@raphw Which test(s) is/are failing? I will fix it asap! Too bad that some test fail on a regulare base, is it possible to ignore them in the ide only?\n","You can see the build output here: https://travis-ci.org/mockito/mockito#L254-L269\n\nI advise you to run the tests with `./gradlew build`. This should work.\n","@TimvdLippe know what you mean! The next PR's include only one refactored class at a time.\n","I have it all fixed on local but I did not have access to wifi without 22 blocked. Will commit soon.\n","@raphw can you please reopen this issue \n","Sorry, GitHub automatically closes issues that reference a PR.\n","@ChristianSchwarz If a commit contains a comment like \"Fixes #426\" the mentioned issue is automatically closed by github.\n","@PascalSchumacher Good to know! I will leave it out for the upcoming PR's. Thanks!\n","Now that we are pulling in static methods, I would like to propose a new (linter) rule. To make it easier to read a file, I would like that all methods invoked in the current class are referenced with `this.` (and `super.` for that matter). Therefore if we see `this.verify`, we know it is in the current class and the same object, whereas `verify` references a static method in this class, or an imported static method. Do you agree @mockito/developers ?\n","> I would like that all methods invoked in the current class are referenced with this. (and super. for that matter).\n\nTo me it feels like unnecessary/duplicate code cause `this` is implicit. Adding `this.` before every instance call would create a lot more text and would IMHO reduce readability. E.g.:\n\n`this.doSometing(this.withPrivateMethod())` vs. `doSomething(withPrivateMethod())`\n\n> Therefore if we see this.verify, we know it is in the current class and the same object, whereas verify references a static method in this class, or an imported static method.\n\nAn other option avoid ambiguity is to qualify static methods via its class name. This way you can also distinguish which verify(..) is called ( `MockitoCore.verify(..)` / `Mocktio.verify(..)`) , which is not an easy task when a static import is used.\n","I'm not coding too much in Mockito ATM (hopefully now after SpringOne conference I'll have more time) but I fully agree with @ChristianSchwarz . IMO the best solution is to: \n- omit `this` before method calls. \n- if necessary provide the class for static method call\n","Respectful -1\n\nI like when the class formally declares collaborators instead of calling out to static methods. This makes it easy to reason about the code. I don't need to read every line of code in the class to find out external couplings realized via static methods. I can see the couplings via fields, I can easily query how the field variable is used, etc. Another use case is when we discover missing/incorrect unit test coverage (or we do some larger refactorings) and we cannot easily write tests because code is too procedural.\n\nThe benefits for converting to static utilities have minimal significance to me. Yet, there is a downside I care about (e.g. maintainability of procedural code, static methods that consume static methods, that consume static methods...).\n\nHence, I down vote this sort of changes. Going down this path, all stateless classes in Mockito would become static utilities :)\n\nYou can get +1's from other maintainers and have your changes merged - I'm not here to block your changes but to give honest feedback. I see merit in arguments for static utilities. They do not outweigh the cost in my opinion.\n","I'm mitigated about this as well. I understand well that mockito creates garbage, but they are short lived and **most probably** won't go in the old generation especially in the test phase. Yet the faster the tests are the more developers will run them, it **may** have impacts on big projects. Also design wise I don't like much static methods too.\n\nHowever I don't totally agree with the above points : \n\n> I don't need to read every line of code in the class to find out external couplings realized via static methods. I can see the couplings via fields, I can easily query how the field variable is used, etc.\n\nCoupling appears also in the import section ; static methods are visible there. And modern IDE usually highlight this. IntelliJ even have a warning if import section is too big, just as there's warning if there's too many fields. This point should not be the reason to avoid static methods.\n\n> maintainability of procedural code, static methods that consume static methods, that consume static methods...\n\nHaving instance methods does not protect again procedural code.\n\n---\n\nI believe there's middle ground there : \n- Mockito project contains a lot of small utility stateless objects that are supporting mockito features, these are usually collections tools, reflection tools, those could are good candidate for static methods. Objects like `FieldSetter`, `FieldCopier`, `LenientCopyTool` could be nice candidate for static methods\n- Mockito features could be backed by object instances. Objects like `MockitoCore`, `MockCreationValidator`, `ArgumentMatchingTool` are candidate to stay objects.\n","Exactly the middle ground described by Brice is my motivation for merging most of the PRs. This is also the reason I have not yet merged the MockitoCore PR for this exact reason.\n\nIf an object is not a attribute or parameter, but an internal creation and immediately dismissed, I value a pure function more.\n","Thought: when we switch to Java 8, we can use interfaces with default\nmethods. The switch from static utility to interface is very easy now (just\na couple of text replaces, no method reference modifications).\n\nOn Fri, 12 Aug 2016, 17:23 Brice Dutheil, notifications@github.com wrote:\n\n> I'm mitigated about this as well. I understand well that mockito creates\n> garbage, but they are short lived and _most probably_ won't go in the old\n> generation especially in the test phase. Yet the faster the tests are the\n> more developers will run them, it _may_ have impacts on big projects.\n> Also design wise I don't like much static methods too.\n> \n> However I don't totally agree with the above points :\n> \n> I don't need to read every line of code in the class to find out external\n> couplings realized via static methods. I can see the couplings via fields,\n> I can easily query how the field variable is used, etc.\n> \n> Coupling appears also in the import section ; static methods are visible\n> there. And modern IDE usually highlight this. IntelliJ even have a warning\n> if import section is too big, just as there's warning if there's too many\n> fields. This point should not be the reason to avoid static methods.\n> \n> maintainability of procedural code, static methods that consume static\n> methods, that consume static methods...\n> \n> ## Having instance methods does not protect again procedural code.\n> \n> I believe there's middle ground there :\n> \n> -\n> \n> Mockito project contains a lot of small utility stateless objects that\n> are supporting mockito features, these are usually collections tools,\n> reflection tools, those could are good candidate for static methods.\n> Objects like FieldSetter, FieldCopier, LenientCopyTool could be nice\n> candidate for static methods\n> -\n> \n> Mockito features could be backed by object instances. Objects like\n> MockitoCore, MockCreationValidator, ArgumentMatchingTool are candidate\n> to stay objects.\n> \n> —\n> You are receiving this because you modified the open/close state.\n> Reply to this email directly, view it on GitHub\n> https://github.com/mockito/mockito/issues/426#issuecomment-239476519,\n> or mute the thread\n> https://github.com/notifications/unsubscribe-auth/AFrDb6QVlVesWgPAhurimgSUPQTRcTZSks5qfJALgaJpZM4IzjKm\n> .\n","This feels like a misuse of the default methods.\n","I think you mean static-methods in interfaces here? Default-methods require an instance to be called on.\nAnyway I don't think that it is a good idea. It would a result in an interface that is not intended to be implemented or extended and only serves as container for utility methods. IMHO a class with private constructor is the best construct to do this.\n","> > Thought: when we switch to Java 8, we can use interfaces with default\n> > methods.\n> \n> Default-methods require an instance to be called on.\n\nI was thinking exactly that, default methods in the interface plus instance (either as a separate file or as a singleton declared within the interface).\n","@ChristianSchwarz What do you think to continue the work here with the middle ground described [here](https://github.com/mockito/mockito/issues/426#issuecomment-239476519) ?\n","I am attempting to refactor the MatcherBinder class to a static utility class and am having trouble refactoring the following from MockHandlerImplTest.java: `\r\nhandler.matchersBinder = new MatchersBinder() {\r\n public InvocationMatcher bindMatchers(ArgumentMatcherStorage argumentMatcherStorage, Invocation invocation) {\r\n throw new InvalidUseOfMatchersException();\r\n }\r\n}; `\r\nHow can I maintain the abstract class definition when I am not able to create an object of MatcherBinder?\r\n\r\nAny help is appreciated! ","Let's close this ticket. Refactorings can be done as needed as we work with the code."],"string":"[\n \"@raphw thanks for merging the PR that fast! Would you mind reopening this ticket? There are more classes that can be refactored that way, I would like to extend the list.\\n\",\n \"Big :+1: for me btw, but please keep the pull requests managable and as small as possible. Preferably refactoring 1 method at a time. That way it is a lot easier to review.\\n\",\n \"I agree, there is nothing wrong with multiple PRs, the quick merge is a reaction to an easy overview (and being stuck at an Ukrainian airport without access to the Eurocup).\\n\",\n \"There are still two unit tests failing, could you have a look @ChristianSchwarz - I just had a quick look and there are two unit tests failing which seems related to the way you refactored the previous stubbing of the `Reporter`.\\n\\nI should have checked more thoroughly before merging, hopefully you can fix the problem soon. Alternatively, I will just rollback the one commit (the first one is good) and we can reapply the patch once you fixed the two unit tests. Thank you, really, this was great clean-up.\\n\",\n \"I fixed the one test error. I push it tonight.\\n\\nPS: I also fixed a bug in the stack trace cleaner. Not a biggy but please do not `@Ignore` tests. Especially in big commits, it is easy to miss that single annotation.\\n\",\n \"@raphw Which test(s) is/are failing? I will fix it asap! Too bad that some test fail on a regulare base, is it possible to ignore them in the ide only?\\n\",\n \"You can see the build output here: https://travis-ci.org/mockito/mockito#L254-L269\\n\\nI advise you to run the tests with `./gradlew build`. This should work.\\n\",\n \"@TimvdLippe know what you mean! The next PR's include only one refactored class at a time.\\n\",\n \"I have it all fixed on local but I did not have access to wifi without 22 blocked. Will commit soon.\\n\",\n \"@raphw can you please reopen this issue \\n\",\n \"Sorry, GitHub automatically closes issues that reference a PR.\\n\",\n \"@ChristianSchwarz If a commit contains a comment like \\\"Fixes #426\\\" the mentioned issue is automatically closed by github.\\n\",\n \"@PascalSchumacher Good to know! I will leave it out for the upcoming PR's. Thanks!\\n\",\n \"Now that we are pulling in static methods, I would like to propose a new (linter) rule. To make it easier to read a file, I would like that all methods invoked in the current class are referenced with `this.` (and `super.` for that matter). Therefore if we see `this.verify`, we know it is in the current class and the same object, whereas `verify` references a static method in this class, or an imported static method. Do you agree @mockito/developers ?\\n\",\n \"> I would like that all methods invoked in the current class are referenced with this. (and super. for that matter).\\n\\nTo me it feels like unnecessary/duplicate code cause `this` is implicit. Adding `this.` before every instance call would create a lot more text and would IMHO reduce readability. E.g.:\\n\\n`this.doSometing(this.withPrivateMethod())` vs. `doSomething(withPrivateMethod())`\\n\\n> Therefore if we see this.verify, we know it is in the current class and the same object, whereas verify references a static method in this class, or an imported static method.\\n\\nAn other option avoid ambiguity is to qualify static methods via its class name. This way you can also distinguish which verify(..) is called ( `MockitoCore.verify(..)` / `Mocktio.verify(..)`) , which is not an easy task when a static import is used.\\n\",\n \"I'm not coding too much in Mockito ATM (hopefully now after SpringOne conference I'll have more time) but I fully agree with @ChristianSchwarz . IMO the best solution is to: \\n- omit `this` before method calls. \\n- if necessary provide the class for static method call\\n\",\n \"Respectful -1\\n\\nI like when the class formally declares collaborators instead of calling out to static methods. This makes it easy to reason about the code. I don't need to read every line of code in the class to find out external couplings realized via static methods. I can see the couplings via fields, I can easily query how the field variable is used, etc. Another use case is when we discover missing/incorrect unit test coverage (or we do some larger refactorings) and we cannot easily write tests because code is too procedural.\\n\\nThe benefits for converting to static utilities have minimal significance to me. Yet, there is a downside I care about (e.g. maintainability of procedural code, static methods that consume static methods, that consume static methods...).\\n\\nHence, I down vote this sort of changes. Going down this path, all stateless classes in Mockito would become static utilities :)\\n\\nYou can get +1's from other maintainers and have your changes merged - I'm not here to block your changes but to give honest feedback. I see merit in arguments for static utilities. They do not outweigh the cost in my opinion.\\n\",\n \"I'm mitigated about this as well. I understand well that mockito creates garbage, but they are short lived and **most probably** won't go in the old generation especially in the test phase. Yet the faster the tests are the more developers will run them, it **may** have impacts on big projects. Also design wise I don't like much static methods too.\\n\\nHowever I don't totally agree with the above points : \\n\\n> I don't need to read every line of code in the class to find out external couplings realized via static methods. I can see the couplings via fields, I can easily query how the field variable is used, etc.\\n\\nCoupling appears also in the import section ; static methods are visible there. And modern IDE usually highlight this. IntelliJ even have a warning if import section is too big, just as there's warning if there's too many fields. This point should not be the reason to avoid static methods.\\n\\n> maintainability of procedural code, static methods that consume static methods, that consume static methods...\\n\\nHaving instance methods does not protect again procedural code.\\n\\n---\\n\\nI believe there's middle ground there : \\n- Mockito project contains a lot of small utility stateless objects that are supporting mockito features, these are usually collections tools, reflection tools, those could are good candidate for static methods. Objects like `FieldSetter`, `FieldCopier`, `LenientCopyTool` could be nice candidate for static methods\\n- Mockito features could be backed by object instances. Objects like `MockitoCore`, `MockCreationValidator`, `ArgumentMatchingTool` are candidate to stay objects.\\n\",\n \"Exactly the middle ground described by Brice is my motivation for merging most of the PRs. This is also the reason I have not yet merged the MockitoCore PR for this exact reason.\\n\\nIf an object is not a attribute or parameter, but an internal creation and immediately dismissed, I value a pure function more.\\n\",\n \"Thought: when we switch to Java 8, we can use interfaces with default\\nmethods. The switch from static utility to interface is very easy now (just\\na couple of text replaces, no method reference modifications).\\n\\nOn Fri, 12 Aug 2016, 17:23 Brice Dutheil, notifications@github.com wrote:\\n\\n> I'm mitigated about this as well. I understand well that mockito creates\\n> garbage, but they are short lived and _most probably_ won't go in the old\\n> generation especially in the test phase. Yet the faster the tests are the\\n> more developers will run them, it _may_ have impacts on big projects.\\n> Also design wise I don't like much static methods too.\\n> \\n> However I don't totally agree with the above points :\\n> \\n> I don't need to read every line of code in the class to find out external\\n> couplings realized via static methods. I can see the couplings via fields,\\n> I can easily query how the field variable is used, etc.\\n> \\n> Coupling appears also in the import section ; static methods are visible\\n> there. And modern IDE usually highlight this. IntelliJ even have a warning\\n> if import section is too big, just as there's warning if there's too many\\n> fields. This point should not be the reason to avoid static methods.\\n> \\n> maintainability of procedural code, static methods that consume static\\n> methods, that consume static methods...\\n> \\n> ## Having instance methods does not protect again procedural code.\\n> \\n> I believe there's middle ground there :\\n> \\n> -\\n> \\n> Mockito project contains a lot of small utility stateless objects that\\n> are supporting mockito features, these are usually collections tools,\\n> reflection tools, those could are good candidate for static methods.\\n> Objects like FieldSetter, FieldCopier, LenientCopyTool could be nice\\n> candidate for static methods\\n> -\\n> \\n> Mockito features could be backed by object instances. Objects like\\n> MockitoCore, MockCreationValidator, ArgumentMatchingTool are candidate\\n> to stay objects.\\n> \\n> —\\n> You are receiving this because you modified the open/close state.\\n> Reply to this email directly, view it on GitHub\\n> https://github.com/mockito/mockito/issues/426#issuecomment-239476519,\\n> or mute the thread\\n> https://github.com/notifications/unsubscribe-auth/AFrDb6QVlVesWgPAhurimgSUPQTRcTZSks5qfJALgaJpZM4IzjKm\\n> .\\n\",\n \"This feels like a misuse of the default methods.\\n\",\n \"I think you mean static-methods in interfaces here? Default-methods require an instance to be called on.\\nAnyway I don't think that it is a good idea. It would a result in an interface that is not intended to be implemented or extended and only serves as container for utility methods. IMHO a class with private constructor is the best construct to do this.\\n\",\n \"> > Thought: when we switch to Java 8, we can use interfaces with default\\n> > methods.\\n> \\n> Default-methods require an instance to be called on.\\n\\nI was thinking exactly that, default methods in the interface plus instance (either as a separate file or as a singleton declared within the interface).\\n\",\n \"@ChristianSchwarz What do you think to continue the work here with the middle ground described [here](https://github.com/mockito/mockito/issues/426#issuecomment-239476519) ?\\n\",\n \"I am attempting to refactor the MatcherBinder class to a static utility class and am having trouble refactoring the following from MockHandlerImplTest.java: `\\r\\nhandler.matchersBinder = new MatchersBinder() {\\r\\n public InvocationMatcher bindMatchers(ArgumentMatcherStorage argumentMatcherStorage, Invocation invocation) {\\r\\n throw new InvalidUseOfMatchersException();\\r\\n }\\r\\n}; `\\r\\nHow can I maintain the abstract class definition when I am not able to create an object of MatcherBinder?\\r\\n\\r\\nAny help is appreciated! \",\n \"Let's close this ticket. Refactorings can be done as needed as we work with the code.\"\n]"},"resolved_comments":{"kind":"list like","value":["Formatting again?\n","?\n","I added a new line in order to trigger a new build. The concurrent test are failing on every 2nd run.\n","tab vs. 4x space , fixed...\n"],"string":"[\n \"Formatting again?\\n\",\n \"?\\n\",\n \"I added a new line in order to trigger a new build. The concurrent test are failing on every 2nd run.\\n\",\n \"tab vs. 4x space , fixed...\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-06-15T13:05:28Z","string":"2016-06-15T13:05:28Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"Refactor instance based utility classes to static utility classes"},"problem_statement":{"kind":"string","value":"The internal implementation of Mockito contains numerous helper classed that serve as a container for useful methods. By its nature these classes don't have a state. Currently some them are instance based in other word you need to create the utility class to call a helper method. This not only pollutes the heap but also the code cause instance methods can't be imported statically. \r\n\r\nHere is an example:\r\n\r\n```java\r\nHelper helper = new Helper();\r\nif (helper.isInputValid(input)){\r\n [...] \r\n}\r\n```\r\n\r\nvs. static import of Helper.isInputValid\r\n\r\n```java\r\nif (isInputValid(input)){\r\n [...] \r\n}\r\n```\r\n\r\nThe aim of this ticket is to identify canidates that can be refactored to static utility classes. If you like to refactoring and mockito feel free to send a PR and reference this issue.\r\n\r\nRefactoring canidates:\r\n- [ ] `AccessibilityChanger`\r\n- [ ] `BeanPropertySetter`\r\n- [ ] `ConditionalStackTraceFilter`\r\n- [ ] `FieldCopier`\r\n- [ ] `FieldReader`\r\n- [ ] `GenericMaster` should be integrate into `GenericTypeResolver`\r\n- [ ] `JUnitFailureHacker` can be removed when the deprecated `VerboseMockitoJUnitRunner` is removed\r\n- [ ] `LenientCopyTool`\r\n- [ ] `MatcherBinder`\r\n- [ ] `MockitoCore` should better be a singleton\r\n- [x] `MockCreationValidator`\r\n- [ ] `RemoveFirstLine`\r\n- [x] #591 `ArgumentMatchingTool`\r\n- [x] #515 `AllInvocationsFinder`\r\n- [x] #502 `ArgumentsComparator`\r\n- [x] #540 `ArrayUtils`\r\n- [x] #490 `AtLeastXNumberOfInvocationsChecker`\r\n- [x] #490 `AtLeastXNumberOfInvocationsInOrderChecker`\r\n- [ ] #912 `Constructors`\r\n- [x] #427 `FieldSetter`\r\n- [x] #908 `FriendlyExceptionMaker`\r\n- [x] #431 `HandyReturnValues` \r\n- [x] #432 `InvocationMarker`\r\n- [x] #462 `InvocationsFinder`\r\n- [x] #908 `JUnitDetecter`\r\n- [x] #490 `MissingInvocationChecker`\r\n- [x] #490 `MissingInvocationInOrderChecker`\r\n- [x] #514 `MockUtil`\r\n- [x] #503 `NonGreedyNumberOfInvocationsInOrderChecker`\r\n- [x] #907 `NumberOfInvocationsInOrderChecker`\r\n- [x] #907 `NumberOfInvocationsChecker`\r\n- [x] #547 `ObjectMethodsGuru`\r\n- [x] #427 `Reporter`\r\n- [x] #535 `SuperTypesLastSorter`\r\n- [x] #501 `TestMethodFinder`\r\n- [x] #515 `VerifiableInvocationsFinder`\r\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/invocation/InvocationMarker.java","src/main/java/org/mockito/internal/verification/AtMost.java","src/main/java/org/mockito/internal/verification/Only.java","src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java","src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsInOrderChecker.java","src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java","src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java","src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java"],"string":"[\n \"src/main/java/org/mockito/internal/invocation/InvocationMarker.java\",\n \"src/main/java/org/mockito/internal/verification/AtMost.java\",\n \"src/main/java/org/mockito/internal/verification/Only.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsInOrderChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/invocation/InvocationMarker.java","src/main/java/org/mockito/internal/verification/AtMost.java","src/main/java/org/mockito/internal/verification/Only.java","src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java","src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsInOrderChecker.java","src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java","src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java","src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java"],"string":"[\n \"src/main/java/org/mockito/internal/invocation/InvocationMarker.java\",\n \"src/main/java/org/mockito/internal/verification/AtMost.java\",\n \"src/main/java/org/mockito/internal/verification/Only.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsInOrderChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\",\n \"src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java","src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java\",\n \"src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/invocation/InvocationMarker.java b/src/main/java/org/mockito/internal/invocation/InvocationMarker.java\nindex 882ccf2681..f05a22158b 100644\n--- a/src/main/java/org/mockito/internal/invocation/InvocationMarker.java\n+++ b/src/main/java/org/mockito/internal/invocation/InvocationMarker.java\n@@ -11,22 +11,24 @@\n \n public class InvocationMarker {\n \n- public void markVerified(List invocations, CapturesArgumentsFromInvocation wanted) {\n+ private InvocationMarker(){}\n+\t\n+ public static void markVerified(List invocations, CapturesArgumentsFromInvocation wanted) {\n for (Invocation invocation : invocations) {\n markVerified(invocation, wanted);\n }\n }\n \n- public void markVerified(Invocation invocation, CapturesArgumentsFromInvocation wanted) {\n+ public static void markVerified(Invocation invocation, CapturesArgumentsFromInvocation wanted) {\n invocation.markVerified();\n wanted.captureArgumentsFrom(invocation);\n }\n \n- public void markVerifiedInOrder(List chunk, CapturesArgumentsFromInvocation wanted, InOrderContext context) {\n+ public static void markVerifiedInOrder(List chunk, CapturesArgumentsFromInvocation wanted, InOrderContext context) {\n markVerified(chunk, wanted);\n \n for (Invocation i : chunk) {\n context.markVerified(i);\n }\n }\n-}\n+}\n\\ No newline at end of file\ndiff --git a/src/main/java/org/mockito/internal/verification/AtMost.java b/src/main/java/org/mockito/internal/verification/AtMost.java\nindex 8b5e0eeef9..a47c832949 100644\n--- a/src/main/java/org/mockito/internal/verification/AtMost.java\n+++ b/src/main/java/org/mockito/internal/verification/AtMost.java\n@@ -6,14 +6,13 @@\n package org.mockito.internal.verification;\n \n import static org.mockito.exceptions.Reporter.wantedAtMostX;\n+import static org.mockito.internal.invocation.InvocationMarker.markVerified;\n \n import java.util.Iterator;\n import java.util.List;\n \n-import org.mockito.exceptions.Reporter;\n import org.mockito.exceptions.base.MockitoException;\n import org.mockito.internal.invocation.InvocationMatcher;\n-import org.mockito.internal.invocation.InvocationMarker;\n import org.mockito.internal.invocation.InvocationsFinder;\n import org.mockito.internal.verification.api.VerificationData;\n import org.mockito.invocation.Invocation;\n@@ -22,7 +21,6 @@\n public class AtMost implements VerificationMode {\n \n private final int maxNumberOfInvocations;\n- private final InvocationMarker invocationMarker = new InvocationMarker();\n \n public AtMost(int maxNumberOfInvocations) {\n if (maxNumberOfInvocations < 0) {\n@@ -43,7 +41,7 @@ public void verify(VerificationData data) {\n }\n \n removeAlreadyVerified(found);\n- invocationMarker.markVerified(found, wanted);\n+ markVerified(found, wanted);\n }\n \n @Override\ndiff --git a/src/main/java/org/mockito/internal/verification/Only.java b/src/main/java/org/mockito/internal/verification/Only.java\nindex 04b4bdbfcc..cf7febb8aa 100644\n--- a/src/main/java/org/mockito/internal/verification/Only.java\n+++ b/src/main/java/org/mockito/internal/verification/Only.java\n@@ -6,10 +6,10 @@\n \n import static org.mockito.exceptions.Reporter.noMoreInteractionsWanted;\n import static org.mockito.exceptions.Reporter.wantedButNotInvoked;\n+import static org.mockito.internal.invocation.InvocationMarker.markVerified;\n \n import java.util.List;\n \n-import org.mockito.internal.invocation.InvocationMarker;\n import org.mockito.internal.invocation.InvocationMatcher;\n import org.mockito.internal.invocation.InvocationsFinder;\n import org.mockito.internal.verification.api.VerificationData;\n@@ -19,7 +19,6 @@\n public class Only implements VerificationMode {\n \n private final InvocationsFinder finder = new InvocationsFinder();\n- private final InvocationMarker marker = new InvocationMarker();\n \n @SuppressWarnings(\"unchecked\")\n public void verify(VerificationData data) {\n@@ -33,7 +32,7 @@ public void verify(VerificationData data) {\n if (invocations.size() != 1 || chunk.size() == 0) {\n throw wantedButNotInvoked(wantedMatcher);\n }\n- marker.markVerified(chunk.get(0), wantedMatcher);\n+ markVerified(chunk.get(0), wantedMatcher);\n }\n \n public VerificationMode description(String description) {\ndiff --git a/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java b/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\nindex 4eadb22e85..4a9e5dca7e 100644\n--- a/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\n+++ b/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java\n@@ -6,10 +6,10 @@\n package org.mockito.internal.verification.checkers;\n \n import static org.mockito.exceptions.Reporter.tooLittleActualInvocations;\n+import static org.mockito.internal.invocation.InvocationMarker.markVerified;\n \n import java.util.List;\n \n-import org.mockito.internal.invocation.InvocationMarker;\n import org.mockito.internal.invocation.InvocationMatcher;\n import org.mockito.internal.invocation.InvocationsFinder;\n import org.mockito.invocation.Invocation;\n@@ -18,7 +18,6 @@\n public class AtLeastXNumberOfInvocationsChecker {\n \n InvocationsFinder finder = new InvocationsFinder();\n- InvocationMarker invocationMarker = new InvocationMarker();\n \n public void check(List invocations, InvocationMatcher wanted, int wantedCount) {\n List actualInvocations = finder.findInvocations(invocations, wanted);\n@@ -29,6 +28,6 @@ public void check(List invocations, InvocationMatcher wanted, int wa\n throw tooLittleActualInvocations(new AtLeastDiscrepancy(wantedCount, actualCount), wanted, lastLocation); \n }\n \n- invocationMarker.markVerified(actualInvocations, wanted);\n+ markVerified(actualInvocations, wanted);\n }\n }\n\\ No newline at end of file\ndiff --git a/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsInOrderChecker.java b/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsInOrderChecker.java\nindex c3d7f93cbb..96c61dc43d 100644\n--- a/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsInOrderChecker.java\n+++ b/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsInOrderChecker.java\n@@ -6,10 +6,10 @@\n package org.mockito.internal.verification.checkers;\n \n import static org.mockito.exceptions.Reporter.tooLittleActualInvocationsInOrder;\n+import static org.mockito.internal.invocation.InvocationMarker.markVerifiedInOrder;\n \n import java.util.List;\n \n-import org.mockito.internal.invocation.InvocationMarker;\n import org.mockito.internal.invocation.InvocationMatcher;\n import org.mockito.internal.invocation.InvocationsFinder;\n import org.mockito.internal.verification.api.InOrderContext;\n@@ -19,7 +19,6 @@\n public class AtLeastXNumberOfInvocationsInOrderChecker {\n \n private final InvocationsFinder finder = new InvocationsFinder();\n- private final InvocationMarker invocationMarker = new InvocationMarker();\n private final InOrderContext orderingContext;\n \n public AtLeastXNumberOfInvocationsInOrderChecker(InOrderContext orderingContext) {\n@@ -36,6 +35,6 @@ public void check(List invocations, InvocationMatcher wanted, int wa\n throw tooLittleActualInvocationsInOrder(new AtLeastDiscrepancy(wantedCount, actualCount), wanted, lastLocation);\n }\n \n- invocationMarker.markVerifiedInOrder(chunk, wanted, orderingContext);\n+ markVerifiedInOrder(chunk, wanted, orderingContext);\n }\n }\n\\ No newline at end of file\ndiff --git a/src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java b/src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java\nindex a6c205b06a..6f40481ee8 100644\n--- a/src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java\n+++ b/src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java\n@@ -5,8 +5,11 @@\n \n package org.mockito.internal.verification.checkers;\n \n-import org.mockito.exceptions.Reporter;\n-import org.mockito.internal.invocation.InvocationMarker;\n+import static org.mockito.exceptions.Reporter.tooLittleActualInvocationsInOrder;\n+import static org.mockito.internal.invocation.InvocationMarker.markVerified;\n+\n+import java.util.List;\n+\n import org.mockito.internal.invocation.InvocationMatcher;\n import org.mockito.internal.invocation.InvocationsFinder;\n import org.mockito.internal.reporting.Discrepancy;\n@@ -14,22 +17,16 @@\n import org.mockito.invocation.Invocation;\n import org.mockito.invocation.Location;\n \n-import static org.mockito.exceptions.Reporter.tooLittleActualInvocationsInOrder;\n-\n-import java.util.List;\n-\n public class NonGreedyNumberOfInvocationsInOrderChecker {\n \n private final InvocationsFinder finder;\n- private final InvocationMarker marker;\n \n public NonGreedyNumberOfInvocationsInOrderChecker() {\n- this(new InvocationsFinder(), new InvocationMarker());\n+ this(new InvocationsFinder());\n }\n \n- NonGreedyNumberOfInvocationsInOrderChecker(InvocationsFinder finder, InvocationMarker marker ) {\n+ NonGreedyNumberOfInvocationsInOrderChecker(InvocationsFinder finder ) {\n this.finder = finder;\n- this.marker = marker;\n }\n \n public void check(List invocations, InvocationMatcher wanted, int wantedCount, InOrderContext context) {\n@@ -40,7 +37,7 @@ public void check(List invocations, InvocationMatcher wanted, int wa\n if( next == null ){\n throw tooLittleActualInvocationsInOrder(new Discrepancy(wantedCount, actualCount), wanted, lastLocation );\n }\n- marker.markVerified( next, wanted );\n+ markVerified( next, wanted );\n context.markVerified( next );\n lastLocation = next.getLocation();\n actualCount++;\ndiff --git a/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java b/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\nindex 7b277e880b..15c7594a47 100644\n--- a/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\n+++ b/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java\n@@ -8,10 +8,10 @@\n import static org.mockito.exceptions.Reporter.neverWantedButInvoked;\n import static org.mockito.exceptions.Reporter.tooLittleActualInvocations;\n import static org.mockito.exceptions.Reporter.tooManyActualInvocations;\n+import static org.mockito.internal.invocation.InvocationMarker.markVerified;\n \n import java.util.List;\n \n-import org.mockito.internal.invocation.InvocationMarker;\n import org.mockito.internal.invocation.InvocationMatcher;\n import org.mockito.internal.invocation.InvocationsFinder;\n import org.mockito.internal.reporting.Discrepancy;\n@@ -21,8 +21,6 @@\n public class NumberOfInvocationsChecker {\n \n private final InvocationsFinder finder=new InvocationsFinder();\n- private final InvocationMarker invocationMarker = new InvocationMarker();\n-\n \n public void check(List invocations, InvocationMatcher wanted, int wantedCount) {\n List actualInvocations = finder.findInvocations(invocations, wanted);\n@@ -41,6 +39,6 @@ public void check(List invocations, InvocationMatcher wanted, int wa\n throw tooManyActualInvocations(wantedCount, actualCount, wanted, firstUndesired);\n }\n \n- invocationMarker.markVerified(actualInvocations, wanted);\n+ markVerified(actualInvocations, wanted);\n }\n }\n\\ No newline at end of file\ndiff --git a/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java b/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java\nindex 5063955968..c9a769546d 100644\n--- a/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java\n+++ b/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java\n@@ -7,10 +7,10 @@\n \n import static org.mockito.exceptions.Reporter.tooLittleActualInvocationsInOrder;\n import static org.mockito.exceptions.Reporter.tooManyActualInvocationsInOrder;\n+import static org.mockito.internal.invocation.InvocationMarker.markVerifiedInOrder;\n \n import java.util.List;\n \n-import org.mockito.internal.invocation.InvocationMarker;\n import org.mockito.internal.invocation.InvocationMatcher;\n import org.mockito.internal.invocation.InvocationsFinder;\n import org.mockito.internal.reporting.Discrepancy;\n@@ -19,10 +19,8 @@\n import org.mockito.invocation.Location;\n \n public class NumberOfInvocationsInOrderChecker {\n- \n \n private final InvocationsFinder finder;\n- private final InvocationMarker invocationMarker = new InvocationMarker();\n \n public NumberOfInvocationsInOrderChecker() {\n this(new InvocationsFinder());\n@@ -30,7 +28,6 @@ public NumberOfInvocationsInOrderChecker() {\n \n NumberOfInvocationsInOrderChecker(InvocationsFinder finder) {\n this.finder = finder;\n- \n }\n \n public void check(List invocations, InvocationMatcher wanted, int wantedCount, InOrderContext context) {\n@@ -47,6 +44,6 @@ public void check(List invocations, InvocationMatcher wanted, int wa\n throw tooManyActualInvocationsInOrder(wantedCount, actualCount, wanted, firstUndesired);\n }\n \n- invocationMarker.markVerifiedInOrder(chunk, wanted, context);\n+ markVerifiedInOrder(chunk, wanted, context);\n }\n }\n\\ No newline at end of file\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java b/src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java\nindex d85320c485..777e76b517 100644\n--- a/src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java\n+++ b/src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java\n@@ -17,13 +17,12 @@ public class InvocationMarkerTest extends TestBase {\n @Test\n public void shouldMarkInvocationAsVerified() {\n //given\n- InvocationMarker marker = new InvocationMarker();\n Invocation i = new InvocationBuilder().toInvocation();\n InvocationMatcher im = new InvocationBuilder().toInvocationMatcher();\n assertFalse(i.isVerified());\n \n //when\n- marker.markVerified(Arrays.asList(i), im);\n+ InvocationMarker.markVerified(Arrays.asList(i), im);\n \n //then\n assertTrue(i.isVerified());\n@@ -32,7 +31,6 @@ public void shouldMarkInvocationAsVerified() {\n @Test\n public void shouldCaptureArguments() {\n //given\n- InvocationMarker marker = new InvocationMarker();\n Invocation i = new InvocationBuilder().toInvocation();\n final ObjectBox box = new ObjectBox();\n CapturesArgumentsFromInvocation c = new CapturesArgumentsFromInvocation() {\n@@ -41,7 +39,7 @@ public void captureArgumentsFrom(Invocation i) {\n }};\n \n //when\n- marker.markVerified(Arrays.asList(i), c);\n+ InvocationMarker.markVerified(Arrays.asList(i), c);\n \n //then\n assertEquals(i, box.getObject());\n@@ -51,14 +49,14 @@ public void captureArgumentsFrom(Invocation i) {\n public void shouldMarkInvocationsAsVerifiedInOrder() {\n //given\n InOrderContextImpl context = new InOrderContextImpl();\n- InvocationMarker marker = new InvocationMarker();\n+ \n Invocation i = new InvocationBuilder().toInvocation();\n InvocationMatcher im = new InvocationBuilder().toInvocationMatcher();\n assertFalse(context.isVerified(i));\n assertFalse(i.isVerified());\n \n //when\n- marker.markVerifiedInOrder(Arrays.asList(i), im, context);\n+ InvocationMarker.markVerifiedInOrder(Arrays.asList(i), im, context);\n \n //then\n assertTrue(context.isVerified(i));\ndiff --git a/src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java b/src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java\nindex 9dfb7ca1c7..9e318a4611 100644\n--- a/src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java\n+++ b/src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java\n@@ -5,22 +5,20 @@\n package org.mockito.internal.verification.checkers;\n \n import static java.util.Arrays.asList;\n-import static org.mockito.Matchers.any;\n-import static org.mockito.Matchers.eq;\n+import static org.assertj.core.api.Assertions.assertThat;\n \n import org.junit.Test;\n-import org.mockito.Mockito;\n-import org.mockito.internal.invocation.*;\n+import org.mockito.internal.invocation.InvocationBuilder;\n+import org.mockito.internal.invocation.InvocationMatcher;\n import org.mockito.invocation.Invocation;\n-import org.mockitoutil.TestBase;\n \n-public class AtLeastXNumberOfInvocationsCheckerTest extends TestBase {\n+public class AtLeastXNumberOfInvocationsCheckerTest {\n \n @Test\n public void shouldMarkActualInvocationsAsVerified() {\n //given\n AtLeastXNumberOfInvocationsChecker c = new AtLeastXNumberOfInvocationsChecker();\n- c.invocationMarker = Mockito.mock(InvocationMarker.class);\n+ \n Invocation invocation = new InvocationBuilder().simpleMethod().toInvocation();\n Invocation invocationTwo = new InvocationBuilder().differentMethod().toInvocation();\n \n@@ -28,6 +26,6 @@ public void shouldMarkActualInvocationsAsVerified() {\n c.check(asList(invocation, invocationTwo), new InvocationMatcher(invocation), 1);\n \n //then\n- Mockito.verify(c.invocationMarker).markVerified(eq(asList(invocation)), any(CapturesArgumentsFromInvocation.class));\n+ assertThat(invocation.isVerified()).isTrue();\n }\n }\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-06-14T00:01:34","string":"2016-06-14T00:01:34"},"issue_created_at":{"kind":"timestamp","value":"2016-06-11T13:23:18Z","string":"2016-06-11T13:23:18Z"},"issue_by_user":{"kind":"string","value":"ChristianSchwarz"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":469,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/438_444"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/438"},"pr_id":{"kind":"string","value":"mockito/mockito/444"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=0.0, similarity=0.9620624077314136)","keyword_pr_to_issue"],"string":"[\n \"timestamp(timedelta=0.0, similarity=0.9620624077314136)\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"d6480148b28defa299b25230abe7f463f850350a"},"merge_commit":{"kind":"string","value":"e75b07853f855e2ae990a87a2cd50b971eed7cff"},"hints_text":{"kind":"list like","value":["@smoyer64 I think that is a reasonable addition. Do you maybe have a sample JUnit test case that I can add to our test suite as regression test?\n","@TimvdLippe,\n\nWill this change be going into Mockito 1.x or 2.x (or both)?\n","@sbrannen Mockito 2.0. We might be able to port back to Mockito 1.x but I would prefer not to. Is there an explicit requirement for this change to be included in 1.x?\n","Regarding a regression test, this should do the job!\n\n``` java\nimport static org.junit.Assert.assertTrue;\n\nimport java.lang.reflect.Field;\nimport java.lang.reflect.Method;\n\nimport org.junit.Test;\nimport org.mockito.Mock;\n\n/**\n * It's actually sufficient if this class compiles. The test methods\n * are therefore a bit superfluous.\n *\n * @author Sam Brannen\n */\npublic class MockAnnotationDeclarationTests {\n\n @Mock\n String foo;\n\n void bar(@Mock String baz) {\n }\n\n @Test\n public void mockAnnotationCanBeDeclaredOnField() throws Exception {\n Field field = getClass().getDeclaredField(\"foo\");\n assertTrue(field.isAnnotationPresent(Mock.class));\n }\n\n @Test\n public void mockAnnotationCanBeDeclaredOnParameter() throws Exception {\n Method method = getClass().getDeclaredMethod(\"bar\", String.class);\n assertTrue(method.getParameters()[0].isAnnotationPresent(Mock.class));\n }\n\n}\n```\n\nSo feel free to use that.\n\nCheers,\n\nSam\n","@TimvdLippe,\n\nI don't suppose there is an explicit _requirement_ per se to have this support in 1.x; however, I feel it could well benefit 1.x users who also wish to use JUnit 5. Furthermore, I cannot foresee any possible negative side effects for 1.x users: it's 100% backwards compatible.\n","I do not think we really have an infrastructure to still publish Mockito 1 artifacts. We did however not change much in 2 and 99% of all Mockito code should run as expected after updating. Mainly, we removed deprecated code that people had years to upgrade.\n\nI think adding this should be okay even though there is no scenario where Mockito itself would process the annotation. Would adding an annotation to the JUnit plugin not be another altivertive? I wonder if that was a cleaner solution.\n","> Would adding an annotation to the JUnit plugin not be another altivertive? I wonder if that was a cleaner solution.\n\nIntroducing a new annotation in Mockito's official JUnit 5 support is of course technically possible -- that's what our proof-of-concept `MockitoExtension` does today (i.e., we created an `@InjectMock` annotation).\n\nBut... I don't think I would call that a _cleaner solution_. IMHO, a single annotation from Mockito would be the cleanest solution since it would result in the **element of least surprise** for users of Mockito.\n\nFWIW, we have already hashed out the [exact same discussion for the Spring Framework](https://jira.spring.io/browse/SPR-14057) with regard to Spring's `@Autowired` annotation. Previously, it was not allowed to be declared on a constructor or method parameter, but we changed this for Spring 4.3.\n","Ok, considering that JUnit and Mockito is such a common combination, let's just make it as easy as possible.\n","Sounds good! 👍 \n","Wow ... a lot of work got done while I was out celebrating Father's Day. From a user's perspective, this all looks perfect. How often do you get everything you ask for? I guess I have one final question which, since this issue is closed, is more academic - where should an official, production ready MockitoExtension for JUnit 5 be hosted? MockitoJunit is obviously part of the Mockito project and the MokitoExtension will always rely on both Mockito and JUnit 5.\n\nMaintaining the status quo would be fine, but it might also make sense to create a junit5-extensions project for \"common combinations\" (using the wording above), where a combination of project maintainers could collaborate on code that is essentially the intersection of their projects? External Extensions and TestEngines are going to be documented in the JUnit 5 wiki per issue https://github.com/junit-team/junit5/issues/297 and, given the collaboration demonstrated by this thread, maybe the whole question is moot.\n\nIn any case, thanks for all the hard work that's gone into both projects!\n","@smoyer64 You got lucky we are working hard on releasing Mockito 2.0 :smile: \n\nI am not sure what the stance is of the JUnit team regarding such extensions. Could you open an issue on JUnit5 to discuss where such extensions should be placed?\n","@TimvdLippe \n\nThe question has been posed to the JUnit 5 team in issue https://github.com/junit-team/junit5/issues/321. @sbrannen is a member of that team, so I'm guessing he's already seen the question ;). And I'm just one of those pesky users (trying to help identify use cases and stress-test the new code)!\n","Thanks a lot. Looking forward to their response.\n"],"string":"[\n \"@smoyer64 I think that is a reasonable addition. Do you maybe have a sample JUnit test case that I can add to our test suite as regression test?\\n\",\n \"@TimvdLippe,\\n\\nWill this change be going into Mockito 1.x or 2.x (or both)?\\n\",\n \"@sbrannen Mockito 2.0. We might be able to port back to Mockito 1.x but I would prefer not to. Is there an explicit requirement for this change to be included in 1.x?\\n\",\n \"Regarding a regression test, this should do the job!\\n\\n``` java\\nimport static org.junit.Assert.assertTrue;\\n\\nimport java.lang.reflect.Field;\\nimport java.lang.reflect.Method;\\n\\nimport org.junit.Test;\\nimport org.mockito.Mock;\\n\\n/**\\n * It's actually sufficient if this class compiles. The test methods\\n * are therefore a bit superfluous.\\n *\\n * @author Sam Brannen\\n */\\npublic class MockAnnotationDeclarationTests {\\n\\n @Mock\\n String foo;\\n\\n void bar(@Mock String baz) {\\n }\\n\\n @Test\\n public void mockAnnotationCanBeDeclaredOnField() throws Exception {\\n Field field = getClass().getDeclaredField(\\\"foo\\\");\\n assertTrue(field.isAnnotationPresent(Mock.class));\\n }\\n\\n @Test\\n public void mockAnnotationCanBeDeclaredOnParameter() throws Exception {\\n Method method = getClass().getDeclaredMethod(\\\"bar\\\", String.class);\\n assertTrue(method.getParameters()[0].isAnnotationPresent(Mock.class));\\n }\\n\\n}\\n```\\n\\nSo feel free to use that.\\n\\nCheers,\\n\\nSam\\n\",\n \"@TimvdLippe,\\n\\nI don't suppose there is an explicit _requirement_ per se to have this support in 1.x; however, I feel it could well benefit 1.x users who also wish to use JUnit 5. Furthermore, I cannot foresee any possible negative side effects for 1.x users: it's 100% backwards compatible.\\n\",\n \"I do not think we really have an infrastructure to still publish Mockito 1 artifacts. We did however not change much in 2 and 99% of all Mockito code should run as expected after updating. Mainly, we removed deprecated code that people had years to upgrade.\\n\\nI think adding this should be okay even though there is no scenario where Mockito itself would process the annotation. Would adding an annotation to the JUnit plugin not be another altivertive? I wonder if that was a cleaner solution.\\n\",\n \"> Would adding an annotation to the JUnit plugin not be another altivertive? I wonder if that was a cleaner solution.\\n\\nIntroducing a new annotation in Mockito's official JUnit 5 support is of course technically possible -- that's what our proof-of-concept `MockitoExtension` does today (i.e., we created an `@InjectMock` annotation).\\n\\nBut... I don't think I would call that a _cleaner solution_. IMHO, a single annotation from Mockito would be the cleanest solution since it would result in the **element of least surprise** for users of Mockito.\\n\\nFWIW, we have already hashed out the [exact same discussion for the Spring Framework](https://jira.spring.io/browse/SPR-14057) with regard to Spring's `@Autowired` annotation. Previously, it was not allowed to be declared on a constructor or method parameter, but we changed this for Spring 4.3.\\n\",\n \"Ok, considering that JUnit and Mockito is such a common combination, let's just make it as easy as possible.\\n\",\n \"Sounds good! 👍 \\n\",\n \"Wow ... a lot of work got done while I was out celebrating Father's Day. From a user's perspective, this all looks perfect. How often do you get everything you ask for? I guess I have one final question which, since this issue is closed, is more academic - where should an official, production ready MockitoExtension for JUnit 5 be hosted? MockitoJunit is obviously part of the Mockito project and the MokitoExtension will always rely on both Mockito and JUnit 5.\\n\\nMaintaining the status quo would be fine, but it might also make sense to create a junit5-extensions project for \\\"common combinations\\\" (using the wording above), where a combination of project maintainers could collaborate on code that is essentially the intersection of their projects? External Extensions and TestEngines are going to be documented in the JUnit 5 wiki per issue https://github.com/junit-team/junit5/issues/297 and, given the collaboration demonstrated by this thread, maybe the whole question is moot.\\n\\nIn any case, thanks for all the hard work that's gone into both projects!\\n\",\n \"@smoyer64 You got lucky we are working hard on releasing Mockito 2.0 :smile: \\n\\nI am not sure what the stance is of the JUnit team regarding such extensions. Could you open an issue on JUnit5 to discuss where such extensions should be placed?\\n\",\n \"@TimvdLippe \\n\\nThe question has been posed to the JUnit 5 team in issue https://github.com/junit-team/junit5/issues/321. @sbrannen is a member of that team, so I'm guessing he's already seen the question ;). And I'm just one of those pesky users (trying to help identify use cases and stress-test the new code)!\\n\",\n \"Thanks a lot. Looking forward to their response.\\n\"\n]"},"resolved_comments":{"kind":"list like","value":["Awesome! 👍 \n"],"string":"[\n \"Awesome! 👍 \\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-06-19T12:08:08Z","string":"2016-06-19T12:08:08Z"},"labeled_as":{"kind":"list like","value":["enhancement"],"string":"[\n \"enhancement\"\n]"},"problem_title":{"kind":"string","value":"Add ElementType.PARAMETER to @Mock"},"problem_statement":{"kind":"string","value":"Parameterized tests are becoming more common - JUnit 5 explicitly allows parameters and the sample [MockitoExtension](https://github.com/junit-team/junit5-samples/tree/master/junit5-mockito-extension/src/main/java/com/example/mockito) currently includes an @InjectMock to trigger the creation of a mock parameter. It would be so much cleaner to use @Mock in both places.\n\nThis shouldn't be an issue for most legacy test systems since they don't allow test parameters (by default). \n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/Mock.java"],"string":"[\n \"src/main/java/org/mockito/Mock.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/Mock.java"],"string":"[\n \"src/main/java/org/mockito/Mock.java\"\n]"},"test_files":{"kind":"list like","value":[],"string":"[]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/Mock.java b/src/main/java/org/mockito/Mock.java\nindex 91cb0538c8..2988cb2cba 100644\n--- a/src/main/java/org/mockito/Mock.java\n+++ b/src/main/java/org/mockito/Mock.java\n@@ -9,6 +9,7 @@\n import java.lang.annotation.Target;\n \n import static java.lang.annotation.ElementType.FIELD;\n+import static java.lang.annotation.ElementType.PARAMETER;\n import static java.lang.annotation.RetentionPolicy.RUNTIME;\n \n /**\n@@ -58,7 +59,7 @@\n * @see MockitoAnnotations#initMocks(Object)\n * @see org.mockito.runners.MockitoJUnitRunner\n */\n-@Target(FIELD)\n+@Target({FIELD, PARAMETER})\n @Retention(RUNTIME)\n @Documented\n public @interface Mock {\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-06-19T13:43:27","string":"2016-06-19T13:43:27"},"issue_created_at":{"kind":"timestamp","value":"2016-06-18T17:10:29Z","string":"2016-06-18T17:10:29Z"},"issue_by_user":{"kind":"string","value":"smoyer64"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":470,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/453_454"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/453"},"pr_id":{"kind":"string","value":"mockito/mockito/454"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"ce957844a9adc8403434ccf893b9d68d047573e9"},"merge_commit":{"kind":"string","value":"9af742d476dbfc746e2cb09698af3524c96b49ec"},"hints_text":{"kind":"list like","value":["I can't imagine a scenario where the parameterized type cause problems and why it aids debuging if no type parameter is used.\n\n@all Do we have examples that illustrate the described problem? If not the JavaDoc should be removed!\n","#454 is one way we could wrap this up. Sorry for not noticing it sooner!\n","If we receive such a report, we should catch such an exception and log an appropriate error why this is happening. For now I can't see this breaking, but I am happy to be proven wrong.\n"],"string":"[\n \"I can't imagine a scenario where the parameterized type cause problems and why it aids debuging if no type parameter is used.\\n\\n@all Do we have examples that illustrate the described problem? If not the JavaDoc should be removed!\\n\",\n \"#454 is one way we could wrap this up. Sorry for not noticing it sooner!\\n\",\n \"If we receive such a report, we should catch such an exception and log an appropriate error why this is happening. For now I can't see this breaking, but I am happy to be proven wrong.\\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-06-21T08:23:44Z","string":"2016-06-21T08:23:44Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"Either revert recent Functional Interfaces change or change JavaDoc"},"problem_statement":{"kind":"string","value":"I've been reading the Javadoc regarding `ArgumentMatcher` and I noticed a couple of things. Relating back to the changes of #338 \n- The example of how to override it is still based around `Object` rather than `T`\n- Someone has very deliberately decided not to make it use `T` in the past and now we've changed that.\n\n> The argument is not using the generic type in order to force explicit casting in the implementation. This way it is easier to debug when incompatible arguments are passed to the matchers. You have to trust us on this one. If we used parametrized type then ClassCastException would be thrown in certain scenarios.\n\nMy view at the time was that changing it to `T` would remove the class casting and that this would be a good thing. It was kind of necessary to have it as `T` so that the lambda expressions in Java 8 could infer the right types.\n\nThe rationale about a class cast exception giving weird results kind of makes sense, but does that really really happen? It seems it's either solve one problem or the other.\n\nWhat do folks think? I'll happily amend the code either way.\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/ArgumentMatcher.java"],"string":"[\n \"src/main/java/org/mockito/ArgumentMatcher.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/ArgumentMatcher.java"],"string":"[\n \"src/main/java/org/mockito/ArgumentMatcher.java\"\n]"},"test_files":{"kind":"list like","value":[],"string":"[]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/ArgumentMatcher.java b/src/main/java/org/mockito/ArgumentMatcher.java\nindex 3b2e3d19c4..8b9abd0ce4 100644\n--- a/src/main/java/org/mockito/ArgumentMatcher.java\n+++ b/src/main/java/org/mockito/ArgumentMatcher.java\n@@ -35,6 +35,8 @@\n * Useful if you already have a hamcrest matcher. Reuse and win!\n * Note that {@link org.mockito.hamcrest.MockitoHamcrest#argThat(org.hamcrest.Matcher)} demonstrates NullPointerException auto-unboxing caveat.\n * \n+ * Java 8 only - use a lambda in place of an {@link ArgumentMatcher} since {@link ArgumentMatcher}\n+ * is effectively a functional interface. A lambda can be used with the {@link Mockito#argThat} method. \n * \n *\n * \n@@ -44,8 +46,8 @@\n *\n *
\n * class ListOfTwoElements implements ArgumentMatcher<List> {\n- * public boolean matches(Object list) {\n- * return ((List) list).size() == 2;\n+ * public boolean matches(List list) {\n+ * return list.size() == 2;\n * }\n * public String toString() {\n * //printed in verification errors\n@@ -93,6 +95,7 @@\n * b) Use org.mockito.hamcrest.MockitoHamcrest.argThat() instead of Mockito.argThat().\n * Ensure that there is hamcrest dependency on classpath\n * (Mockito does not depend on hamcrest any more).\n+ *\n * \n * \n * What option is right for you? If you don't mind compile dependency to hamcrest\n@@ -111,22 +114,6 @@ public interface ArgumentMatcher {\n * The method should never assert if the argument doesn't match. It\n * should only return false.\n * \n- * The argument is not using the generic type in order to force explicit casting in the implementation.\n- * This way it is easier to debug when incompatible arguments are passed to the matchers.\n- * You have to trust us on this one. If we used parametrized type then ClassCastException\n- * would be thrown in certain scenarios.\n- * For example:\n- *\n- *
\n- * //test, method accepts Collection argument and ArgumentMatcher<List> is used\n- * when(mock.useCollection(someListMatcher())).thenDoNothing();\n- *\n- * //production code, yields confusing ClassCastException\n- * //although Set extends Collection but is not compatible with ArgumentMatcher<List>\n- * mock.useCollection(new HashSet());\n- * \n * See the example in the top level javadoc for {@link ArgumentMatcher}\n *\n * @param argument\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"val"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-06-20T00:57:18","string":"2016-06-20T00:57:18"},"issue_created_at":{"kind":"timestamp","value":"2016-06-20T19:33:24Z","string":"2016-06-20T19:33:24Z"},"issue_by_user":{"kind":"string","value":"ashleyfrieze"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":471,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/226_481"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/226"},"pr_id":{"kind":"string","value":"mockito/mockito/481"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=0.0, similarity=0.932913327674623)","keyword_pr_to_issue"],"string":"[\n \"timestamp(timedelta=0.0, similarity=0.932913327674623)\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"1eddf98e096c8d55a4f5a0bc08947003e9448c81"},"merge_commit":{"kind":"string","value":"b0393eafeeb81b6c75e40a82b81672543777ca9a"},"hints_text":{"kind":"list like","value":["Great idea.\n"],"string":"[\n \"Great idea.\\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-07-06T11:02:06Z","string":"2016-07-06T11:02:06Z"},"labeled_as":{"kind":"list like","value":["docs","continuous integration"],"string":"[\n \"docs\",\n \"continuous integration\"\n]"},"problem_title":{"kind":"string","value":"Exclude internal package from javadoc"},"problem_statement":{"kind":"string","value":"Internal package don't need to be included in the javadoc generation, just like the jdk doesn't have `com.sun` package\n\nIn the javadoc that may be done via a doclet since `exclude '**/internal/**'` raise javadoc errors\n\n``` groovy\ndoclet = \"qualified.name.of.DocletExclude\"\ndocletpath = [rootProject.file('./gradle/doclet-exclude.jar')]\n```\n"},"gold_files":{"kind":"list like","value":["buildSrc/build.gradle","gradle/javadoc.gradle","gradle/wrapper/gradle-wrapper.properties"],"string":"[\n \"buildSrc/build.gradle\",\n \"gradle/javadoc.gradle\",\n \"gradle/wrapper/gradle-wrapper.properties\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["buildSrc/build.gradle","buildSrc/src/main/java/org/mockito/javadoc/JavadocExclude.java","gradle/javadoc.gradle","gradle/wrapper/gradle-wrapper.properties"],"string":"[\n \"buildSrc/build.gradle\",\n \"buildSrc/src/main/java/org/mockito/javadoc/JavadocExclude.java\",\n \"gradle/javadoc.gradle\",\n \"gradle/wrapper/gradle-wrapper.properties\"\n]"},"test_files":{"kind":"list like","value":[],"string":"[]"},"gold_patch":{"kind":"string","value":"diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle\nindex 28c2cd953a..6720ba5a90 100644\n--- a/buildSrc/build.gradle\n+++ b/buildSrc/build.gradle\n@@ -8,6 +8,7 @@ dependencies {\n //TODO SF use jcabi to edit issues after the release so that they have the milestone attached\n //compile \"com.jcabi:jcabi-github:0.17\"\n compile \"com.googlecode.json-simple:json-simple:1.1.1@jar\"\n+ compile files(\"${System.properties['java.home']}/../lib/tools.jar\")\n testCompile(\"org.spockframework:spock-core:0.7-groovy-2.0\") {\n exclude module: \"groovy-all\"\n }\ndiff --git a/buildSrc/src/main/java/org/mockito/javadoc/JavadocExclude.java b/buildSrc/src/main/java/org/mockito/javadoc/JavadocExclude.java\nnew file mode 100644\nindex 0000000000..3464f0b426\n--- /dev/null\n+++ b/buildSrc/src/main/java/org/mockito/javadoc/JavadocExclude.java\n@@ -0,0 +1,70 @@\n+package org.mockito.javadoc;\n+\n+import com.sun.javadoc.*;\n+import com.sun.tools.doclets.formats.html.HtmlDoclet;\n+\n+import java.lang.reflect.InvocationHandler;\n+import java.lang.reflect.Method;\n+import java.lang.reflect.Proxy;\n+import java.util.ArrayList;\n+import java.util.List;\n+\n+/**\n+ * Doclet built to exclude mockito internal packages from the outputted Javadoc.\n+ * All methods except the start method are copied from {@link com.sun.tools.doclets.standard.Standard}.\n+ * Inspired by https://gist.github.com/benjchristensen/1410681\n+ */\n+public class JavadocExclude {\n+\n+ public static int optionLength(String var0) {\n+ return HtmlDoclet.optionLength(var0);\n+ }\n+\n+ public static boolean start(RootDoc root) {\n+ Class clz = root.getClass();\n+ return HtmlDoclet.start((RootDoc) Proxy.newProxyInstance(clz.getClassLoader(), clz.getInterfaces(), new ExcludeHandler(root)));\n+ }\n+\n+ public static boolean validOptions(String[][] var0, DocErrorReporter var1) {\n+ return HtmlDoclet.validOptions(var0, var1);\n+ }\n+\n+ public static LanguageVersion languageVersion() {\n+ return HtmlDoclet.languageVersion();\n+ }\n+\n+ /**\n+ * Proxy which filters the {@link RootDoc#classes()} method to filter {@link ClassDoc} based on their package name.\n+ */\n+ private static class ExcludeHandler implements InvocationHandler {\n+ private final RootDoc root;\n+\n+ private ExcludeHandler(RootDoc root) {\n+ this.root = root;\n+ }\n+\n+ @Override\n+ public Object invoke(Object o, Method method, Object[] args) throws Throwable {\n+ Object result = method.invoke(root, args);\n+ if (result instanceof Object[]) {\n+ List filteredDocs = new ArrayList();\n+ Object[] array = (Object[]) result;\n+ for (Object entry : array) {\n+ if (entry instanceof ClassDoc) {\n+ ClassDoc doc = (ClassDoc) entry;\n+ if (!doc.containingPackage().name().startsWith(\"org.mockito.internal\")) {\n+ filteredDocs.add(doc);\n+ }\n+ }\n+ }\n+ // If no ClassDoc were found in the original array,\n+ // since PackageDoc area also included in the classes array.\n+ if (filteredDocs.size() > 0) {\n+ ClassDoc[] docArray = new ClassDoc[filteredDocs.size()];\n+ return filteredDocs.toArray(docArray);\n+ }\n+ }\n+ return result;\n+ }\n+ }\n+}\ndiff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle\nindex 4d5daa5d43..51f4cd4e1d 100644\n--- a/gradle/javadoc.gradle\n+++ b/gradle/javadoc.gradle\n@@ -14,6 +14,8 @@ task mockitoJavadoc(type: Javadoc) {\n title = \"Mockito ${project.version} API\"\n def javadocJdk6Hack = \"jdk6-project-version-insert.min.js\"\n \n+ options.doclet \"org.mockito.javadoc.JavadocExclude\"\n+ options.docletpath = [rootProject.file('./buildSrc/build/classes/main/')]\n options.docTitle = \"\"\"\"\"\"\n options.windowTitle = \"Mockito ${project.version} API\"\n options.group(\"Main package\", [\"org.mockito\"])\ndiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties\nindex 80cbe6ead4..0b5a32f1e1 100644\n--- a/gradle/wrapper/gradle-wrapper.properties\n+++ b/gradle/wrapper/gradle-wrapper.properties\n@@ -1,6 +1,6 @@\n-#Sun Mar 09 16:13:07 CET 2016\n+#Wed Jul 06 11:31:59 CEST 2016\n distributionBase=GRADLE_USER_HOME\n distributionPath=wrapper/dists\n zipStoreBase=GRADLE_USER_HOME\n zipStorePath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-2.11-bin.zip\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-2.11-all.zip\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"val"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-07-05T17:03:31","string":"2016-07-05T17:03:31"},"issue_created_at":{"kind":"timestamp","value":"2015-06-06T21:23:36Z","string":"2015-06-06T21:23:36Z"},"issue_by_user":{"kind":"string","value":"bric3"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":472,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/123_483"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/123"},"pr_id":{"kind":"string","value":"mockito/mockito/483"},"linking_methods":{"kind":"list like","value":["keyword_issue_to_pr","keyword_pr_to_issue"],"string":"[\n \"keyword_issue_to_pr\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"d01911eb9040d21ba6763dfb90c5210bb480e1b9"},"merge_commit":{"kind":"string","value":"80ab0db765138a57b105c7a64676ebc38cb94f35"},"hints_text":{"kind":"list like","value":["Is it still planned for 2.0 to give users an option to use an alternative to cglib (like Byte Buddy)?\n","This kind of feature can be added any time (e.g. it's not a backwards-incompatible change). It's just someone needs to implement it :) \n\nSo short answer is 'no', it's not planned for 2.0 (but I would love to have this feature soon)\n","If possible I would really like to replace CGLIB by bytebuddy.\n\nI wanted to craft an external MockMaker but I'm way too much overwhelmed at the moment. The code exists in my clone though.\n","@bric3, you mean that you're keen on changing default proxy mechanism in 2.0? I'm fine with this :) I do want to publish 2.0 this year though and I won't be very active it this part of the code. So, if you make it, it can be included :)\n","@szczepiq You mean by the end of 2014 ?\n\nWhat I hoped was to build a mockmaker that could be tested on the 1.x. But the code may replace CGLIB now if necessary. Beta have to be tested by other people though, I especially think about uncommon environment like OSGI, etc...\n","1>You mean by the end of 2014 ?\n\nhaha, yeah ;)\n\n> What I hoped was to build a mockmaker that could be tested on the 1.x.\n\nLike an opt-in feature for 1.x?\n\nI definitely think that given we have the bytebuddy impl of MockMaker, we\nshould make it conveniently pluggable instead of just replacing cglib\ncompletely. You mentioned earlier that you had the ByteBuddy MockMaker\nworking with Mockito test suite?\n\nCheers!\n\nOn Mon, Nov 24, 2014 at 4:18 PM, Brice Dutheil notifications@github.com\nwrote:\n\n> You mean by the end of 2014 ?\n> \n> What I hoped was to build a mockmaker that could be tested on the 1.x. But\n> the code may replace CGLIB now if necessary. Beta have to be tested by\n> other people though, I especially think about uncommon environment like\n> OSGI, etc...\n> \n> ## \n> \n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/123#issuecomment-64208043.\n\n## \n\nSzczepan Faber\nCore dev@gradle; Founder@mockito\n","> > What I hoped was to build a mockmaker that could be tested on the 1.x.\n> \n> Like an opt-in feature for 1.x?\n\nYes. But, meanwhile replacing CGLIB in mockito 2.0.\n\n> You mentioned earlier that you had the ByteBuddy MockMaker working with Mockito test suite?\n\nYes it does. I just would like to ensure it works with uncommon environment like OSGI.\n","Do you think it is worthwhile to keep support for cglib once we have\nbytebuddy?\n\nDo you think we should shade bytebuddy? What dependencies bytebuddy brings?\n\nOn Mon, Nov 24, 2014 at 6:26 PM, Brice Dutheil notifications@github.com\nwrote:\n\n> What I hoped was to build a mockmaker that could be tested on the 1.x.\n> Like an opt-in feature for 1.x?\n> \n> Yes. But, meanwhile replacing CGLIB in mockito 2.0.\n> \n> You mentioned earlier that you had the ByteBuddy MockMaker working with\n> Mockito test suite?\n> \n> Yes it does. I just would like to ensure it works with uncommon\n> environment like OSGI.\n> \n> ## \n> \n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/123#issuecomment-64229927.\n\n## \n\nSzczepan Faber\nCore dev@gradle; Founder@mockito\n","No I don't think it is necessary, however we can make a CGLIB mock maker, for people that may depend on it.\n","I am curious: Do you guys have a time-line for the 2.0 release? I am more than happy to support any code-generation releated issues. However, my vacation is approaching so I will be gone for a couple of weeks starting mid-August.\n\nIn particular, I wonder you guys wanted to try integrating Byte Buddy 0.7 with support for generic type retention already in 2.0 which I hope to complete before my vacation. One word of warning: Generic types are awefully complex. Byte Buddy needs to parse stringified type information and resolve the full type hierarchy, i.e. bind type variables of super types / interfaces to their actual values in order to appropriately resolve a type variable's value while dealing with the possibility of raw types and potentially illegally formatted generic types (the JVM does not verify generic type infromation which simply exists as meta data). There is a chance for corner case errors even though I isolated the functionality pretty much to fall back to type erasure if any illegal type information is disovered. At the same time, mocks would behave better when a generic type is read by a class processing a mock.\n","It must happen in 2015. I hope we are ready in the next few months. In\ntheory, there's not much left work :)\n\nCheers!\n\nOn Fri, Jul 10, 2015 at 5:31 AM, Rafael Winterhalter <\nnotifications@github.com> wrote:\n\n> I am curious: Do you guys have a time-line for the 2.0 release? I am more\n> than happy to support any code-generation releated issues. However, my\n> vacation is approaching so I will be gone for a couple of weeks starting\n> mid-August.\n> \n> —\n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/123#issuecomment-120399539.\n\n## \n\nSzczepan Faber\nFounder mockito.org; Core dev gradle.org\ntweets as @szczepiq; blogs at blog.mockito.org\n","I think mockito 2.0 is nearly in shape to be released, most work should go in polishing remaining bits of the public API. IMHO current byte buddy version is fine, and already provide subtitle but needed enhancements.\n\nMore specifically on generics I believe current support is OK, after all mockito is a TDD tool for a rapid feedback loop, both on the dev workstation and the ci bots. I believe current generics support in the deepstubs answer is enough. About the issue you mention the support class I wrote is probably incomplete but enough, and I agree parsing this metadata is hard. Anyway at the moment if any extended support should be provided on this front it should be provided via a mockmaker plugin.\n","Thanks for the info. I just released Byte Buddy 0.7 but I recommend you to not yet update. Generic types are tricky and I already found a corner case in the bridge method resolution that does not work. I'll try to make it stable until the mid of August, though.\n","Any guess on when 2.0 will be released?\n","It's been silent for past couple of months, everybody busy, etc. Since\nyesterday, I'm focusing my spare time on Mockito. I will not stop until 2.0\nis out. We cannot guarantee any dates but 2.0 must be released in 2015.\n\nOn Sat, Sep 19, 2015 at 8:40 AM, David J. M. Karlsen <\nnotifications@github.com> wrote:\n\n> Any guess on when 2.0 will be released?\n> \n> —\n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/123#issuecomment-141681244.\n\n## \n\nSzczepan Faber\nFounder mockito.org; Core dev gradle.org\ntweets as @szczepiq; blogs at blog.mockito.org\n","Any updates on when we might see a 2.0 release?\n","2015 is soon over ;) At some point, we need to do a cut in features. I think everybody is quite budy right now. As always, the time before Christmas are busy month for consultant work.\n","Soon. This year for sure. Sorry I was distracted! We will probably deliver\n2.0 with what we have, no new fancy features ;)\nOn Nov 10, 2015 4:52 AM, \"Rafael Winterhalter\" notifications@github.com\nwrote:\n\n> 2015 is soon over ;) At some point, we need to do a cut in features. I\n> think everybody is quite budy right now. As always, the time before\n> Christmas are busy month for consultant work.\n> \n> —\n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/123#issuecomment-155412454.\n","Can this task https://github.com/mockito/mockito/issues/300 be included in 2.0 release?\n","Feel free to add #374 to the todo list\n","2.0 is coming so slow.\n","It's way too slow. I'm on it. Thank you guys for pushing.\n","@szczepiq How can we/the community support the mockito core team ?\n","> @szczepiq https://github.com/szczepiq How can we/the community support\n> the mockito core team ?\n> \n> You already are. You guys are great. Thank you for patience and pushing us\n> to deliver.\n\nThe lagging of beta is my fault. I've started the beta cycle and I should\nhave completed it. I'm back in the game, though.\n\nOnce 2.x final is out we need clarify how community can drive supporting\nand maintaining Mockito.\n\nNote that Mockito is continuously delivered so you can open PR to change\nthe version to \"2.1.0\", and that's it :)\n\nCheers!\n\n> —\n> You are receiving this because you were mentioned.\n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/123#issuecomment-206757516\n","@szczepiq I left a pull request for removing deprecated code which is an 2.0 milestone issue - can you pull it/looks good?\n","I haven't reviewed yet. THANKS!\nOn Sun, Apr 10, 2016 at 03:12 David J. M. Karlsen notifications@github.com\nwrote:\n\n> @szczepiq https://github.com/szczepiq I left a pull request for\n> removing deprecated code which is an 2.0 milestone issue - can you pull\n> it/looks good?\n> \n> —\n> You are receiving this because you were mentioned.\n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/123#issuecomment-207953253\n","Per Mockito developers discussion:\n\nWe want to target publishing the release on July 31st with a release candidate on June 30th.\n\nThere is one issue which must be resolved for that, which is #194. Other than that I just found 1 minor TODO [in the Mockito documentation](https://github.com/mockito/mockito/blob/dff5510cb3e97dae414e58ba85825ad01b273c72/src/main/java/org/mockito/Mockito.java#L1091). The other issues can be fixed in a later minor version.\n","@TimvdLippe what about https://github.com/mockito/mockito/issues/300?\n","@skabashnyuk I think that we still want to do this, but is not a blocker for the release. We must do it when we have time, but it is okay in my opinion to release it in a later minor version. I have to be honest that I was not participating in the original discussion so I do not know the exact details. @bric3 is the man to talk to :)\n","@TimvdLippe @skabashnyuk Humm I think we should really focus energy on mockito 2, TestNG could come later.\n","> TestNG could come later.\n\n@bric3 No problem. But why this can't be done in parallel? Code is ready, looks like this is an infrastructure-deployment issue. Or you are planning to do something bigger than just deploy artifacts?\n","@skabashnyuk Currently we are focused on releasing Mockito 2.0. This leaves little to no time for other issues sadly. If you are able to configure the deployment, we are happy to accept your pull request! We can devote some of our time to the TestNG issue after we have released Mockito 2.0.\n","Some update.\n\nWe're not ready for the release but there's good momentum. Let's plan out\nwhat else needs to be done (announcement information, really documentation\naround why to upgrade and how, solid plan what's next after the release\ncandidate, etc.).\n\nI'm confident the RC will be out in August. I plan to announce everywhere\nthat we plan RB in August. If we don't meet the date there will high degree\nof shame ;) Thoughts?\n\nOn Sat, Jun 25, 2016 at 3:59 AM, Tim van der Lippe wrote:\n> \n> @skabashnyuk https://github.com/skabashnyuk Currently we are focused on\n> releasing Mockito 2.0. This leaves little to no time for other issues\n> sadly. If you are able to configure the deployment, we are happy to accept\n> your pull request! We can devote some of our time to the TestNG issue after\n> we have released Mockito 2.0.\n> \n> —\n> You are receiving this because you were mentioned.\n> Reply to this email directly, view it on GitHub\n> https://github.com/mockito/mockito/issues/123#issuecomment-228532419,\n> or mute the thread\n> https://github.com/notifications/unsubscribe/AABgp8m2jG-9Rj7USJ1V2s6GJNHLzbdwks5qPQodgaJpZM4C_fdm\n> .\n\n## \n\nSzczepan Faber\nFounder @ mockito.org | Twitter @ szczepiq\nAuthor @ https://www.linkedin.com/today/author/6016386\n","I think most of the work should be focused on the upgrade guide, there's not much left for 2.0, follow up tasks can be completed in 2.1\n","I think we can publish the release candidate while working on the actual upgrade guide (state this in the github release for users to follow). The only two issues that are non-documentation are #384 with PR #527 of @szczepiq and #489 with PR #491 of myself. #527 has some feedback to be processed and #491 is more of a discussion regarding the runner.\n\nOnce these two are resolved, we can merge #483 and the release candidate is published :tada: \n\nFor an up-to-date status, see https://waffle.io/mockito/mockito and https://github.com/mockito/mockito/milestone/1\n","This is great stuff!!! Thanks a lot Tim for pushing the release forward & organizing it so well.\n\nI'm making good progress on the warnings stuff for JUnit rule and the listener - will update the PR very soon.\n","I'm confused why this ticket is closed. I don't see 2.0 in maven central :)\n","@szczepiq because this issue was referenced in #483 which I just merged\n","ah, GH smartness :)\n","As promised here’s suggested plan to get 2.0 out. Please give feedback, sing up for tasks and commit to ETA so that we get 2.0 out :)\n\nStep 1:\n- [ ] prepare RC release notes + announcement (highlights, motivation, request for feedback) - #582\n- [ ] review and update documentation for 2.0.0 - #596\n- [ ] ensure & test manual Mockito releases - #586\n- [ ] update CI / build scripts (releasing betas from branch, etc) - #594\n\nStep 2:\n- [ ] branch out / fixes to release / Travis - #594\n\nStep 3:\n- [ ] pull the trigger for RC!!!!!, close darn #123 !!!!!!\n","\n","I think we have updated all relevant documentation. @bric3 once you branch out to `release/2.x` we can publish the release candidate :tada: \n","I went ahead and published the release candidate. You can download `2.1.0-RC.1` at https://bintray.com/szczepiq/maven/mockito/2.1.0-RC.1#\n","By the way I would prefer to have mockito account on bintray \n","Yes agreed. Let's extract a separate issue for that.\n","Mockito 2.1.0 has been released, upgrade today :tada: \n"],"string":"[\n \"Is it still planned for 2.0 to give users an option to use an alternative to cglib (like Byte Buddy)?\\n\",\n \"This kind of feature can be added any time (e.g. it's not a backwards-incompatible change). It's just someone needs to implement it :) \\n\\nSo short answer is 'no', it's not planned for 2.0 (but I would love to have this feature soon)\\n\",\n \"If possible I would really like to replace CGLIB by bytebuddy.\\n\\nI wanted to craft an external MockMaker but I'm way too much overwhelmed at the moment. The code exists in my clone though.\\n\",\n \"@bric3, you mean that you're keen on changing default proxy mechanism in 2.0? I'm fine with this :) I do want to publish 2.0 this year though and I won't be very active it this part of the code. So, if you make it, it can be included :)\\n\",\n \"@szczepiq You mean by the end of 2014 ?\\n\\nWhat I hoped was to build a mockmaker that could be tested on the 1.x. But the code may replace CGLIB now if necessary. Beta have to be tested by other people though, I especially think about uncommon environment like OSGI, etc...\\n\",\n \"1>You mean by the end of 2014 ?\\n\\nhaha, yeah ;)\\n\\n> What I hoped was to build a mockmaker that could be tested on the 1.x.\\n\\nLike an opt-in feature for 1.x?\\n\\nI definitely think that given we have the bytebuddy impl of MockMaker, we\\nshould make it conveniently pluggable instead of just replacing cglib\\ncompletely. You mentioned earlier that you had the ByteBuddy MockMaker\\nworking with Mockito test suite?\\n\\nCheers!\\n\\nOn Mon, Nov 24, 2014 at 4:18 PM, Brice Dutheil notifications@github.com\\nwrote:\\n\\n> You mean by the end of 2014 ?\\n> \\n> What I hoped was to build a mockmaker that could be tested on the 1.x. But\\n> the code may replace CGLIB now if necessary. Beta have to be tested by\\n> other people though, I especially think about uncommon environment like\\n> OSGI, etc...\\n> \\n> ## \\n> \\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/123#issuecomment-64208043.\\n\\n## \\n\\nSzczepan Faber\\nCore dev@gradle; Founder@mockito\\n\",\n \"> > What I hoped was to build a mockmaker that could be tested on the 1.x.\\n> \\n> Like an opt-in feature for 1.x?\\n\\nYes. But, meanwhile replacing CGLIB in mockito 2.0.\\n\\n> You mentioned earlier that you had the ByteBuddy MockMaker working with Mockito test suite?\\n\\nYes it does. I just would like to ensure it works with uncommon environment like OSGI.\\n\",\n \"Do you think it is worthwhile to keep support for cglib once we have\\nbytebuddy?\\n\\nDo you think we should shade bytebuddy? What dependencies bytebuddy brings?\\n\\nOn Mon, Nov 24, 2014 at 6:26 PM, Brice Dutheil notifications@github.com\\nwrote:\\n\\n> What I hoped was to build a mockmaker that could be tested on the 1.x.\\n> Like an opt-in feature for 1.x?\\n> \\n> Yes. But, meanwhile replacing CGLIB in mockito 2.0.\\n> \\n> You mentioned earlier that you had the ByteBuddy MockMaker working with\\n> Mockito test suite?\\n> \\n> Yes it does. I just would like to ensure it works with uncommon\\n> environment like OSGI.\\n> \\n> ## \\n> \\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/123#issuecomment-64229927.\\n\\n## \\n\\nSzczepan Faber\\nCore dev@gradle; Founder@mockito\\n\",\n \"No I don't think it is necessary, however we can make a CGLIB mock maker, for people that may depend on it.\\n\",\n \"I am curious: Do you guys have a time-line for the 2.0 release? I am more than happy to support any code-generation releated issues. However, my vacation is approaching so I will be gone for a couple of weeks starting mid-August.\\n\\nIn particular, I wonder you guys wanted to try integrating Byte Buddy 0.7 with support for generic type retention already in 2.0 which I hope to complete before my vacation. One word of warning: Generic types are awefully complex. Byte Buddy needs to parse stringified type information and resolve the full type hierarchy, i.e. bind type variables of super types / interfaces to their actual values in order to appropriately resolve a type variable's value while dealing with the possibility of raw types and potentially illegally formatted generic types (the JVM does not verify generic type infromation which simply exists as meta data). There is a chance for corner case errors even though I isolated the functionality pretty much to fall back to type erasure if any illegal type information is disovered. At the same time, mocks would behave better when a generic type is read by a class processing a mock.\\n\",\n \"It must happen in 2015. I hope we are ready in the next few months. In\\ntheory, there's not much left work :)\\n\\nCheers!\\n\\nOn Fri, Jul 10, 2015 at 5:31 AM, Rafael Winterhalter <\\nnotifications@github.com> wrote:\\n\\n> I am curious: Do you guys have a time-line for the 2.0 release? I am more\\n> than happy to support any code-generation releated issues. However, my\\n> vacation is approaching so I will be gone for a couple of weeks starting\\n> mid-August.\\n> \\n> —\\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/123#issuecomment-120399539.\\n\\n## \\n\\nSzczepan Faber\\nFounder mockito.org; Core dev gradle.org\\ntweets as @szczepiq; blogs at blog.mockito.org\\n\",\n \"I think mockito 2.0 is nearly in shape to be released, most work should go in polishing remaining bits of the public API. IMHO current byte buddy version is fine, and already provide subtitle but needed enhancements.\\n\\nMore specifically on generics I believe current support is OK, after all mockito is a TDD tool for a rapid feedback loop, both on the dev workstation and the ci bots. I believe current generics support in the deepstubs answer is enough. About the issue you mention the support class I wrote is probably incomplete but enough, and I agree parsing this metadata is hard. Anyway at the moment if any extended support should be provided on this front it should be provided via a mockmaker plugin.\\n\",\n \"Thanks for the info. I just released Byte Buddy 0.7 but I recommend you to not yet update. Generic types are tricky and I already found a corner case in the bridge method resolution that does not work. I'll try to make it stable until the mid of August, though.\\n\",\n \"Any guess on when 2.0 will be released?\\n\",\n \"It's been silent for past couple of months, everybody busy, etc. Since\\nyesterday, I'm focusing my spare time on Mockito. I will not stop until 2.0\\nis out. We cannot guarantee any dates but 2.0 must be released in 2015.\\n\\nOn Sat, Sep 19, 2015 at 8:40 AM, David J. M. Karlsen <\\nnotifications@github.com> wrote:\\n\\n> Any guess on when 2.0 will be released?\\n> \\n> —\\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/123#issuecomment-141681244.\\n\\n## \\n\\nSzczepan Faber\\nFounder mockito.org; Core dev gradle.org\\ntweets as @szczepiq; blogs at blog.mockito.org\\n\",\n \"Any updates on when we might see a 2.0 release?\\n\",\n \"2015 is soon over ;) At some point, we need to do a cut in features. I think everybody is quite budy right now. As always, the time before Christmas are busy month for consultant work.\\n\",\n \"Soon. This year for sure. Sorry I was distracted! We will probably deliver\\n2.0 with what we have, no new fancy features ;)\\nOn Nov 10, 2015 4:52 AM, \\\"Rafael Winterhalter\\\" notifications@github.com\\nwrote:\\n\\n> 2015 is soon over ;) At some point, we need to do a cut in features. I\\n> think everybody is quite budy right now. As always, the time before\\n> Christmas are busy month for consultant work.\\n> \\n> —\\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/123#issuecomment-155412454.\\n\",\n \"Can this task https://github.com/mockito/mockito/issues/300 be included in 2.0 release?\\n\",\n \"Feel free to add #374 to the todo list\\n\",\n \"2.0 is coming so slow.\\n\",\n \"It's way too slow. I'm on it. Thank you guys for pushing.\\n\",\n \"@szczepiq How can we/the community support the mockito core team ?\\n\",\n \"> @szczepiq https://github.com/szczepiq How can we/the community support\\n> the mockito core team ?\\n> \\n> You already are. You guys are great. Thank you for patience and pushing us\\n> to deliver.\\n\\nThe lagging of beta is my fault. I've started the beta cycle and I should\\nhave completed it. I'm back in the game, though.\\n\\nOnce 2.x final is out we need clarify how community can drive supporting\\nand maintaining Mockito.\\n\\nNote that Mockito is continuously delivered so you can open PR to change\\nthe version to \\\"2.1.0\\\", and that's it :)\\n\\nCheers!\\n\\n> —\\n> You are receiving this because you were mentioned.\\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/123#issuecomment-206757516\\n\",\n \"@szczepiq I left a pull request for removing deprecated code which is an 2.0 milestone issue - can you pull it/looks good?\\n\",\n \"I haven't reviewed yet. THANKS!\\nOn Sun, Apr 10, 2016 at 03:12 David J. M. Karlsen notifications@github.com\\nwrote:\\n\\n> @szczepiq https://github.com/szczepiq I left a pull request for\\n> removing deprecated code which is an 2.0 milestone issue - can you pull\\n> it/looks good?\\n> \\n> —\\n> You are receiving this because you were mentioned.\\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/123#issuecomment-207953253\\n\",\n \"Per Mockito developers discussion:\\n\\nWe want to target publishing the release on July 31st with a release candidate on June 30th.\\n\\nThere is one issue which must be resolved for that, which is #194. Other than that I just found 1 minor TODO [in the Mockito documentation](https://github.com/mockito/mockito/blob/dff5510cb3e97dae414e58ba85825ad01b273c72/src/main/java/org/mockito/Mockito.java#L1091). The other issues can be fixed in a later minor version.\\n\",\n \"@TimvdLippe what about https://github.com/mockito/mockito/issues/300?\\n\",\n \"@skabashnyuk I think that we still want to do this, but is not a blocker for the release. We must do it when we have time, but it is okay in my opinion to release it in a later minor version. I have to be honest that I was not participating in the original discussion so I do not know the exact details. @bric3 is the man to talk to :)\\n\",\n \"@TimvdLippe @skabashnyuk Humm I think we should really focus energy on mockito 2, TestNG could come later.\\n\",\n \"> TestNG could come later.\\n\\n@bric3 No problem. But why this can't be done in parallel? Code is ready, looks like this is an infrastructure-deployment issue. Or you are planning to do something bigger than just deploy artifacts?\\n\",\n \"@skabashnyuk Currently we are focused on releasing Mockito 2.0. This leaves little to no time for other issues sadly. If you are able to configure the deployment, we are happy to accept your pull request! We can devote some of our time to the TestNG issue after we have released Mockito 2.0.\\n\",\n \"Some update.\\n\\nWe're not ready for the release but there's good momentum. Let's plan out\\nwhat else needs to be done (announcement information, really documentation\\naround why to upgrade and how, solid plan what's next after the release\\ncandidate, etc.).\\n\\nI'm confident the RC will be out in August. I plan to announce everywhere\\nthat we plan RB in August. If we don't meet the date there will high degree\\nof shame ;) Thoughts?\\n\\nOn Sat, Jun 25, 2016 at 3:59 AM, Tim van der Lippe wrote:\\n> \\n> @skabashnyuk https://github.com/skabashnyuk Currently we are focused on\\n> releasing Mockito 2.0. This leaves little to no time for other issues\\n> sadly. If you are able to configure the deployment, we are happy to accept\\n> your pull request! We can devote some of our time to the TestNG issue after\\n> we have released Mockito 2.0.\\n> \\n> —\\n> You are receiving this because you were mentioned.\\n> Reply to this email directly, view it on GitHub\\n> https://github.com/mockito/mockito/issues/123#issuecomment-228532419,\\n> or mute the thread\\n> https://github.com/notifications/unsubscribe/AABgp8m2jG-9Rj7USJ1V2s6GJNHLzbdwks5qPQodgaJpZM4C_fdm\\n> .\\n\\n## \\n\\nSzczepan Faber\\nFounder @ mockito.org | Twitter @ szczepiq\\nAuthor @ https://www.linkedin.com/today/author/6016386\\n\",\n \"I think most of the work should be focused on the upgrade guide, there's not much left for 2.0, follow up tasks can be completed in 2.1\\n\",\n \"I think we can publish the release candidate while working on the actual upgrade guide (state this in the github release for users to follow). The only two issues that are non-documentation are #384 with PR #527 of @szczepiq and #489 with PR #491 of myself. #527 has some feedback to be processed and #491 is more of a discussion regarding the runner.\\n\\nOnce these two are resolved, we can merge #483 and the release candidate is published :tada: \\n\\nFor an up-to-date status, see https://waffle.io/mockito/mockito and https://github.com/mockito/mockito/milestone/1\\n\",\n \"This is great stuff!!! Thanks a lot Tim for pushing the release forward & organizing it so well.\\n\\nI'm making good progress on the warnings stuff for JUnit rule and the listener - will update the PR very soon.\\n\",\n \"I'm confused why this ticket is closed. I don't see 2.0 in maven central :)\\n\",\n \"@szczepiq because this issue was referenced in #483 which I just merged\\n\",\n \"ah, GH smartness :)\\n\",\n \"As promised here’s suggested plan to get 2.0 out. Please give feedback, sing up for tasks and commit to ETA so that we get 2.0 out :)\\n\\nStep 1:\\n- [ ] prepare RC release notes + announcement (highlights, motivation, request for feedback) - #582\\n- [ ] review and update documentation for 2.0.0 - #596\\n- [ ] ensure & test manual Mockito releases - #586\\n- [ ] update CI / build scripts (releasing betas from branch, etc) - #594\\n\\nStep 2:\\n- [ ] branch out / fixes to release / Travis - #594\\n\\nStep 3:\\n- [ ] pull the trigger for RC!!!!!, close darn #123 !!!!!!\\n\",\n \"\\n\",\n \"I think we have updated all relevant documentation. @bric3 once you branch out to `release/2.x` we can publish the release candidate :tada: \\n\",\n \"I went ahead and published the release candidate. You can download `2.1.0-RC.1` at https://bintray.com/szczepiq/maven/mockito/2.1.0-RC.1#\\n\",\n \"By the way I would prefer to have mockito account on bintray \\n\",\n \"Yes agreed. Let's extract a separate issue for that.\\n\",\n \"Mockito 2.1.0 has been released, upgrade today :tada: \\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-07-07T13:52:49Z","string":"2016-07-07T13:52:49Z"},"labeled_as":{"kind":"list like","value":["epic"],"string":"[\n \"epic\"\n]"},"problem_title":{"kind":"string","value":"Release Mockito 2.0"},"problem_statement":{"kind":"string","value":"Incompatible changes:\n- [x] stop producing mockito-all #153\n- [x] stop depending on hamcrest internally #154\n- [x] use newer hamcrest #232\n- [x] make the anyXxx and any(Xxx) matchers intuitive #134, #194\n- ~~fix the site links~~\n- [x] push cglib mockmaker to a separate jar #248\n- [x] stop using ant for producing OSGi bundles. No more ant in the build #249\n- [x] remove jars from source distribution #250\n- ~~perhaps introduce is() matcher~~ #246\n- ~~richer and smarter stubbing~~ #303\n- ~~support java8 features for capturing arguments and matchers~~\n- [x] make the JUnitRule and the runner verbose\n- [x] ensure release notes can be neatly generated for the RC #582\n\nPossibly compatible (and hence, could be released pre-2.0 if needed)\n- [x] drop deprecated code\n- [x] unincubate API\n- ~~drop serialVersionUID~~\n"},"gold_files":{"kind":"list like","value":["README.md","buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java","version.properties"],"string":"[\n \"README.md\",\n \"buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\",\n \"version.properties\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["README.md","buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java","version.properties"],"string":"[\n \"README.md\",\n \"buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\",\n \"version.properties\"\n]"},"test_files":{"kind":"list like","value":["buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy"],"string":"[\n \"buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex 1ffdd450c9..d3595e27fc 100644\n--- a/README.md\n+++ b/README.md\n@@ -17,24 +17,34 @@ See the [release notes page](https://github.com/mockito/mockito/blob/master/doc/\n \n ## Versioning\n \n-Mockito has an automated release system, which imposed some change on how the version numbers work. While this is similar to [_semver_](http://semver.org/), there's some differences. Let's look at the following versions `1.10.19` and `2.0.5-beta` and `2.0.0` (not yet released). They follow this scheme:\n+Mockito has an automated release system, which imposed some change on how the version numbers work.\n+They follow this scheme:\n \n ```\n-major.minor.build-tag\n+major.minor.patch-tag.tagVersion\n ```\n \n | number | meaning |\n | ------ | ------------------------------------------------------------------------------------- |\n-| major | major version, with most probably incompatible change in API and behavior |\n-| minor | minor version, important enough change to bump this number |\n-| build | a released build number incremented automatically when a pull request is merged |\n-| tag | will probably be `-beta` or just nothing (during beta, breaking changes are expected) |\n+| major | major version, backwards incompatible with the previous major version |\n+| minor | minor version, backwards compatible with added features |\n+| patch | patch version, small bug fixes or stylistic improvements |\n+| tag | *optional* beta or RC (release candidate). See below. |\n \n That means:\n \n-* `2.0.0` and `2.0.5-beta` are binary incompatible with `1.10.19`.\n-* `2.0.5-beta` is the fifth release beta of version `2.0.0`.\n-* `2.0.5-beta` is a work in progress, api may change and may not be graduated in version `2.0.0`.\n+* `2.0.0` and `2.0.0-beta.5` are binary incompatible with `1.10.19`.\n+* `2.0.0-beta.5` is the fifth release beta of version `2.0.0`.\n+* `2.0.0-beta.5` could be (but is not necessarily) binary incompatible with version `2.0.0`.\n+* `2.0.0-RC.1` is binary compatible with release `2.0.0`.\n+\n+### Tags\n+There are two different tags: beta or RC. Beta indicates that the version is directly generated from the master branch of the git repository.\n+Beta releases are automatically published whenever we merge a pull request or push a change to the master branch.\n+\n+When we deem our master status worthy of a release, we publish a release candidate. The release candidate is scheduled to be officially published\n+in the official release a while later. There will be no breaking changes between a release candidate and its equivalent official release.\n+The only changes will include bug fixes or small updates. No additional features will be included.\n \n ## Looking for support\n \ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java b/buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\nindex 01ed67cac5..b6f6ba8e54 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\n@@ -9,17 +9,20 @@ class VersionBumper {\n * Increments 'patch' element of the version of provided version, e.g. 1.0.0 -> 1.0.1\n */\n String incrementVersion(String version) {\n- Pattern pattern = Pattern.compile(\"(\\\\d+)\\\\.(\\\\d+)\\\\.(\\\\d+)(-(\\\\w+)){0,1}\");\n+ Pattern pattern = Pattern.compile(\"(\\\\d+)\\\\.(\\\\d+)\\\\.(\\\\d+)(-(\\\\w+)\\\\.(\\\\d+))?\");\n Matcher matcher = pattern.matcher(version);\n boolean m = matcher.matches();\n if (!m) {\n- throw new IllegalArgumentException(\"Unsupported version: '\" + version + \"'. Examples of supported versions: 1.0.0, 1.20.123, 1.0.10-beta\");\n+ throw new IllegalArgumentException(\"Unsupported version: '\" + version + \"'. Examples of supported versions: 1.0.0, 1.20.123, 1.0.10-beta.3\");\n }\n \n int major = Integer.parseInt(matcher.group(1));\n int minor = Integer.parseInt(matcher.group(2));\n int patch = Integer.parseInt(matcher.group(3));\n- String postfix = matcher.group(4) != null ? matcher.group(4) : \"\";\n- return \"\" + major + \".\" + minor + \".\" + (patch + 1) + postfix;\n+ if (matcher.group(4) != null) {\n+ int betaVersion = Integer.parseInt(matcher.group(6));\n+ return \"\" + major + \".\" + minor + \".\" + patch + \"-\" + matcher.group(5) + \".\" + (betaVersion + 1);\n+ }\n+ return \"\" + major + \".\" + minor + \".\" + (patch + 1);\n }\n }\ndiff --git a/version.properties b/version.properties\nindex 3d70180266..d87a336523 100644\n--- a/version.properties\n+++ b/version.properties\n@@ -1,2 +1,2 @@\n-version=2.0.112-beta\n+version=2.0.0-beta.112\n mockito.testng.version=1.0\n"},"test_patch":{"kind":"string","value":"diff --git a/buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy b/buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy\nindex db1c3d6835..b34bcda696 100644\n--- a/buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy\n+++ b/buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy\n@@ -13,8 +13,9 @@ class VersionBumperTest extends Specification {\n v.incrementVersion(\"0.0.0\") == \"0.0.1\"\n v.incrementVersion(\"1.10.15\") == \"1.10.16\"\n \n- v.incrementVersion(\"1.0.0-beta\") == \"1.0.1-beta\"\n- v.incrementVersion(\"1.10.15-beta\") == \"1.10.16-beta\"\n+ v.incrementVersion(\"1.0.0-beta.3\") == \"1.0.0-beta.4\"\n+ v.incrementVersion(\"1.10.15-beta.5\") == \"1.10.15-beta.6\"\n+ v.incrementVersion(\"2.0.0-RC.1\") == \"2.0.0-RC.2\"\n }\n \n def \"increments only 3 numbered versions\"() {\n@@ -25,6 +26,6 @@ class VersionBumperTest extends Specification {\n thrown(IllegalArgumentException)\n \n where:\n- unsupported << [\"1.0\", \"2\", \"1.0.0.0\", \"1.0.1-beta.2\"]\n+ unsupported << [\"1.0\", \"2\", \"1.0.0.0\", \"1.0.1-beta\"]\n }\n }\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-22T09:50:54","string":"2016-08-22T09:50:54"},"issue_created_at":{"kind":"timestamp","value":"2014-11-22T21:31:43Z","string":"2014-11-22T21:31:43Z"},"issue_by_user":{"kind":"string","value":"mockitoguy"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":473,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/478_483"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/478"},"pr_id":{"kind":"string","value":"mockito/mockito/483"},"linking_methods":{"kind":"list like","value":["keyword_issue_to_pr"],"string":"[\n \"keyword_issue_to_pr\"\n]"},"base_commit":{"kind":"string","value":"d01911eb9040d21ba6763dfb90c5210bb480e1b9"},"merge_commit":{"kind":"string","value":"80ab0db765138a57b105c7a64676ebc38cb94f35"},"hints_text":{"kind":"list like","value":["I don't think so, I believe we should keep up-to-date javadoc, but maybe pointing to released versions javadocs.\n","Or we could tweak the layout :\n- `current` == latest released version => `http://site.mockito.org/mockito/docs/current/org/mockito/Mockito.html`\n- `release/2.0.0` => `http://site.mockito.org/mockito/docs/2.0.0/org/mockito/Mockito.html`\n- `beta/3.0.0.beta.xxxx` => `http://site.mockito.org/mockito/docs/beta/3.0.0.beta.xxxx/org/mockito/Mockito.html`\n\nWe could have some way with javascript injection to have some menu that help switch to other versions.\n\nAnyway I think we could safely purge beta javadoc publication once 2.0.0 release https://github.com/mockito/mockito/tree/gh-pages/docs\n","This issue description is absolutely horrible when I read it back now. It was mainly concerning the version issues, which should be fixed in #483. The other issue is indeed the documentation, but this is mainly an issue for the website, no?\n\nAnyways, it would be to merge #483 sooner rather than later as Mockito 2.0 has been lingering for a while now. The longer we wait, the less incentivized will people be.\n","This issue has been resolved with the new version scheme and possibility to manually release a version\n"],"string":"[\n \"I don't think so, I believe we should keep up-to-date javadoc, but maybe pointing to released versions javadocs.\\n\",\n \"Or we could tweak the layout :\\n- `current` == latest released version => `http://site.mockito.org/mockito/docs/current/org/mockito/Mockito.html`\\n- `release/2.0.0` => `http://site.mockito.org/mockito/docs/2.0.0/org/mockito/Mockito.html`\\n- `beta/3.0.0.beta.xxxx` => `http://site.mockito.org/mockito/docs/beta/3.0.0.beta.xxxx/org/mockito/Mockito.html`\\n\\nWe could have some way with javascript injection to have some menu that help switch to other versions.\\n\\nAnyway I think we could safely purge beta javadoc publication once 2.0.0 release https://github.com/mockito/mockito/tree/gh-pages/docs\\n\",\n \"This issue description is absolutely horrible when I read it back now. It was mainly concerning the version issues, which should be fixed in #483. The other issue is indeed the documentation, but this is mainly an issue for the website, no?\\n\\nAnyways, it would be to merge #483 sooner rather than later as Mockito 2.0 has been lingering for a while now. The longer we wait, the less incentivized will people be.\\n\",\n \"This issue has been resolved with the new version scheme and possibility to manually release a version\\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-07-07T13:52:49Z","string":"2016-07-07T13:52:49Z"},"labeled_as":{"kind":"list like","value":["docs","continuous integration"],"string":"[\n \"docs\",\n \"continuous integration\"\n]"},"problem_title":{"kind":"string","value":"Improve release generator"},"problem_statement":{"kind":"string","value":"Currently releases are generated automatically and documentation pushed to the website. However, when we are publishing a major release, this should be changed.\n\nProbably the best solution is to disable the automatic generation for now and invoke this manually. This does require some changes to the current Gradle release process.\n\nAlso, in #79 the changelog was improved. We should take a look at improving this as well.\n\nTLDR: Take a good look at the Gradle release process and purge/improve tasks.\n"},"gold_files":{"kind":"list like","value":["README.md","buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java","version.properties"],"string":"[\n \"README.md\",\n \"buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\",\n \"version.properties\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["README.md","buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java","version.properties"],"string":"[\n \"README.md\",\n \"buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\",\n \"version.properties\"\n]"},"test_files":{"kind":"list like","value":["buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy"],"string":"[\n \"buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex 1ffdd450c9..d3595e27fc 100644\n--- a/README.md\n+++ b/README.md\n@@ -17,24 +17,34 @@ See the [release notes page](https://github.com/mockito/mockito/blob/master/doc/\n \n ## Versioning\n \n-Mockito has an automated release system, which imposed some change on how the version numbers work. While this is similar to [_semver_](http://semver.org/), there's some differences. Let's look at the following versions `1.10.19` and `2.0.5-beta` and `2.0.0` (not yet released). They follow this scheme:\n+Mockito has an automated release system, which imposed some change on how the version numbers work.\n+They follow this scheme:\n \n ```\n-major.minor.build-tag\n+major.minor.patch-tag.tagVersion\n ```\n \n | number | meaning |\n | ------ | ------------------------------------------------------------------------------------- |\n-| major | major version, with most probably incompatible change in API and behavior |\n-| minor | minor version, important enough change to bump this number |\n-| build | a released build number incremented automatically when a pull request is merged |\n-| tag | will probably be `-beta` or just nothing (during beta, breaking changes are expected) |\n+| major | major version, backwards incompatible with the previous major version |\n+| minor | minor version, backwards compatible with added features |\n+| patch | patch version, small bug fixes or stylistic improvements |\n+| tag | *optional* beta or RC (release candidate). See below. |\n \n That means:\n \n-* `2.0.0` and `2.0.5-beta` are binary incompatible with `1.10.19`.\n-* `2.0.5-beta` is the fifth release beta of version `2.0.0`.\n-* `2.0.5-beta` is a work in progress, api may change and may not be graduated in version `2.0.0`.\n+* `2.0.0` and `2.0.0-beta.5` are binary incompatible with `1.10.19`.\n+* `2.0.0-beta.5` is the fifth release beta of version `2.0.0`.\n+* `2.0.0-beta.5` could be (but is not necessarily) binary incompatible with version `2.0.0`.\n+* `2.0.0-RC.1` is binary compatible with release `2.0.0`.\n+\n+### Tags\n+There are two different tags: beta or RC. Beta indicates that the version is directly generated from the master branch of the git repository.\n+Beta releases are automatically published whenever we merge a pull request or push a change to the master branch.\n+\n+When we deem our master status worthy of a release, we publish a release candidate. The release candidate is scheduled to be officially published\n+in the official release a while later. There will be no breaking changes between a release candidate and its equivalent official release.\n+The only changes will include bug fixes or small updates. No additional features will be included.\n \n ## Looking for support\n \ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java b/buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\nindex 01ed67cac5..b6f6ba8e54 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/version/VersionBumper.java\n@@ -9,17 +9,20 @@ class VersionBumper {\n * Increments 'patch' element of the version of provided version, e.g. 1.0.0 -> 1.0.1\n */\n String incrementVersion(String version) {\n- Pattern pattern = Pattern.compile(\"(\\\\d+)\\\\.(\\\\d+)\\\\.(\\\\d+)(-(\\\\w+)){0,1}\");\n+ Pattern pattern = Pattern.compile(\"(\\\\d+)\\\\.(\\\\d+)\\\\.(\\\\d+)(-(\\\\w+)\\\\.(\\\\d+))?\");\n Matcher matcher = pattern.matcher(version);\n boolean m = matcher.matches();\n if (!m) {\n- throw new IllegalArgumentException(\"Unsupported version: '\" + version + \"'. Examples of supported versions: 1.0.0, 1.20.123, 1.0.10-beta\");\n+ throw new IllegalArgumentException(\"Unsupported version: '\" + version + \"'. Examples of supported versions: 1.0.0, 1.20.123, 1.0.10-beta.3\");\n }\n \n int major = Integer.parseInt(matcher.group(1));\n int minor = Integer.parseInt(matcher.group(2));\n int patch = Integer.parseInt(matcher.group(3));\n- String postfix = matcher.group(4) != null ? matcher.group(4) : \"\";\n- return \"\" + major + \".\" + minor + \".\" + (patch + 1) + postfix;\n+ if (matcher.group(4) != null) {\n+ int betaVersion = Integer.parseInt(matcher.group(6));\n+ return \"\" + major + \".\" + minor + \".\" + patch + \"-\" + matcher.group(5) + \".\" + (betaVersion + 1);\n+ }\n+ return \"\" + major + \".\" + minor + \".\" + (patch + 1);\n }\n }\ndiff --git a/version.properties b/version.properties\nindex 3d70180266..d87a336523 100644\n--- a/version.properties\n+++ b/version.properties\n@@ -1,2 +1,2 @@\n-version=2.0.112-beta\n+version=2.0.0-beta.112\n mockito.testng.version=1.0\n"},"test_patch":{"kind":"string","value":"diff --git a/buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy b/buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy\nindex db1c3d6835..b34bcda696 100644\n--- a/buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy\n+++ b/buildSrc/src/test/groovy/org/mockito/release/version/VersionBumperTest.groovy\n@@ -13,8 +13,9 @@ class VersionBumperTest extends Specification {\n v.incrementVersion(\"0.0.0\") == \"0.0.1\"\n v.incrementVersion(\"1.10.15\") == \"1.10.16\"\n \n- v.incrementVersion(\"1.0.0-beta\") == \"1.0.1-beta\"\n- v.incrementVersion(\"1.10.15-beta\") == \"1.10.16-beta\"\n+ v.incrementVersion(\"1.0.0-beta.3\") == \"1.0.0-beta.4\"\n+ v.incrementVersion(\"1.10.15-beta.5\") == \"1.10.15-beta.6\"\n+ v.incrementVersion(\"2.0.0-RC.1\") == \"2.0.0-RC.2\"\n }\n \n def \"increments only 3 numbered versions\"() {\n@@ -25,6 +26,6 @@ class VersionBumperTest extends Specification {\n thrown(IllegalArgumentException)\n \n where:\n- unsupported << [\"1.0\", \"2\", \"1.0.0.0\", \"1.0.1-beta.2\"]\n+ unsupported << [\"1.0\", \"2\", \"1.0.0.0\", \"1.0.1-beta\"]\n }\n }\n"},"split_random":{"kind":"string","value":"val"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-22T09:50:54","string":"2016-08-22T09:50:54"},"issue_created_at":{"kind":"timestamp","value":"2016-07-03T20:28:25Z","string":"2016-07-03T20:28:25Z"},"issue_by_user":{"kind":"string","value":"TimvdLippe"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":474,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/465_493"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/465"},"pr_id":{"kind":"string","value":"mockito/mockito/493"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"5dd0f71ae37f75f3abc9b3d9ba7ad5cb4b79f38a"},"merge_commit":{"kind":"string","value":"272b32bb11a41d757c535675b9bfda0fa6ffd90b"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":["This can be a _oneliner_ I believe \n\n```\nif [[ $(git log --format=%B -n 1) != *\"[ci skip-release]\"* ]] ; then ./gradlew release; fi\n```\n","The git log command was from a travis issue as there is an intent to add the new environment variable. The command is kinda magic, so naming the variable makes it imo easier to comprehend.\n"],"string":"[\n \"This can be a _oneliner_ I believe \\n\\n```\\nif [[ $(git log --format=%B -n 1) != *\\\"[ci skip-release]\\\"* ]] ; then ./gradlew release; fi\\n```\\n\",\n \"The git log command was from a travis issue as there is an intent to add the new environment variable. The command is kinda magic, so naming the variable makes it imo easier to comprehend.\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-07-10T21:46:47Z","string":"2016-07-10T21:46:47Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"Delivery drone breaks codecov"},"problem_statement":{"kind":"string","value":"Since the commits of the delivery drone have `[ci skip]`, there is no coverage report for that specific commit. As a result, when a pull request has as base such a commit, CodeCov reports that it could not generate a coverage report.\n\nMaybe we can depend executing `gradle release` if the commit is from a user other than the delivery drone, to not break codecov.\n"},"gold_files":{"kind":"list like","value":[".travis.yml","dummy-commit.txt","gradle/release.gradle"],"string":"[\n \".travis.yml\",\n \"dummy-commit.txt\",\n \"gradle/release.gradle\"\n]"},"gold_files_postpatch":{"kind":"list like","value":[".travis.yml","dummy-commit.txt","gradle/release.gradle"],"string":"[\n \".travis.yml\",\n \"dummy-commit.txt\",\n \"gradle/release.gradle\"\n]"},"test_files":{"kind":"list like","value":[],"string":"[]"},"gold_patch":{"kind":"string","value":"diff --git a/.travis.yml b/.travis.yml\nindex 20b34b70df..e1b7d261d7 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -39,7 +39,9 @@ branches:\n install:\n - true\n script:\n- - ./gradlew ciBuild release\n+ - TRAVIS_MESSAGE=\"$(git log --format=%B -n 1)\"\n+ - ./gradlew ciBuild\n+ - if [[ $TRAVIS_MESSAGE != *\"[ci skip-release]\"* ]] ; then ./gradlew release; fi\n after_success:\n - ./gradlew --stacktrace coverageReport && cp build/reports/jacoco/mockitoCoverage/mockitoCoverage.xml jacoco.xml || echo \"Code coverage failed\"\n - bash <(curl -s https://codecov.io/bash) || echo \"Codecov did not collect coverage reports\"\ndiff --git a/dummy-commit.txt b/dummy-commit.txt\nindex 39b0928f91..7ca32a7a2e 100644\n--- a/dummy-commit.txt\n+++ b/dummy-commit.txt\n@@ -1,1 +1,1 @@\n-Change this if you need a dummy commit. Push build.\n+Change this if you need a dummy commit. Push build\ndiff --git a/gradle/release.gradle b/gradle/release.gradle\nindex a748bc1cd1..461d849c38 100644\n--- a/gradle/release.gradle\n+++ b/gradle/release.gradle\n@@ -86,7 +86,7 @@ release {\n \n releaseSteps {\n String currentVersion = project.version //the version loaded when Gradle build has started\n- String buildInfo = \"by Travis CI build $System.env.TRAVIS_BUILD_NUMBER [ci skip]\"\n+ String buildInfo = \"by Travis CI build $System.env.TRAVIS_BUILD_NUMBER [ci skip-release]\"\n MaskedArg pushTarget = new MaskedArg(value: \"https://szczepiq:${System.env.GH_TOKEN}@github.com/mockito/mockito.git\")\n \n step(\"ensure good chunk of recent commits is pulled for release notes automation\") {\n@@ -197,4 +197,4 @@ TODO:\n -new commits removal (git reset --hard) on all affected branches\n -clean up after release:\n -?\n- */\n\\ No newline at end of file\n+ */\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-07-10T22:07:23","string":"2016-07-10T22:07:23"},"issue_created_at":{"kind":"timestamp","value":"2016-06-24T11:15:49Z","string":"2016-06-24T11:15:49Z"},"issue_by_user":{"kind":"string","value":"TimvdLippe"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":475,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/482_494"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/482"},"pr_id":{"kind":"string","value":"mockito/mockito/494"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=54.0, similarity=0.8480688334209667)"],"string":"[\n \"timestamp(timedelta=54.0, similarity=0.8480688334209667)\"\n]"},"base_commit":{"kind":"string","value":"5dd0f71ae37f75f3abc9b3d9ba7ad5cb4b79f38a"},"merge_commit":{"kind":"string","value":"038637612ac8abe962094d87c9cf6252f60a49dc"},"hints_text":{"kind":"list like","value":["On a related note adding a \"as of\" to the deprecated description would also be useful:\n\n``` java\n/**\n * @deprecated as of 2.0 in favor of using the enum-constant directly. This method will be removed in a future releaseAnswers.CALLS_REAL_METHODS.get() use Answers.CALLS_REAL_METHODS .\n */\n```\n","I would agree with @philwebb that this method had been made deprecated in 2.0 (-beta.2) not in 1.10.x (in fact at first it was [removed](https://github.com/mockito/mockito/commit/34f4436d988f04eaf7635b0497067ee8df7971a6) completely and one month later [restored](https://github.com/mockito/mockito/commit/32dce3ea56fb2891b54be48c16a13d2a9eb0cd33) as deprecated), but what is more important `Answers` started implementing `Answer` then. Because of that when I was fixing that issue in Spring Boot it was hard to keep code compatible with both versions at runtime (for 1.x casting using it as Answer does not work, for never 2.x `get()` is not available). In the end I had to [do](https://github.com/spring-projects/spring-boot/pull/6323/files) ugly casting through `Object` to fool the compiler. With that Spring Boot should work fine (at least with changes related to `Answers` :) ), but there could be other tools (PowerMock?) that after removing this method cannot be easily compatible with both Mockito 1.x and 2.x. IMHO it would be good to keep this method in 2.x and remove in 3.x.\n","Yes that seems like a good idea. Mind want to open a pull request?\n"],"string":"[\n \"On a related note adding a \\\"as of\\\" to the deprecated description would also be useful:\\n\\n``` java\\n/**\\n * @deprecated as of 2.0 in favor of using the enum-constant directly. This method will be removed in a future releaseAnswers.CALLS_REAL_METHODS.get() use Answers.CALLS_REAL_METHODS .\\n */\\n```\\n\",\n \"I would agree with @philwebb that this method had been made deprecated in 2.0 (-beta.2) not in 1.10.x (in fact at first it was [removed](https://github.com/mockito/mockito/commit/34f4436d988f04eaf7635b0497067ee8df7971a6) completely and one month later [restored](https://github.com/mockito/mockito/commit/32dce3ea56fb2891b54be48c16a13d2a9eb0cd33) as deprecated), but what is more important `Answers` started implementing `Answer` then. Because of that when I was fixing that issue in Spring Boot it was hard to keep code compatible with both versions at runtime (for 1.x casting using it as Answer does not work, for never 2.x `get()` is not available). In the end I had to [do](https://github.com/spring-projects/spring-boot/pull/6323/files) ugly casting through `Object` to fool the compiler. With that Spring Boot should work fine (at least with changes related to `Answers` :) ), but there could be other tools (PowerMock?) that after removing this method cannot be easily compatible with both Mockito 1.x and 2.x. IMHO it would be good to keep this method in 2.x and remove in 3.x.\\n\",\n \"Yes that seems like a good idea. Mind want to open a pull request?\\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-07-11T13:12:41Z","string":"2016-07-11T13:12:41Z"},"labeled_as":{"kind":"list like","value":["bug"],"string":"[\n \"bug\"\n]"},"problem_title":{"kind":"string","value":"Restore depecated Answers.get() method"},"problem_statement":{"kind":"string","value":"Commit da5e750957b494e7fa0548bf1286d67b8b0386d5 removed the deprecated `Answers.get()` method, however the method was only deprecated in the 2.0 BETA line and never made it into a GA release. It would be helpful if the method could remain in the deprecated form in 2.0 to give people an opportunity to move away from it.\n\n(originally raise by a Spring Boot user [here](https://github.com/spring-projects/spring-boot/pull/6323))\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/Answers.java"],"string":"[\n \"src/main/java/org/mockito/Answers.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/Answers.java"],"string":"[\n \"src/main/java/org/mockito/Answers.java\"\n]"},"test_files":{"kind":"list like","value":[],"string":"[]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/Answers.java b/src/main/java/org/mockito/Answers.java\nindex 5d86e9abdf..3f2ec706a1 100644\n--- a/src/main/java/org/mockito/Answers.java\n+++ b/src/main/java/org/mockito/Answers.java\n@@ -5,11 +5,11 @@\n package org.mockito;\n \n import org.mockito.internal.stubbing.answers.CallsRealMethods;\n-import org.mockito.internal.stubbing.defaultanswers.TriesToReturnSelf;\n import org.mockito.internal.stubbing.defaultanswers.GloballyConfiguredAnswer;\n import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs;\n import org.mockito.internal.stubbing.defaultanswers.ReturnsMocks;\n import org.mockito.internal.stubbing.defaultanswers.ReturnsSmartNulls;\n+import org.mockito.internal.stubbing.defaultanswers.TriesToReturnSelf;\n import org.mockito.invocation.InvocationOnMock;\n import org.mockito.stubbing.Answer;\n \n@@ -24,7 +24,7 @@\n *
This is not the full list of Answers available in Mockito. Some interesting answers can be found in org.mockito.stubbing.answers package.\n */\n-public enum Answers implements Answer{\n+public enum Answers implements Answer {\n /**\n * The default configured answer of every mock.\n *\n@@ -78,8 +78,7 @@ public enum Answers implements Answer{\n *\n * @see org.mockito.Mockito#RETURNS_SELF\n */\n- RETURNS_SELF(new TriesToReturnSelf())\n- ;\n+ RETURNS_SELF(new TriesToReturnSelf());\n \n private final Answer implementation;\n \n@@ -87,7 +86,16 @@ public enum Answers implements Answer{\n this.implementation = implementation;\n }\n \n+ /**\n+ * @deprecated Use the enum-constant directly, instead of this getter. This method will be removed in a future releaseAnswers.CALLS_REAL_METHODS.get() use Answers.CALLS_REAL_METHODS.\n+ */\n+ @Deprecated\n+ public Answer get() {\n+ return this;\n+ }\n+\n public Object answer(InvocationOnMock invocation) throws Throwable {\n return implementation.answer(invocation);\n- } \n-}\n\\ No newline at end of file\n+ }\n+}\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-07-10T22:07:23","string":"2016-07-10T22:07:23"},"issue_created_at":{"kind":"timestamp","value":"2016-07-06T21:22:33Z","string":"2016-07-06T21:22:33Z"},"issue_by_user":{"kind":"string","value":"philwebb"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":476,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/506_507"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/506"},"pr_id":{"kind":"string","value":"mockito/mockito/507"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=0.0, similarity=0.8444239392740068)","keyword_pr_to_issue"],"string":"[\n \"timestamp(timedelta=0.0, similarity=0.8444239392740068)\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"21f80c8de824fc9a8c3d56fff029f6909d4b5b84"},"merge_commit":{"kind":"string","value":"8fc9b5da2156cc8c038f2e2431459127b0901e1f"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-07-24T17:17:18Z","string":"2016-07-24T17:17:18Z"},"labeled_as":{"kind":"list like","value":["enhancement"],"string":"[\n \"enhancement\"\n]"},"problem_title":{"kind":"string","value":"Improved exception message for wanted but not invoked"},"problem_statement":{"kind":"string","value":"Currently, Mockito prints following message when specific verification fails:\n\n```\nWanted but not invoked:\nmock.simpleMethod();\n-> at ....\n\nHowever, there were other interactions with this mock:\nmock.otherMethod();\n-> at ....\nmock.booleanReturningMethod();\n-> at ....\n```\n\nIt would be useful to print the number of invocations:\n\n```\nWanted but not invoked:\nmock.simpleMethod();\n-> at ....\n\nHowever, there were exactly 2 interactions with this mock:\nmock.otherMethod();\n-> at ....\nmock.booleanReturningMethod();\n-> at ....\n```\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/exceptions/Reporter.java","src/main/java/org/mockito/internal/reporting/Pluralizer.java"],"string":"[\n \"src/main/java/org/mockito/internal/exceptions/Reporter.java\",\n \"src/main/java/org/mockito/internal/reporting/Pluralizer.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/exceptions/Reporter.java","src/main/java/org/mockito/internal/reporting/Pluralizer.java"],"string":"[\n \"src/main/java/org/mockito/internal/exceptions/Reporter.java\",\n \"src/main/java/org/mockito/internal/reporting/Pluralizer.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/reporting/PluralizerTest.java","src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java","src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/reporting/PluralizerTest.java\",\n \"src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java\",\n \"src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/exceptions/Reporter.java b/src/main/java/org/mockito/internal/exceptions/Reporter.java\nindex 02e9a918fb..47505bf4cb 100644\n--- a/src/main/java/org/mockito/internal/exceptions/Reporter.java\n+++ b/src/main/java/org/mockito/internal/exceptions/Reporter.java\n@@ -8,13 +8,7 @@\n import org.mockito.exceptions.base.MockitoAssertionError;\n import org.mockito.exceptions.base.MockitoException;\n import org.mockito.exceptions.misusing.*;\n-import org.mockito.exceptions.verification.NeverWantedButInvoked;\n-import org.mockito.exceptions.verification.NoInteractionsWanted;\n-import org.mockito.exceptions.verification.SmartNullPointerException;\n-import org.mockito.exceptions.verification.TooLittleActualInvocations;\n-import org.mockito.exceptions.verification.TooManyActualInvocations;\n-import org.mockito.exceptions.verification.VerificationInOrderFailure;\n-import org.mockito.exceptions.verification.WantedButNotInvoked;\n+import org.mockito.exceptions.verification.*;\n import org.mockito.internal.debugging.LocationImpl;\n import org.mockito.internal.exceptions.util.ScenarioPrinter;\n import org.mockito.internal.junit.JUnitTool;\n@@ -36,6 +30,7 @@\n import java.util.List;\n \n import static org.mockito.internal.reporting.Pluralizer.pluralize;\n+import static org.mockito.internal.reporting.Pluralizer.were_exactly_x_interactions;\n import static org.mockito.internal.util.StringJoiner.join;\n \n /**\n@@ -319,7 +314,8 @@ public static MockitoAssertionError wantedButNotInvoked(DescribedInvocation want\n if (invocations.isEmpty()) {\n allInvocations = \"Actually, there were zero interactions with this mock.\\n\";\n } else {\n- StringBuilder sb = new StringBuilder(\"\\nHowever, there were other interactions with this mock:\\n\");\n+ StringBuilder sb = new StringBuilder(\n+ \"\\nHowever, there \" + were_exactly_x_interactions(invocations.size()) + \" with this mock:\\n\");\n for (DescribedInvocation i : invocations) {\n sb.append(i.toString())\n .append(\"\\n\")\ndiff --git a/src/main/java/org/mockito/internal/reporting/Pluralizer.java b/src/main/java/org/mockito/internal/reporting/Pluralizer.java\nindex 5e597f32ec..1e8d0e3f4b 100644\n--- a/src/main/java/org/mockito/internal/reporting/Pluralizer.java\n+++ b/src/main/java/org/mockito/internal/reporting/Pluralizer.java\n@@ -9,4 +9,12 @@ public class Pluralizer {\n public static String pluralize(int number) {\n return number == 1 ? \"1 time\" : number + \" times\";\n }\n+\n+ public static String were_exactly_x_interactions(int x) {\n+ if (x == 1) {\n+ return \"was exactly 1 interaction\";\n+ } else {\n+ return \"were exactly \" + x + \" interactions\";\n+ }\n+ }\n }\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/reporting/PluralizerTest.java b/src/test/java/org/mockito/internal/reporting/PluralizerTest.java\nindex f35c3a8d0a..c2e1333fe9 100644\n--- a/src/test/java/org/mockito/internal/reporting/PluralizerTest.java\n+++ b/src/test/java/org/mockito/internal/reporting/PluralizerTest.java\n@@ -12,11 +12,17 @@\n public class PluralizerTest extends TestBase {\n \n @Test\n- public void shouldGetPluralizedNumber() {\n- new Pluralizer();\n+ public void pluralizes_number() {\n assertEquals(\"0 times\", Pluralizer.pluralize(0));\n assertEquals(\"1 time\", Pluralizer.pluralize(1));\n assertEquals(\"2 times\", Pluralizer.pluralize(2));\n assertEquals(\"20 times\", Pluralizer.pluralize(20));\n }\n+\n+ @Test\n+ public void pluralizes_interactions() {\n+ assertEquals(\"were exactly 0 interactions\", Pluralizer.were_exactly_x_interactions(0));\n+ assertEquals(\"was exactly 1 interaction\", Pluralizer.were_exactly_x_interactions(1));\n+ assertEquals(\"were exactly 100 interactions\", Pluralizer.were_exactly_x_interactions(100));\n+ }\n }\ndiff --git a/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java b/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java\nindex b5ea96b7b1..ee99529fab 100644\n--- a/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java\n+++ b/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java\n@@ -55,7 +55,7 @@ public void shouldReportWantedButNotInvoked() {\n \t\texception.expect(WantedButNotInvoked.class);\n \t\texception.expectMessage(\"Wanted but not invoked:\");\n \t\texception.expectMessage(\"mock.simpleMethod()\");\n-\t\texception.expectMessage(\"However, there were other interactions with this mock:\");\n+\t\texception.expectMessage(\"However, there was exactly 1 interaction with this mock:\");\n \t\texception.expectMessage(\"mock.differentMethod();\");\n \n \t\tchecker.check(invocations, wanted);\ndiff --git a/src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java b/src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java\nindex d352fabfa1..f6245a3841 100644\n--- a/src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java\n+++ b/src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java\n@@ -21,14 +21,18 @@ public class OrdinaryVerificationPrintsAllInteractionsTest extends TestBase {\n \n @Test\n public void shouldShowAllInteractionsOnMockWhenOrdinaryVerificationFail() throws Exception {\n+ //given\n firstInteraction();\n secondInteraction();\n- \n+\n+ verify(mock).otherMethod(); //verify 1st interaction\n try {\n+ //when\n verify(mock).simpleMethod();\n fail();\n } catch (WantedButNotInvoked e) {\n- assertContains(\"However, there were other interactions with this mock\", e.getMessage());\n+ //then\n+ assertContains(\"However, there were exactly 2 interactions with this mock\", e.getMessage());\n assertContains(\"firstInteraction(\", e.getMessage());\n assertContains(\"secondInteraction(\", e.getMessage());\n }\n"},"split_random":{"kind":"string","value":"val"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-07-24T18:50:59","string":"2016-07-24T18:50:59"},"issue_created_at":{"kind":"timestamp","value":"2016-07-24T17:04:33Z","string":"2016-07-24T17:04:33Z"},"issue_by_user":{"kind":"string","value":"mockitoguy"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":477,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/194_510"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/194"},"pr_id":{"kind":"string","value":"mockito/mockito/510"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue","timestamp(timedelta=2.0, similarity=0.845934960890665)"],"string":"[\n \"keyword_pr_to_issue\",\n \"timestamp(timedelta=2.0, similarity=0.845934960890665)\"\n]"},"base_commit":{"kind":"string","value":"2e1e51cf0f9178c68bcba1c97bcbe3213e002f34"},"merge_commit":{"kind":"string","value":"68c7812d29e39d0c459ffd21498018d7801561e8"},"hints_text":{"kind":"list like","value":["`any` family is currently _(at his time up to 2.0.5-beta)_ inconsistent on the way they allow or not `null`s. Type checking is ok, but `null` check behavior consistency is also important.\n","AnyX gramtaically tends to imply to return false for null because any\nobject is not null. I agree completely the api should be consistent.\n\nOn Sun, Apr 5, 2015, 11:54 Brice Dutheil notifications@github.com wrote:\n\n> any family is currently _(at his time up to 2.0.5-beta)_ inconsistent on\n> the way they allow or not nulls. Type checking is ok, but null check\n> behavior consistency is also important.\n> \n> ## \n> \n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/194#issuecomment-89831862.\n","> AnyX gramtaically tends to imply to return false for null because any object is not null.\n\nI'm not anymore of sure of that. Anyway the changes introduced in this API make it inconsistent.\nThat's why I propose any validates `null`, and if not `null` then validates the type\n\nAlso on the mentioned thread _Francisco Olarte_ was proposing a `anyNotNull` family, this could clarify the behavior on `null` of these APIs.\n","Agreed. Any should return false for null and false for wrong type (instance\nof). Otherwise I think it would violate the principle of least surprise.\n\nOn Sun, Apr 5, 2015, 12:57 Brice Dutheil notifications@github.com wrote:\n\n> AnyX gramtaically tends to imply to return false for null because any\n> object is not null.\n> \n> I'm not anymore of sure of that. Anyway the changes introduced in this API\n> make it inconsistent.\n> That's why I propose any validates null, and if not null then validates\n> the type\n> \n> Also on the mentioned thread _Francisco Olarte_ was proposing a anyNotNull\n> family, this could clarify the behavior on null of these APIs.\n> \n> ## \n> \n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/194#issuecomment-89842760.\n","I see anyString() ( and friends ) checking for null and anyObject() not doing it as an inconsistency potentially leading to user surprise. Object is as much of a class as String ( or other ).\n\nOther thing is I fail to see is the difference ( if there is any ) between isA(Klazz) and notNull(Klazz) ( or IsNotNull, but I see that one is a forwarder ). To me they seem they do the same, given the docs, but the code is different and I'm not familiar enough with it to assert they do the same thing. When doing DSL helper libraries I've found ( the hard way ) having slightly different names for the same thing seems a good idea initially, but leads to problem along the way, so I would vote for just having one of notNull/isNotNull ( and isA if it is functionally equivalent ).\n","I think there might be confusion here: @szczepiq I don't think the two of you are agreeing. @bric3 seems to be saying that `any` should match nulls and anyNotNull should exist (and presumably not match null), while you're saying that `any` should not match null.\n\nI think the problem here is that there's two use cases that currently aren't clearly separated, both of which we need to support.\n1. I don't care what the value I'm matching is _at all_, I want a very simple intuitive wildcard matcher that will match absolutely anything, and will compile with no extra effort (so no casts).\n2. I care about the type of the value that I'm matching, but no details beyond that. I want a matcher that will not match values with the wrong type.\n\nI think both of these are major common use cases. If we make any of the `anyX()` methods reject nulls, they no longer support the first case, and if we leave it as-is then they currently appear to support the 2nd case but aren't really doing so, which is where all this came from originally.\n\nI do think any API that supports use case 2 should reject nulls by default: if you're asserting specifically on the type of the value, we should push people to be clear about whether or not null is valid in the given case. I think an API for use case 1 should not reject nulls, because you want to match _everything_.\n\nThese are two quite different APIs though, and to get any kind of API consistency, we're going to need them to be separate sets of methods. I suggest:\n- `any()` - matches absolutely anything, including nulls, as a generic method returning T (as now)\n- `anyAsX()` and `anyAs(X.class)` - matches absolutely anything, including nulls, as a generic method returning X\n - This is as in 1.9, but with the names changed to make it clear that this is purely a type casting concern, not type checking, and intentionally being a bit more verbose to discourage unnecessary use.\n - Note that as of Java 8 target type inference considers method arguments, so you should be able to use `any()` in every case except choosing between overloaded methods (pretty rare?). In addition, note that Java 7's final update is this month, and then it's unsupported.\n - We'd also obviously document that users should prefer isA etc if they want to check the type, but I think it's much more obvious that `anyAsString()` isn't actually checking the value's a string (unlike `anyString()`, which did suggest that).\n- `isA/isAn(X.class)` and `isAnX()` - matches on type, rejecting nulls\n- `isNullOrAn(X.class)` and `isNullOrAnX()` - matches on type, accepting nulls\n\nI think this makes for a relatively small change, so gives fairly easy migration, but makes it clear that the `any()` methods are all just generic wildcards (for use case 1), and provides a clear set of other methods to support actual type checking and pushing users to be clear about nullability along the way (for use case 2).\n\nThe only other option I can see we might want to do is stop supporting use case 1 entirely, make everybody be much more specific about what they want, and reject nulls everywhere. I think use case one is likely to be the most common case for use argument matchers anywhere though, far more than anything else, and we definitely definitely need to support it as an intuitive easy first-class citizen.\n\nThoughts? Do people agree both use cases are common and important? Does anybody have a better solution to help us get both while keeping a sensible consistent API?\n","On Tue, Apr 7, 2015 at 5:12 PM, Tim Perry notifications@github.com wrote:\n\n> These are two quite different APIs though, and to get any kind of API\n> consistency, we're going to need them to be separate sets of methods. I\n> suggest:\n> - any() - matches absolutely anything, including nulls, as a generic\n> method returning T (as now)\n> - anyAsX() and anyAs(X.class) - matches absolutely anything, including\n> nulls, as a generic method returning X\n> - This is as in 1.9, but with the names changed to make it clear\n> that this is purely a type casting concern, not type checking, and\n> intentionally being a bit more verbose to discourage unnecessary use.\n> - Note that as of Java 8 target type inference considers method\n> arguments, so you should be able to use any() in every case except\n> choosing between overloaded methods (pretty rare?). In addition, note that\n> Java 7's final update is this month, and then it's unsupported.\n> - We'd also obviously document that users should prefer isA etc if\n> they want to check the type, but I think it's much more obvious that\n> anyAsString() isn't actually checking the value's a string (unlike\n> anyString(), which did suggest that).\n> - isA/isAn(X.class) and isAnX() - matches on type, rejecting nulls\n> - isNullOr(X.class) and isNullOrX() - matches on type, accepting nulls\n> \n> I think this makes for a relatively small change, so gives fairly easy\n> migration, but makes it clear that the any() methods are all just generic\n> wildcards (for use case 1), and provides a clear set of other methods to\n> support actual type checking and pushing users to be clear about\n> nullability along the way (for use case 2).\n> \n> The only other option I can see we might want to do is stop supporting use\n> case 1 entirely, make everybody be much more specific about what they want,\n> and reject nulls everywhere. I think use case one is likely to be the most\n> common case for use argument matchers anywhere though, far more than\n> anything else, and we definitely definitely need to support it as an\n> intuitive easy first-class citizen.\n> \n> Thoughts? Do people agree both use cases are common and important? Does\n> anybody have a better solution to help us get both while keeping a sensible\n> consistent API?\n\nI agree all are used and importants.\n\nI'm still struggling with the difference between `isNullOr(X.class)` and `anyAs(X.class)`. The only difference I see is if I have a class `A` with a subclass `subA`, and a class `B` with a subclass `subB`, and a couple of methods `M(A)` and `M(B)` is that `M(anyAs(subB.class))` will select `M(B)` and match on a `B`, but `M(isNullOr(subB.class)` will select it and match only on a `subB`, so I could have a broader matcher for `M(isNullOr(B.class))`.\n\nEven if this is the case, I would just suppress the `anyAs(X.class)`, as my contrived example could be better written as `anyAs(B.class)`, In which case I would rename isNullOr to any, and isA to anyNotNull. In the naming side I find `any()` natural, `anyAs` forced, as I consistently read `any(X.class)`\nas _'any thing which can be assigned to a variable of type X'_.\n\nSo I would end up with only two method names, any and `anyNotNull` with a parameterless plus a class parameter variant ( discounting typeing helpers like `anyNotNullString`), which would work:\n1. `anyNotNull`, in any variant, does not accept nulls, any does.\n2. A parameterless `any()`/`anyNotNull()` is equivalent to the same method with the declared parameter class. Note, if you can use `any[NotNull]()` in the methods there are no overloads, and the language guarantees I cannot use an incorrect type.\n\nSo, if I have a method `M(List l)`, `M(any(ArrayList.class))` would match anything which can be stored in an `ArrayList` var, subclasses and `null` included, and `anyNotNull(ArrayList.class)` will need a not null one. `M(any())` would exactly as `M(any(List.class))`. Mockito cannot check it, but I cannot write code to call `M` with a non-list argument, java is type checked. Same goes for `anyNotNull`.\n\nOTOH, if I have `M(Set s)` too, I must use `M(any(Set.class))` or `M(any(List.class))`, just to resolve the overload, although in this case the matcher type checking is superfluous.\n\nI do not see the point on `any(X.class)` not checking the type and having `isA(X.class)` which does, it seems confusing to me, so my proposal is basically zapping any of the variants. I mean, from the description, in the overloaded method, `M(any(ArrayList.class))` will select the list variant but\nmatch a call with any `List` subtype, while `isNullOr(ArrayList.class)` will only match `ArrayList`s ?. I do not see this has any real use ( the parameter type must be accessible in the test, if you want any List, use `isNullOr(List.class)`).\n\nMaybe I'm missing something, but I see `any(X.class)` redundant, better served by `isNullOr`, the rest is just naming disagreement.\n\nFrancisco Olarte.\n","The issue with getting rid of `anyAs(X.class)` is that we want two things:\n- A way to match an argument without checking anything about its value (any)\n- A way to match an argument and check its type (isA)\n\nI think your solution is to just use `any()` with no parameter everywhere to cover the first case, and specify the type when you want the 2nd case. That won't work, because target type inference doesn't work for method arguments in Java < 8, so it's impossible to use any() without an argument (unless the parameter is just `Object` typed).\n\nSpecifically, in Java 7 the below won't compile:\n\n``` java\nclass X {\n public bool method(List l) { ... }\n}\n\nX x = mock(X.class);\n\n// ERROR: method(java.collections.List) cannot be applied to (java.lang.Object)\nwhen (x.method(any()).thenReturn(true);\n```\n\nAnybody on Java < 8 has to specify the type every time they match anything, or it's impossible to make it compile. They can never really use `any()`; they always have to use `any(X.class)` (or equivalent). We need a way in Java 7 that you can say 'match absolutely anything please' that compiles, and I think `any(X.class)` or equivalent is the only option.\n\nIf you make that `any(X.class)` matcher check the type (as you suggest) then it no longer matches everything any more, and it becomes impossible to wildcard match everything in Java < 8 (without casting, but that would be pretty nasty)\n\nTherefore if you want to be able to both match specific types and wildcard 'match everything' in Java < 8, you have to have two separate APIs to do so. The names of those APIs need to clearly tell the user which of those two things they're doing ('match anything, but cast the matcher to make it compile' vs 'match only this type').\n\nI don't think that's avoidable. I'm very happy to take better suggestions for `anyAs(X.class)` that make it clearer it's just a convenient casting method (without making it so nasty that it stops being convenient), but that method does still need to exist I think.\n\nIn addition to all that: we'd rather the 'match a specific type' matcher didn't accept nulls by default (as your `any(List.class)` does). We need to make people opt in to matching nulls, because it's good practice, and because there's some potentially confusing behaviour there as nulls are kind of outside the type system. We also can't have the wildcard matcher reject nulls, or it's not matching everything any more. Thus, again, they need to be two different methods.\n","Hi Tim:\n\nOn Tue, Apr 7, 2015 at 7:37 PM, Tim Perry notifications@github.com wrote:\n\n> The issue with getting rid of anyAs(X.class) is that we want two things:\n> \n> A way to match an argument without checking anything about its value (any)\n> A way to match an argument and check its type (isA)\n> \n> I think your solution is to just use any() with no parameter everywhere to cover the first case, and specify the type when you want the 2nd case. That won't work, because target type inference doesn't work for method arguments in Java < 8, so it's impossible to use any() without an argument (unless the parameter is just Object typed).\n\nI don't think you've understood my solution. From the previously\npropossed one ( any() + anyAs(Class) + isA(Class) + isNullOrA(class) (\n- notNull(), which is in another place ) I propose to remove anyAs,\n given it does not check type, rename isA(Class) to anyNotNull(Class),\n rename isNullOrA(Class) to any(Class) and rename ( or forward )\n notNull() to anyNotNull().\n\n> Specifically, in Java 7 the below won't compile:\n> \n> class X {\n> public bool method(List l) { ... }\n> }\n> \n> X x = mock(X.class);\n> \n> // ERROR: method(java.collections.List) cannot be applied to (java.lang.Object)\n> when (x.method(any()).thenReturn(true);\n\nPerfect, in this case you use the propossed isNullOrA(Class), which I\nproposed to rename as any(Class).\n\nAlso, just grepped and got this from one of my test files:\n\n```\n AC1 = mock(AutoCaller.class);\n when(AC1.makeCall((AcCallRequest) any())).thenReturn(resp1);\n```\n\nIn case you wonder, AutoCaller is an interface with a method\n\"MakeCallResponse makeCall(AcCallRequest)\", not overloaded.\n\nI think this is clearly superior in java 7 ( I'm unable to use java 8\non those projects due to problems with the app server ). The any()\nconveys the 'i do not care, just make this compile' and the cast\nclearly says 'this is due to one of those java 7 shortcomings' to me.\n\n> Anybody on Java < 8 has to specify the type every time they match anything, or it's impossible to make it compile. They can never really use any(); they always have to use any(X.class) (or equivalent). We need a way in Java 7 that you can say 'match absolutely anything please' that compiles, and I think any(X.class) or equivalent is the only option.\n\nWhich is what I proposed, you have IsNullOrA(Class), which covers\nthis. Correct me if wrong.\n\n> If you make that any(X.class) matcher check the type (as you suggest) then it no longer matches everything any more, and it becomes impossible to wildcard match everything in Java < 8 (without casting, but that would be pretty nasty)\n\nIt is. The Method has a declared argument type of List, which means\nthe compiler will check that when you use the mock, in\nx.method(whatever) whatever implements List, so isNullOrA(List.class),\nor any(List.class) will allways match whatever, with an extra\nredundant type check.\n\n> Therefore if you want to be able to both match specific types and wildcard 'match everything' in Java < 8, you have to have two separate APIs to do so. The names of those APIs need to clearly tell the user which of those two things they're doing ('match anything, but cast the matcher to make it compile' vs 'match only this type').\n\nAs I said, I'm not knowdledgeable enough and haven't got time\npresently to dig through the sources. If any(List.class) matches when\nI pass an ArrayList to the Mock I can always wildcard by using the\ndeclared argument type.\n\n> I don't think that's avoidable. I'm very happy to take better suggestions for anyAs(X.class) that make it clearer it's just a convenient casting method (without making it so nasty that it stops being convenient), but that method does still need to exist I think.\n\nForget about my proposed renaming., With the any/anyAs/isA/IsNullOrA\nproposal, is there any case in which you must use anyAs() which cannot\nbe solved by using isNullOrA(X.class)? I think they are synonims. The\nproblem I see with anyAs as stated is that, in the previous example (\nwithout overloads ), I could code a matcher as\nwhen(x.method(anyAs(ArrayList.class))) and it shoud fire ( as it does\nnot check type ) when I do x.method(new LinkedList()). I think this is\nconfusing and asking for problem, and by making it check the type I\ncould make when(x.method(anyAss(ArrayList.class))) to catch one\nspecific thing and after that add when(x.method(anyAs(List.class)) for\na catch all in java<8, or just plain any() in >=8.\n\nMy proposal of getting rid of anyAs can be read the other way, make\nanyAs() check type and get rid of isNullOrA.\n\nRepeating my self, I proposed to get rid of anyAs(Class) as a I feel\nit seems to match something which it does not, and it cannot do\nanything which cannot be done with isNullOr(class). Name it whatever,\nis the functionality with worries me.\n\n> In addition to all that: we'd rather the 'match a specific type' matcher didn't accept nulls by default (as your any(List.class) does). We need to make people opt in to matching nulls, because it's good practice, and because there's some potentially confusing behaviour there as nulls are kind of outside the type system. We also can't have the wildcard matcher reject nulls, or it's not matching everything any more. Thus, again, they need to be two different methods.\n\nThat's another thing. What I propose is to simplify so I have two\nnames ( anyIncludingNull, anyNotNull ) which indicate wether null is\naccepted, plus two overrides, no parameters and a class parameter. The\nnull accepting behaviour is functionaly equivalent to haven just a\nname plus a boolean parameter ( notReallyAny(boolean acceptNull) +\nnotReallyAny(boolean acceptNull, Class klass) ).\n\nWhat makes me feel uncorfortable with the proposal is :\n- Too many names, I think two suffice.\n- Different names for similar methods, similar names for different\n null accepting behaviour.\n\nGiven this, I think:\n- anyIncludingNul(), anyIncludingNul(Class), anyNotNull(),\n anyNotNul(Class) cover all cases, for jdk <8 & 8 ( although\n parameterless ones are not too useful in <8 ) ( your example would be\n served by when(x.method(anyIncludingNull(List.class)) ).\n- names should be kept paired. You state opting in for nulls is good\n practice, I'll accept that without discussion. You say people should\n opt in to use them, I accept thas as a precondition. Writing\n anyIncludingNull is for me opting in.\n\nBut then, we want 'any()'. It's nice, sounds good, it is short, reads\ngood (any() in 8, I do not care, just need this to compile,\nany(List.class) in 7, I do not care, but .Well, then writing 'any(' is\nopting in to use nulls, so the class version should begin with 'any('\ntoo. I have no problem with having the null accepting versions\n'nonDefaultAcceptingNullsAnyMatcher', and the other one 'any', or\n'isA', IDEs are really good at completing, and I can easily manage a\ncouple of names, but having any, anyAs, isA, isNullOrA, and notNull\nhorrifies me.\n\nWell, that's all for today. I hope it clarifies my position.\n\nRegards.\n Francisco Olarte.\n","Ok, I think that mostly makes sense, although I'm not clear exactly what the full API you're proposing is that fits the requirements here. Your last paragraph seems to contradict the four methods you've suggested just above.\n\nI think you're still suggesting an `any()` method with actively different behaviour to an `any(X.class)` method though. Inconsistencies between those two are how we ended up here, because one does active type matching and the other doesn't, and you need different null matching behaviour too. In addition, you definitely need `any()` or it'll be confusing, so I don't think there's any way you can have an `any(X.class)` method that does actual matching.\n\nSounds like there is a route through though: what happens if we accept that Java 7 is on the way out, stick only to casts, and stop making the API confusing just to support now unsupported Java versions? That would give an API of:\n- `any()` - matches anything\n- `isA(X.class)` - matches things with X type, not nulls\n- `isNullOrA(X.class)` - matches things with X type, or nulls\n\nIf you're using Java 8, all is good, simple and clear. If you're using Java 7 you have to cast `any()`, but `(MyClass) any()` is clearer about what it's doing than anything else we have here, actually shorter than `any(MyClass.class)` anyway, and good IDE's will automatically suggest the cast for you too, so pretty easy to find for newbies. Null behaviour is also clear here, and we're pushing people to be explicit about whether they match nulls in all arguments they care about.\n\nHow does that sound to everybody?\n","Hi Tim:\n\nOn Wed, Apr 8, 2015 at 8:38 PM, Tim Perry notifications@github.com wrote:\n\n> Ok, I think that mostly makes sense, although I'm not clear exactly what the full API you're proposing is that fits the requirements here. Your last paragraph seems to contradict the four methods you've suggested just above.\n\nAny of my paragraphs may seem contradictory, but I do not know how to\nconvey the info and do not know what the exact requirements are., but\nanyway, lets go on.\n\n> I think you're still suggesting an any() method with actively different behaviour to an any(X.class) method though.\n\nIn my full sugestion not exactly, I suggested any to be the same as\nany(Object.class), ( declared parameter class really, but it could be\nimplemented this way ). It checks the passed thing is null or a\nsubclass of Object ( second check redundant, stated for completitude\n).\n\n> Inconsistencies between those two are how we ended up here, because one does active type matching and the other doesn't, and you need different null matching behaviour too. In addition, you definitely need any() or it'll be confusing, so I don't think there's any way you can have an any(X.class) method that does actual matching.\n> \n> Sounds like there is a route through though: what happens if we accept that Java 7 is on the way out, stick only to casts, and stop making the API confusing just to support now unsupported Java versions? That would give an API of:\n> any() - matches anything\n> isA(X.class) - matches things with X type, not nulls\n> isNullOrA(X.class) - matches things with X type, or nulls\n\nI'm definitely in favour of sticking to casts, as they are a standard\nlanguage feature and should be clear.\n\nNow, on your three proposed methods, you are forgetting one, which is\non another part of the current API, notNull() ( or it's cousing\nnotNull(Class), I do not know whic notNull is not declared generic\nlike any though, I think it SHOULD be for java 8 ).\n\nYou have 2 choices, 1.- accept nulls, 2.-check class, For 1 you need\neither a boolean argument or different names, for 2 you need a Class\nargument to check against. So, in your proposal you would have:\n- accept nulls, do not check class: any(), used as is in java 8,\n casted in 7 ( or for overload resolution in 8 ).\n- accept nulls, check class: isNullOrA(Class)\n- reject nulls, do not check class: notNull() ( same comments as any )\n- reject nulls, check class: isA(Class)\n\nWhich is fine dandy for me ( the naming stuff is trivial to achieve\nusing a FranciscoOlarteAdditionalMatchers helper class )\n\nBasically you can have a makeMatcher(boolean acceptNulls, Class klass\n) and then any()==makeMatcher(true, Object.class),\nisNullOrA(klass)=makeMatcher(true, klass),\nnotNull()=makeMatcher(false, Object.class),\nisA(klass)=makeMatcher(false, klass).\n\n> If you're using Java 8, all is good, simple and clear. If you're using Java 7 you have to cast any(), but (MyClass) any() is clearer about what it's doing than anything else we have here, actually shorter than any(MyClass.class) anyway, and good IDE's will automatically suggest the cast for you too, so pretty easy to find for newbies. Null behaviour is also clear here, and we're pushing people to be explicit about whether they match nulls in all arguments they care about.\n\nI think the null / check behaviour is clearer if you group them\ntogether somehow ( like I've done above ). As this gets rid of the\nconfusing (current) anyAs(Class). Also I think notNull(Class) must go,\nas what is does is served by isA(class).\n\n> How does that sound to everybody?\n\nFine for me.\n\n---------------NOT A PROPOSAL----------------\nNow, I'll explain what I proposed ( for NAMING along with some\nmotivations ). I think this discussion seems to prove it is not easily\nunderstood, this is only for reference.\n\nNote there are no functional changes with the proposal above, just\nname reorganizations as I think current names are confusing ( and I\nknow they are for me, but this is my problem and I can solve it ).\n\n0.- get rid of anyAs and notNull(class) ( served by isA and isNullOrA ).\n\n1.- any() - keep as it is.\n2.- isNullOrA(class): rename to any(class), as functionality is very\nsimilar (any()==isNullOrA(DeclaredParameterClass.class))\n3.- isA() - rename to anyNotNull ( it appears next to any() in methods\nlist, and makes the behavioural differences easy to spot. Also, if you\nhave a method any() and anyNotNull ( both being offered by\nautocomplete ) is natural to assume that any==anyIncludingNull, which\nis correct ).\n4.- notNull() - rename to anyNotNull() ( to complete the matrix ).\n\nNote: In my NAMING proposal naked any==acceptNulls, It could easily be\nreversed ( any=>anyOrNull, anyNotNull=>any, it just sounds bad to me\nthat way ( maybe because I'm used to x(Object) and x(@NonNull Object)\nand/or explicitly documenting when nulls are not allowed).\n\nExtra things:\n- anyObject() - seems to do the same thing as any, if so get rid of it\n if to avoid confusion, if not do the same as with anyString below.\n- isNull(Class) - given it can be done with (Class)isNull(), get rid\n of it. No need for a class checking version on this.\n- anyString: Confusing name with current behaviour, given any() accept\n nulls. Rename it to isAString and then, per rule 3 above, to\n anyNotNullString. THEN I would add an anyString, equal to\n isNullOrA(String.class) or any(String.class) per rule 2. Also,\n consider deleting it (note below)\n- anyInt/anyChar/...: as with anyString, in nearly all aspects.\n- anyMap/anyMapOf ( and it's friends anyList, anyCollection ): Similar\n to anyString, rename to anyNotNullMap, and then use the now free\n anyMap to build one accepting nulls.\n\nfor anyString/anyInt/..... I would consider having a basic matchers\nclass, with any/anyNotNull etc.., and a matchers derived class ( a la\nAdditionalMatchers ) and relegate all aliases to that one, so the\njavadoc for the basic matchers class concentrates on basic\nfunctionality and the one for the aliases/forwarders just states the\nequivalence ). In fact I would better put a class for just the basic\nany\\* matchers ( including just any(), any(Class), anyNotNull(),\nanyNotNull(class) and isNull(class)), another one for\neq/startsWith/... another one for the anyString and friends. Static\nimports make them easy to use in modern Java and the documentation\nwould be much easier to read (for me at least).\n\n## Hope this explains my vision.\n\nRegards.\n Francisco Olarte.\n","I apologize, I haven't read the entire thread. I'm still setting up my\nfamily in CA and trying to manage prioriorities.\n\nI think we have following use cases:\n1. I don't care about the parameter\n2. I care that it is not null\n3. I care about the type (implies (2))\n\nSolutions:\n\n1) any(), perhaps kill anyObject(), needs explicit casting\n2) no special API, kill isNotNull()/notNull() or just leave the\nisNotNull()/notNull(), needs explicit casting\n3) any(String.class) alias to isA(String.class) (or kill isA(...))\n\nI think it is ok if only use case 3) offers API that avoids casting. E.g.\nif the user wants to avoid casting he needs to specify the matcher better\n(which I don't think is a problem).\n\nCheers!\n\nOn Thu, Apr 9, 2015 at 2:39 AM, Francisco Olarte notifications@github.com\nwrote:\n\n> Hi Tim:\n> \n> On Wed, Apr 8, 2015 at 8:38 PM, Tim Perry notifications@github.com\n> wrote:\n> \n> > Ok, I think that mostly makes sense, although I'm not clear exactly what\n> > the full API you're proposing is that fits the requirements here. Your last\n> > paragraph seems to contradict the four methods you've suggested just above.\n> \n> Any of my paragraphs may seem contradictory, but I do not know how to\n> convey the info and do not know what the exact requirements are., but\n> anyway, lets go on.\n> \n> > I think you're still suggesting an any() method with actively different\n> > behaviour to an any(X.class) method though.\n> \n> In my full sugestion not exactly, I suggested any to be the same as\n> any(Object.class), ( declared parameter class really, but it could be\n> implemented this way ). It checks the passed thing is null or a\n> subclass of Object ( second check redundant, stated for completitude\n> ).\n> \n> > Inconsistencies between those two are how we ended up here, because one\n> > does active type matching and the other doesn't, and you need different\n> > null matching behaviour too. In addition, you definitely need any() or\n> > it'll be confusing, so I don't think there's any way you can have an\n> > any(X.class) method that does actual matching.\n> > \n> > Sounds like there is a route through though: what happens if we accept\n> > that Java 7 is on the way out, stick only to casts, and stop making the API\n> > confusing just to support now unsupported Java versions? That would give an\n> > API of:\n> > any() - matches anything\n> > isA(X.class) - matches things with X type, not nulls\n> > isNullOrA(X.class) - matches things with X type, or nulls\n> \n> I'm definitely in favour of sticking to casts, as they are a standard\n> language feature and should be clear.\n> \n> Now, on your three proposed methods, you are forgetting one, which is\n> on another part of the current API, notNull() ( or it's cousing\n> notNull(Class), I do not know whic notNull is not declared generic\n> like any though, I think it SHOULD be for java 8 ).\n> \n> You have 2 choices, 1.- accept nulls, 2.-check class, For 1 you need\n> either a boolean argument or different names, for 2 you need a Class\n> argument to check against. So, in your proposal you would have:\n> - accept nulls, do not check class: any(), used as is in java 8,\n> casted in 7 ( or for overload resolution in 8 ).\n> - accept nulls, check class: isNullOrA(Class)\n> - reject nulls, do not check class: notNull() ( same comments as any )\n> - reject nulls, check class: isA(Class)\n> \n> Which is fine dandy for me ( the naming stuff is trivial to achieve\n> using a FranciscoOlarteAdditionalMatchers helper class )\n> \n> Basically you can have a makeMatcher(boolean acceptNulls, Class klass\n> ) and then any()==makeMatcher(true, Object.class),\n> isNullOrA(klass)=makeMatcher(true, klass),\n> notNull()=makeMatcher(false, Object.class),\n> isA(klass)=makeMatcher(false, klass).\n> \n> > If you're using Java 8, all is good, simple and clear. If you're using\n> > Java 7 you have to cast any(), but (MyClass) any() is clearer about what\n> > it's doing than anything else we have here, actually shorter than\n> > any(MyClass.class) anyway, and good IDE's will automatically suggest the\n> > cast for you too, so pretty easy to find for newbies. Null behaviour is\n> > also clear here, and we're pushing people to be explicit about whether they\n> > match nulls in all arguments they care about.\n> \n> I think the null / check behaviour is clearer if you group them\n> together somehow ( like I've done above ). As this gets rid of the\n> confusing (current) anyAs(Class). Also I think notNull(Class) must go,\n> as what is does is served by isA(class).\n> \n> > How does that sound to everybody?\n> \n> Fine for me.\n> \n> ---------------NOT A PROPOSAL----------------\n> Now, I'll explain what I proposed ( for NAMING along with some\n> motivations ). I think this discussion seems to prove it is not easily\n> understood, this is only for reference.\n> \n> Note there are no functional changes with the proposal above, just\n> name reorganizations as I think current names are confusing ( and I\n> know they are for me, but this is my problem and I can solve it ).\n> \n> 0.- get rid of anyAs and notNull(class) ( served by isA and isNullOrA ).\n> \n> 1.- any() - keep as it is.\n> 2.- isNullOrA(class): rename to any(class), as functionality is very\n> similar (any()==isNullOrA(DeclaredParameterClass.class))\n> 3.- isA() - rename to anyNotNull ( it appears next to any() in methods\n> list, and makes the behavioural differences easy to spot. Also, if you\n> have a method any() and anyNotNull ( both being offered by\n> autocomplete ) is natural to assume that any==anyIncludingNull, which\n> is correct ).\n> 4.- notNull() - rename to anyNotNull() ( to complete the matrix ).\n> \n> Note: In my NAMING proposal naked any==acceptNulls, It could easily be\n> reversed ( any=>anyOrNull, anyNotNull=>any, it just sounds bad to me\n> that way ( maybe because I'm used to x(Object) and x(@NonNull Object)\n> and/or explicitly documenting when nulls are not allowed).\n> \n> Extra things:\n> - anyObject() - seems to do the same thing as any, if so get rid of it\n> if to avoid confusion, if not do the same as with anyString below.\n> - isNull(Class) - given it can be done with (Class)isNull(), get rid\n> of it. No need for a class checking version on this.\n> - anyString: Confusing name with current behaviour, given any() accept\n> nulls. Rename it to isAString and then, per rule 3 above, to\n> anyNotNullString. THEN I would add an anyString, equal to\n> isNullOrA(String.class) or any(String.class) per rule 2. Also,\n> consider deleting it (note below)\n> - anyInt/anyChar/...: as with anyString, in nearly all aspects.\n> - anyMap/anyMapOf ( and it's friends anyList, anyCollection ): Similar\n> to anyString, rename to anyNotNullMap, and then use the now free\n> anyMap to build one accepting nulls.\n> \n> for anyString/anyInt/..... I would consider having a basic matchers\n> class, with any/anyNotNull etc.., and a matchers derived class ( a la\n> AdditionalMatchers ) and relegate all aliases to that one, so the\n> javadoc for the basic matchers class concentrates on basic\n> functionality and the one for the aliases/forwarders just states the\n> equivalence ). In fact I would better put a class for just the basic\n> any\\* matchers ( including just any(), any(Class), anyNotNull(),\n> anyNotNull(class) and isNull(class)), another one for\n> eq/startsWith/... another one for the anyString and friends. Static\n> imports make them easy to use in modern Java and the documentation\n> would be much easier to read (for me at least).\n> \n> ## Hope this explains my vision.\n> \n> Regards.\n> Francisco Olarte.\n> \n> ## \n> \n> Reply to this email directly or view it on GitHub\n> https://github.com/mockito/mockito/issues/194#issuecomment-91175598.\n\n## \n\nSzczepan Faber\nFounder mockito.org; Core dev gradle.org\ntweets as @szczepiq; blogs at blog.mockito.org\n","Hi Szczepan:\n\nmmmm, delicious top posting...., anyway:\n\nOn Thu, Apr 9, 2015 at 3:59 PM, Szczepan Faber notifications@github.com wrote:\n\n> I think we have following use cases:\n> 1. I don't care about the parameter\n> 2. I care that it is not null\n> 3. I care about the type (implies (2))\n\nI think you lack at least one ( 4.- I care it is null, but it is\nalready served by IsNull() ( or a casted null IIRC ) ,not discussed ).\n\n> Solutions:\n> 1) any(), perhaps kill anyObject(), needs explicit casting\n> 2) no special API, kill isNotNull()/notNull() or just leave the\n> isNotNull()/notNull(), needs explicit casting\n> 3) any(String.class) alias to isA(String.class) (or kill isA(...))\n> \n> I think it is ok if only use case 3) offers API that avoids casting. E.g.\n> if the user wants to avoid casting he needs to specify the matcher better\n> (which I don't think is a problem).\n\nI don't think casting, specially in such a specialized case as\nmockiing in tests, is an issue. And J8 will avoid most of it. What I\ndislike of this is having mock.m((String)any()) accept nulls and\nmock.m(any(String.class)) reject nulls. isA sounds/reads fine to me. I\nprefer anyNotNull as name for 2 and 3 as it reads better, highlights\nthe relation with any ( they are the family of matchers which just\nchecks type, not value ), but I've reached a point where I think the\nonly form to expose a proposal is to implement it to expose how it\nlooks, which will have to wait in my case.\n\nAlso, thinking about the previous stuff, I'm beginnging to think\nIsNullOrA(Class), although it has a clear definition ( I have a\nmock.m(List), I want to match anything assignable to an ArrayList,\nwhich are null or ArrayList subclasses, so mock.m(any(ArrayList)) ),\nI'm not too sure about it's usefulness ( as I can do it with two\nmatchers, and isNull plus an isA with the same target, or use\nAdditionalMatchers.or )\n\nFrancisco Olarte.\n","I agree with Francisco, if we're going for casts I don't think we can have `any(String.class)` still exist, because we can't make it usefully be consistent with `any()`. I think just `isA` works fine for that case though, and I find it quite readable and clear.\n\nI do marginally prefer `notNull()` to `anyNotNull()`, just because it's shorter and simpler. I think `when(o.method(notNull(), notNull()))...` reads easier than `when(o.method(anyNotNull(), anyNotNull()))...`, and while anyNotNull makes sense in relation to any it's less clear what it does when you see it standalone. 'notNull' however is very clear indeed. It also doesn't feel quite so much like `any` and `notNull` are the same family as much as `isA/isNullOrA` are, just because `any` is kind of a special case (any + specific values are all people will probably use 1/2 the time, I expect).\n\nI also do think `isNullOrA(X.class)` does need to exist explicitly too, just because it's a common case and having to write `or(isNull(), isA(String.class))` (or `or((String) isNull(), isA(String.class))` for Java 7) everywhere is quite substantially messier and harder to parse. Internally just being an alias to that is fine though.\n\nDefinitely feels like we're getting pretty close now! One more API update then:\n- `any()` - matches anything, including nulls\n- `notNull()` matches anything, except nulls\n- `isA(X.class)` matches things of X type, except nulls\n- `isNullOrA(X.class)` matches things of X type, including nulls\n- We get rid of every other variant (`anyString()`, `isNotNull()`, etc)\n\nI think there are some other extra variants we will still need for things like generic list type checks and varargs, but those should follow on fairly cleanly from these. Thoughts?\n","Hi Time:\n\nOn Thu, Apr 9, 2015 at 6:34 PM, Tim Perry notifications@github.com wrote:\n\n> I agree with Francisco, if we're going for casts I don't think we can have any(String.class) still exist, because we can't make it usefully be consistent with any(). I think just isA works fine for that case though, and I find it quite readable and clear.\n\nOK.\n\n> I do marginally prefer notNull() to anyNotNull(), just because it's shorter and simpler. I think when(o.method(notNull(), notNull()))... reads easier than when(o.method(anyNotNull(), anyNotNull()))..., and while anyNotNull makes sense in relation to any it's less clear what it does when you see it standalone. 'notNull' however is very clear indeed.\n\nOK. I donot agree with the arguments but I feel voting for notNull now\nis much better than following the thread. I retract all my proposals\nfor anyNotNull.\n\n--- ASIDE---\n\n> It also doesn't feel quite so much like any and notNull are the same family as much as isA/isNullOrA are, just because any is kind of a special case (any + specific values are all people will probably use 1/2 the time, I expect).\n> I think if you place them in a square, it does. isA is NW, isNullOrA\n> is NE, any is SE, ¿ Which one goes into SW ? ( reminds me of the test\n> I did in school ).\n\nAlso, any() is like isNullOrA(Object.class), notNull() is like\nisA(Object.class).\n\nNOT A PROPOSAL/DISCUSSION on the main issue, just put here as an\nexplanation of my abandoned views.\n--- /ASIDE ---\n\n> I also do think isNullOrA(X.class) does need to exist explicitly too, just because it's a common case and having to write or(isNull(), isA(String.class)) (or or((String) isNull(), isA(String.class)) for Java 7) everywhere is quite substantially messier and harder to parse. Internally just being an alias to that is fine though.\n\nOK with it.\n\n> Definitely feels like we're getting pretty close now! One more API update then:\n> \n> any() - matches anything, including nulls\n> notNull() matches anything, except nulls\n> isA(X.class) matches things of X type, except nulls\n> isNullOrA(X.class) matches things of X type, including nulls\n> We get rid of every other variant (anyString(), isNotNull(), etc)\n> \n> I think there are some other extra variants we will still need for things like generic list type checks and varargs, but those should follow on fairly cleanly from these. Thoughts?\n\nOk. My main problem is I find current naming extremely confussing.\nOnce anyAs is gone and replaced with ( more correct IMO ) isNullOrA\nit nearly vanishes, but if variants are recovered/kept ( I would do it\nin a separate class, which could be very easily documented at the top\nand methods, otherwise they clutter the main matchers docs. Classed\nare cheap, specially in test code ) keep their name coherent to the\nimplementation. I.e., givien anyString() can (should?) be implemented\nas isA(String.class) to achieve current behaviour, name it isAString()\n(same goes if behaviour is simillar to isNullOrA) ( or zap it, I\nprefer just a longer way to do a thing than a confusing alternative )\n( I used to try to put short names to things, but since about 20 years\nago I've been progresively going to longer and clearer, typing is\neasier than thinking, YMMV ).\n\nFrancisco Olarte.\n","Cool, I think we're in agreement then. I'm very happy to zap lots of the extra methods like `anyString()` where Java 8 means they're not going to be useful and there's a simple easy to find alternative to them (like just casting `any()`, which most ide's will even suggest and do for you).\n\n@bric3 @szczepiq Are you two happy if I open a PR extending my previous changes to implement this API, as in my message above?\n","Hi @pimterry @folarte \n\nThanks for the discussion, I was also away staffed at Devoxx fr for the past week. I think there's some agreement here, I'm basically OK for these changes : \n- ` T any()` - matches anything, including nulls\n- ` T notNull()` matches anything, except nulls\n- ` T isA(Class clazz)` matches things of `T` type but `null`\n => naming could be tweaked without the `is`, thus becoming `a(X.class)`, I understand this one is kinda bold.\n- ` T isNullOrA(Class clazz)` matches things of `T` type including `null`\n => naming could be tweaked without the `is`, thus becoming `nullOrA(X.class)`\n- We get rid of every other variant (`anyString()`, `isNotNull(Class)`, etc)\n => there's still need for primitive matchers : `anyInt` should stay in my opinion, but this raises another issue with primitive wrappers, should they allow null, in my opinion they should not.\n\n@szczepiq Another related task would be to deprecate APIs in the 1.x line.\n","Happy to drop the `is` prefix, seems shorter and clearer. This might be one place where we do want an alias, for `a(String.class)` and `an(Element.class)`, as otherwise I think it's quite difficult to read.\n\n> - We get rid of every other variant (anyString(), isNotNull(Class), etc)\n> \n> => there's still need for primitive matchers : anyInt should stay in my opinion, but this raises another issue with primitive wrappers, should they allow null, in my opinion they should not.\n\nDo mean `anyInt()`, or `anInt()`? I think the conclusion of the above discussion is that we can't have an `anyInt()` method without breaking the API: either `anyInt()` actively matches the type and rejects null (confusingly inconsistent with `any()`), or it doesn't and it's confusing and people use it wrong (the current state of affairs).\n\nFor Java 8 `any()` should work everywhere I think, and for Java 7 you can use `(int) any()`. I can't easily test this right now; is there something about primitives, generics and our implementation that means this doesn't work? That's going to be a difficult problem to solve if so.\n\nFor `anInt()` on the other hand, it doesn't actually make the API inconsistent if we do add that as another method, so that's very doable. Not clear why we need it in this case either though.\n\nDo you have an example that doesn't work with this as given?\n","Hi Brice:\n\nOn Sun, Apr 12, 2015 at 7:55 PM, Brice Dutheil notifications@github.com wrote:\n\n> Thanks for the discussion, I was also away staffed at Devoxx fr for the past week. I think there's some agreement here, I'm basically OK for these changes :\n> \n> T any() - matches anything, including nulls\n> T notNull() matches anything, except nulls\n> \n> T isA(Class clazz) matches things of T type but null\n> => naming could be tweaked without the is, thus becoming a(X.class), I understand this one is kinda bold.\n\nI strongly disagree with naming it a or ( sorry Tim ) an. I feel they\nare too short and error prone ( and this is not COBOL, a PL/DSL is not\nEnglish ).\n\n> T isNullOrA(Class clazz) matches things of T type including null\n> => naming could be tweaked without the is, thus becoming nullOrA(X.class)\n\nI stil think my any/anyNotNull overrrides where superior names, but as\nthis is functionally equivalent I'll just wrap it. OK so far.\n\n> We get rid of every other variant (anyString(), isNotNull(Class), etc)\n> => there's still need for primitive matchers : anyInt should stay in my opinion, but this raises another issue with primitive wrappers, should they allow null, in my opinion they should not.\n\nI think the point of allowing nulls for primitives is a no point. If I\nhave a method mock.method(int) which I match with\nwhen(mock.method(anyInt())) it doesn't matter that the matcher\nreceives an Integer due to boxing/reflection stuff, it will never be\nnull, becuase if I do \"Integer integer = null; mock.method(integer)\"\nautounboxing will raise NPE before matchers get anything to say. And\nif there was another override mock.method(Integer), well, first this\nshould have been matched by an appropiately casted any/is\\* and second,\nit's so perverse that user deserves whatever happens there.\n\nFrancisco Olarte.\n","Soon. It's next in my queue :) Thank you guys for patience.\n","Great discussion. Thanks everybody for chipping in. Let's get this sorted out.\n\n> What I\n> dislike of this is having mock.m((String)any()) accept nulls and\n> mock.m(any(String.class)) reject nulls.\n\nI agree. There is a gotcha: given that any(SomeType.class) is most used matcher method, it will be a pain to users to upgrade to Mockito 2.0.\n\nHowever, if we tell users that any(String.class) checks type but (String) any() does not it is rather awkward message and it might confusing down the road.\n\nBy now, most users are probably used to the behavior of Mockito matchers and the pitfall is well documented ;) So there is an option to leave things as they are.\n\nRemoving any(T) pretty much means that we need to remove all matcher methods like anyString() anyList(), etc. This increases the impact on the user.\n\nI'll think about this a bit more and get back by the end of today.\n","BTW. what do you guys think about #246?\n","I think we're down to following options. Please vote or suggest other options:\n1. Shoot down any(T) and anyT() in favor of isA(). This thread seems to be converging on this approach. Consistent and clean. High impact, potential churn.\n2. Change any(T) and anyT() methods to reject nulls. Suggested by the community originally, potentially confusing down the road due to inconsistence with any(). This inconsistence becomes less of a problem with java8.\n3. Do (2) but also shoot down any() replacing it with anyObject() or anything() or '_' (ala spock ;). Not sure I like killing any() because it is neatly compact.\n4. Leave things as they are for now. Perhaps revisit for java8 support.\n","Hi\n \nSzczepan:\n\n> BTW. what do you guys think about #246\n> https://github.com/mockito/mockito/issues/246?\n> \n> I think it may have some problems, and be an overload abuse. If done this\n> way I would vote for having long named methods with is() being just a\n> forwarder. And I think there may be some ambiguities if overloaded is() is\n> used to test overloaded method ( i.e., when you mock m(is(String.class))\n> are you mocking m(Class c) ( as m(eq(String.class)) ) or m(String s) with\n> any string? ( It's a contrived overload, but I've seem some of these where\n> the String version takes a class name, I think OSGi has some of them ).\n> Having a long method (anyIstanceOf, equalTo, evenm, specially, isNull()\n> which I personally prefer to is(null) ( Which overload is it going to pick,\n> the Object one with a null param ) ) lets people key a little more in the\n> difficult cases and does not at too many complexity or a signigicant run\n> time for test code ( is() is just a one line forwarder, and it's javedoc\n> can be left as such which just an @link to the unoverloaded method ).\n\nRegarding readability, I'm not sure compact overloaded names are more\nreadable, they may be easier to read aloud, but you need to invoke higher\nlevel brain functions to parse it and distinguish the overload being used,\nbut maybe I'm just becoming slower.\n\nFrancisco Olarte.\n","Yep, I prefer option 1.\n\n#246 sounds like a good idea to me, but we should definitely market it very clearly as a convenience method (as Francisco mentions), and obviously keep the explicit methods, so people are aware they can opt in to explicitly choosing the relevant option if they need to or they're not sure what the overloading does.\n\nThe overload I'm most suspicious of is `is(T)`, just because it's most likely to be ambiguous, in practice and when trying to just think about what a line is doing. `is(null)` seems clear, `is(stringStartingWithHello)` is fine, but if I saw`when(is(100), is(String.class))`, I think my default would be to assume that the argument needed to literally be the class object. Not totally sure about that though, happy to go with it if others are happy.\n","Any progress on this? Are people happy for me to put together a potential PR for option 1, which it sounds like we've settled on, as something concrete to discuss?\n","My preference is to have the following matchers (option 1?):\n- ` T any()` that accepts anything including `null`. I associate _\"any\"_ to the _\"anything\"_ in my world that includes null-values and instances. It is compact and suitable for the most common cases.\n- ` T anyObject()` or ` T notNull()` reject `null` values opposite to any(). The name should indicate that null is rejected to avoid confusion about its behaviour.\n- ` T isA(Class)` reject `null` values and all values that are not a subtype of `T`, like instanceof.\n- all `any*()` and `any(T)` should be dropped cause they have different behaviour (as described before)\n","> 1. Shoot down any(T) and anyT() in favor of isA(). This thread seems to be converging on this approach. Consistent and clean. High impact, potential churn.\n> 2. Change any(T) and anyT() methods to reject nulls. Suggested by the community originally, potentially confusing down the road due to inconsistence with any(). This inconsistence becomes less of a problem with java8.\n> 3. Do (2) but also shoot down any() replacing it with anyObject() or anything() or '_' (ala spock ;). Not sure I like killing any() because it is neatly compact.\n> 4. Leave things as they are for now. Perhaps revisit for java8 support.\n\nLet's try to be decisive :)\n\nTim & Christian vote for option 1) I very much appreciate those votes and option 1 does have a lot of charm :)\n\nMyself, I vote for 2) because:\n- any(T) reads better (seems more fluent), is more intuitive to write than isA(). It looks good in tests.\n- it is consistent gramatically with any(), it makes the API a bit more consistent\n- java8 is very popular, people use any() for matching anything and can use any(T) for matching specific type (not null)\n- removing any(T) (options 1 and 3) seems like a churn and big impact on users without strong enough justification. It seems arbitrary that we remove the any(T) methods. E.g. myself as a user, I would not be convinced that migrating to Mockito 2.0 is a good idea because I need to fix hundreds of compilation errors due to removal fundamental API method (anyT/any(T)). Even if I make that search&replace, I'm not convinced that tests look better now. The change also hurts muscle memory and users would be finding themselves using any(T) methods, finding the code not compile, then realizing that aha! this method was removed. However, if we update the behavior of any() (option 2) we will provide very nice signal to users during the migration to 2.0. We could potentially expose bugs. Most users expect nulls to be rejected by any(T) - Mockito 2.0 will make expose tests that fail that assumption.\n\nWe don't have to agree. However, it would really cool if we were on the same page :) It would be so nice if everyone of us could stand behind decisions we make as a team.\n\nWe definitely need to make the decision!!! (if left undecided, we're effectively deciding on option 4).\n","I would like to suggest introducing the isA API alongside any. The latter would accept nulls while the former would rejecet them.\n\nNulls are pretty common as values so we ahould not make this more difficult than necessary. Also, tgis makes migration easier.\n","I already started the work on this a few days ago, and I chose to kinda follow option 2 as well, here's the plan :\n- ` T any()` that accepts anything including `null`. I am pondering the addition of `anything` as it is the original meaning of `any`.\n- `* any*()` / ` any(T)` will be aliases of ` isA(T)`, **this is the expected behaviour by users**, doing this will introduce the rejection of `null`, with Java 8 I saw young developer to switching to `any()` when `null` values where used instead of `anyInt`.\n\nSince we want to do a release candidate I suggest that we ship the _null safe_ `any*`, and remove the `null` check if too much people complain.\n\ncc @TimvdLippe @marcingrzejszczak @raphw @szpak \n","Thanks for feedback!\n\n+1 to your plan.\n\n-1 to 'anything', it feels that it does not add sufficient value. It's a\nlonger alias - not sure why would someone want to use it.\n\nOn Mon, Jul 25, 2016 at 10:10 AM Brice Dutheil notifications@github.com\nwrote:\n\n> I already started the work on this a few days ago, and I chose to kinda\n> follow option 2 as well, here's the plan :\n> - T any() that accepts anything including null. I am pondering the\n> addition of anything as it is the original meaning of any.\n> - \\* any_() / any(T) will be aliases of isA(T), *this is the\n> expected behaviour by users_, doing this will introduce the rejection\n> of null, with Java 8 I saw young developer to switching to any() when\n> null values where used instead of anyInt.\n> \n> Since we want to do a release candidate I suggest that we ship the _null\n> safe_ any*, and remove the null check if too much people complain.\n> \n> cc @TimvdLippe https://github.com/TimvdLippe @marcingrzejszczak\n> https://github.com/marcingrzejszczak @raphw https://github.com/raphw\n> @szpak https://github.com/szpak\n> \n> —\n> You are receiving this because you were mentioned.\n> Reply to this email directly, view it on GitHub\n> https://github.com/mockito/mockito/issues/194#issuecomment-235017691,\n> or mute the thread\n> https://github.com/notifications/unsubscribe-auth/AABgp-nrLrlhKpwIt9XZjvOvBWLNnglBks5qZO3wgaJpZM4D6d0z\n> .\n","+1 i agree, lets try this for the RC.\n"],"string":"[\n \"`any` family is currently _(at his time up to 2.0.5-beta)_ inconsistent on the way they allow or not `null`s. Type checking is ok, but `null` check behavior consistency is also important.\\n\",\n \"AnyX gramtaically tends to imply to return false for null because any\\nobject is not null. I agree completely the api should be consistent.\\n\\nOn Sun, Apr 5, 2015, 11:54 Brice Dutheil notifications@github.com wrote:\\n\\n> any family is currently _(at his time up to 2.0.5-beta)_ inconsistent on\\n> the way they allow or not nulls. Type checking is ok, but null check\\n> behavior consistency is also important.\\n> \\n> ## \\n> \\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/194#issuecomment-89831862.\\n\",\n \"> AnyX gramtaically tends to imply to return false for null because any object is not null.\\n\\nI'm not anymore of sure of that. Anyway the changes introduced in this API make it inconsistent.\\nThat's why I propose any validates `null`, and if not `null` then validates the type\\n\\nAlso on the mentioned thread _Francisco Olarte_ was proposing a `anyNotNull` family, this could clarify the behavior on `null` of these APIs.\\n\",\n \"Agreed. Any should return false for null and false for wrong type (instance\\nof). Otherwise I think it would violate the principle of least surprise.\\n\\nOn Sun, Apr 5, 2015, 12:57 Brice Dutheil notifications@github.com wrote:\\n\\n> AnyX gramtaically tends to imply to return false for null because any\\n> object is not null.\\n> \\n> I'm not anymore of sure of that. Anyway the changes introduced in this API\\n> make it inconsistent.\\n> That's why I propose any validates null, and if not null then validates\\n> the type\\n> \\n> Also on the mentioned thread _Francisco Olarte_ was proposing a anyNotNull\\n> family, this could clarify the behavior on null of these APIs.\\n> \\n> ## \\n> \\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/194#issuecomment-89842760.\\n\",\n \"I see anyString() ( and friends ) checking for null and anyObject() not doing it as an inconsistency potentially leading to user surprise. Object is as much of a class as String ( or other ).\\n\\nOther thing is I fail to see is the difference ( if there is any ) between isA(Klazz) and notNull(Klazz) ( or IsNotNull, but I see that one is a forwarder ). To me they seem they do the same, given the docs, but the code is different and I'm not familiar enough with it to assert they do the same thing. When doing DSL helper libraries I've found ( the hard way ) having slightly different names for the same thing seems a good idea initially, but leads to problem along the way, so I would vote for just having one of notNull/isNotNull ( and isA if it is functionally equivalent ).\\n\",\n \"I think there might be confusion here: @szczepiq I don't think the two of you are agreeing. @bric3 seems to be saying that `any` should match nulls and anyNotNull should exist (and presumably not match null), while you're saying that `any` should not match null.\\n\\nI think the problem here is that there's two use cases that currently aren't clearly separated, both of which we need to support.\\n1. I don't care what the value I'm matching is _at all_, I want a very simple intuitive wildcard matcher that will match absolutely anything, and will compile with no extra effort (so no casts).\\n2. I care about the type of the value that I'm matching, but no details beyond that. I want a matcher that will not match values with the wrong type.\\n\\nI think both of these are major common use cases. If we make any of the `anyX()` methods reject nulls, they no longer support the first case, and if we leave it as-is then they currently appear to support the 2nd case but aren't really doing so, which is where all this came from originally.\\n\\nI do think any API that supports use case 2 should reject nulls by default: if you're asserting specifically on the type of the value, we should push people to be clear about whether or not null is valid in the given case. I think an API for use case 1 should not reject nulls, because you want to match _everything_.\\n\\nThese are two quite different APIs though, and to get any kind of API consistency, we're going to need them to be separate sets of methods. I suggest:\\n- `any()` - matches absolutely anything, including nulls, as a generic method returning T (as now)\\n- `anyAsX()` and `anyAs(X.class)` - matches absolutely anything, including nulls, as a generic method returning X\\n - This is as in 1.9, but with the names changed to make it clear that this is purely a type casting concern, not type checking, and intentionally being a bit more verbose to discourage unnecessary use.\\n - Note that as of Java 8 target type inference considers method arguments, so you should be able to use `any()` in every case except choosing between overloaded methods (pretty rare?). In addition, note that Java 7's final update is this month, and then it's unsupported.\\n - We'd also obviously document that users should prefer isA etc if they want to check the type, but I think it's much more obvious that `anyAsString()` isn't actually checking the value's a string (unlike `anyString()`, which did suggest that).\\n- `isA/isAn(X.class)` and `isAnX()` - matches on type, rejecting nulls\\n- `isNullOrAn(X.class)` and `isNullOrAnX()` - matches on type, accepting nulls\\n\\nI think this makes for a relatively small change, so gives fairly easy migration, but makes it clear that the `any()` methods are all just generic wildcards (for use case 1), and provides a clear set of other methods to support actual type checking and pushing users to be clear about nullability along the way (for use case 2).\\n\\nThe only other option I can see we might want to do is stop supporting use case 1 entirely, make everybody be much more specific about what they want, and reject nulls everywhere. I think use case one is likely to be the most common case for use argument matchers anywhere though, far more than anything else, and we definitely definitely need to support it as an intuitive easy first-class citizen.\\n\\nThoughts? Do people agree both use cases are common and important? Does anybody have a better solution to help us get both while keeping a sensible consistent API?\\n\",\n \"On Tue, Apr 7, 2015 at 5:12 PM, Tim Perry notifications@github.com wrote:\\n\\n> These are two quite different APIs though, and to get any kind of API\\n> consistency, we're going to need them to be separate sets of methods. I\\n> suggest:\\n> - any() - matches absolutely anything, including nulls, as a generic\\n> method returning T (as now)\\n> - anyAsX() and anyAs(X.class) - matches absolutely anything, including\\n> nulls, as a generic method returning X\\n> - This is as in 1.9, but with the names changed to make it clear\\n> that this is purely a type casting concern, not type checking, and\\n> intentionally being a bit more verbose to discourage unnecessary use.\\n> - Note that as of Java 8 target type inference considers method\\n> arguments, so you should be able to use any() in every case except\\n> choosing between overloaded methods (pretty rare?). In addition, note that\\n> Java 7's final update is this month, and then it's unsupported.\\n> - We'd also obviously document that users should prefer isA etc if\\n> they want to check the type, but I think it's much more obvious that\\n> anyAsString() isn't actually checking the value's a string (unlike\\n> anyString(), which did suggest that).\\n> - isA/isAn(X.class) and isAnX() - matches on type, rejecting nulls\\n> - isNullOr(X.class) and isNullOrX() - matches on type, accepting nulls\\n> \\n> I think this makes for a relatively small change, so gives fairly easy\\n> migration, but makes it clear that the any() methods are all just generic\\n> wildcards (for use case 1), and provides a clear set of other methods to\\n> support actual type checking and pushing users to be clear about\\n> nullability along the way (for use case 2).\\n> \\n> The only other option I can see we might want to do is stop supporting use\\n> case 1 entirely, make everybody be much more specific about what they want,\\n> and reject nulls everywhere. I think use case one is likely to be the most\\n> common case for use argument matchers anywhere though, far more than\\n> anything else, and we definitely definitely need to support it as an\\n> intuitive easy first-class citizen.\\n> \\n> Thoughts? Do people agree both use cases are common and important? Does\\n> anybody have a better solution to help us get both while keeping a sensible\\n> consistent API?\\n\\nI agree all are used and importants.\\n\\nI'm still struggling with the difference between `isNullOr(X.class)` and `anyAs(X.class)`. The only difference I see is if I have a class `A` with a subclass `subA`, and a class `B` with a subclass `subB`, and a couple of methods `M(A)` and `M(B)` is that `M(anyAs(subB.class))` will select `M(B)` and match on a `B`, but `M(isNullOr(subB.class)` will select it and match only on a `subB`, so I could have a broader matcher for `M(isNullOr(B.class))`.\\n\\nEven if this is the case, I would just suppress the `anyAs(X.class)`, as my contrived example could be better written as `anyAs(B.class)`, In which case I would rename isNullOr to any, and isA to anyNotNull. In the naming side I find `any()` natural, `anyAs` forced, as I consistently read `any(X.class)`\\nas _'any thing which can be assigned to a variable of type X'_.\\n\\nSo I would end up with only two method names, any and `anyNotNull` with a parameterless plus a class parameter variant ( discounting typeing helpers like `anyNotNullString`), which would work:\\n1. `anyNotNull`, in any variant, does not accept nulls, any does.\\n2. A parameterless `any()`/`anyNotNull()` is equivalent to the same method with the declared parameter class. Note, if you can use `any[NotNull]()` in the methods there are no overloads, and the language guarantees I cannot use an incorrect type.\\n\\nSo, if I have a method `M(List l)`, `M(any(ArrayList.class))` would match anything which can be stored in an `ArrayList` var, subclasses and `null` included, and `anyNotNull(ArrayList.class)` will need a not null one. `M(any())` would exactly as `M(any(List.class))`. Mockito cannot check it, but I cannot write code to call `M` with a non-list argument, java is type checked. Same goes for `anyNotNull`.\\n\\nOTOH, if I have `M(Set s)` too, I must use `M(any(Set.class))` or `M(any(List.class))`, just to resolve the overload, although in this case the matcher type checking is superfluous.\\n\\nI do not see the point on `any(X.class)` not checking the type and having `isA(X.class)` which does, it seems confusing to me, so my proposal is basically zapping any of the variants. I mean, from the description, in the overloaded method, `M(any(ArrayList.class))` will select the list variant but\\nmatch a call with any `List` subtype, while `isNullOr(ArrayList.class)` will only match `ArrayList`s ?. I do not see this has any real use ( the parameter type must be accessible in the test, if you want any List, use `isNullOr(List.class)`).\\n\\nMaybe I'm missing something, but I see `any(X.class)` redundant, better served by `isNullOr`, the rest is just naming disagreement.\\n\\nFrancisco Olarte.\\n\",\n \"The issue with getting rid of `anyAs(X.class)` is that we want two things:\\n- A way to match an argument without checking anything about its value (any)\\n- A way to match an argument and check its type (isA)\\n\\nI think your solution is to just use `any()` with no parameter everywhere to cover the first case, and specify the type when you want the 2nd case. That won't work, because target type inference doesn't work for method arguments in Java < 8, so it's impossible to use any() without an argument (unless the parameter is just `Object` typed).\\n\\nSpecifically, in Java 7 the below won't compile:\\n\\n``` java\\nclass X {\\n public bool method(List l) { ... }\\n}\\n\\nX x = mock(X.class);\\n\\n// ERROR: method(java.collections.List) cannot be applied to (java.lang.Object)\\nwhen (x.method(any()).thenReturn(true);\\n```\\n\\nAnybody on Java < 8 has to specify the type every time they match anything, or it's impossible to make it compile. They can never really use `any()`; they always have to use `any(X.class)` (or equivalent). We need a way in Java 7 that you can say 'match absolutely anything please' that compiles, and I think `any(X.class)` or equivalent is the only option.\\n\\nIf you make that `any(X.class)` matcher check the type (as you suggest) then it no longer matches everything any more, and it becomes impossible to wildcard match everything in Java < 8 (without casting, but that would be pretty nasty)\\n\\nTherefore if you want to be able to both match specific types and wildcard 'match everything' in Java < 8, you have to have two separate APIs to do so. The names of those APIs need to clearly tell the user which of those two things they're doing ('match anything, but cast the matcher to make it compile' vs 'match only this type').\\n\\nI don't think that's avoidable. I'm very happy to take better suggestions for `anyAs(X.class)` that make it clearer it's just a convenient casting method (without making it so nasty that it stops being convenient), but that method does still need to exist I think.\\n\\nIn addition to all that: we'd rather the 'match a specific type' matcher didn't accept nulls by default (as your `any(List.class)` does). We need to make people opt in to matching nulls, because it's good practice, and because there's some potentially confusing behaviour there as nulls are kind of outside the type system. We also can't have the wildcard matcher reject nulls, or it's not matching everything any more. Thus, again, they need to be two different methods.\\n\",\n \"Hi Tim:\\n\\nOn Tue, Apr 7, 2015 at 7:37 PM, Tim Perry notifications@github.com wrote:\\n\\n> The issue with getting rid of anyAs(X.class) is that we want two things:\\n> \\n> A way to match an argument without checking anything about its value (any)\\n> A way to match an argument and check its type (isA)\\n> \\n> I think your solution is to just use any() with no parameter everywhere to cover the first case, and specify the type when you want the 2nd case. That won't work, because target type inference doesn't work for method arguments in Java < 8, so it's impossible to use any() without an argument (unless the parameter is just Object typed).\\n\\nI don't think you've understood my solution. From the previously\\npropossed one ( any() + anyAs(Class) + isA(Class) + isNullOrA(class) (\\n- notNull(), which is in another place ) I propose to remove anyAs,\\n given it does not check type, rename isA(Class) to anyNotNull(Class),\\n rename isNullOrA(Class) to any(Class) and rename ( or forward )\\n notNull() to anyNotNull().\\n\\n> Specifically, in Java 7 the below won't compile:\\n> \\n> class X {\\n> public bool method(List l) { ... }\\n> }\\n> \\n> X x = mock(X.class);\\n> \\n> // ERROR: method(java.collections.List) cannot be applied to (java.lang.Object)\\n> when (x.method(any()).thenReturn(true);\\n\\nPerfect, in this case you use the propossed isNullOrA(Class), which I\\nproposed to rename as any(Class).\\n\\nAlso, just grepped and got this from one of my test files:\\n\\n```\\n AC1 = mock(AutoCaller.class);\\n when(AC1.makeCall((AcCallRequest) any())).thenReturn(resp1);\\n```\\n\\nIn case you wonder, AutoCaller is an interface with a method\\n\\\"MakeCallResponse makeCall(AcCallRequest)\\\", not overloaded.\\n\\nI think this is clearly superior in java 7 ( I'm unable to use java 8\\non those projects due to problems with the app server ). The any()\\nconveys the 'i do not care, just make this compile' and the cast\\nclearly says 'this is due to one of those java 7 shortcomings' to me.\\n\\n> Anybody on Java < 8 has to specify the type every time they match anything, or it's impossible to make it compile. They can never really use any(); they always have to use any(X.class) (or equivalent). We need a way in Java 7 that you can say 'match absolutely anything please' that compiles, and I think any(X.class) or equivalent is the only option.\\n\\nWhich is what I proposed, you have IsNullOrA(Class), which covers\\nthis. Correct me if wrong.\\n\\n> If you make that any(X.class) matcher check the type (as you suggest) then it no longer matches everything any more, and it becomes impossible to wildcard match everything in Java < 8 (without casting, but that would be pretty nasty)\\n\\nIt is. The Method has a declared argument type of List, which means\\nthe compiler will check that when you use the mock, in\\nx.method(whatever) whatever implements List, so isNullOrA(List.class),\\nor any(List.class) will allways match whatever, with an extra\\nredundant type check.\\n\\n> Therefore if you want to be able to both match specific types and wildcard 'match everything' in Java < 8, you have to have two separate APIs to do so. The names of those APIs need to clearly tell the user which of those two things they're doing ('match anything, but cast the matcher to make it compile' vs 'match only this type').\\n\\nAs I said, I'm not knowdledgeable enough and haven't got time\\npresently to dig through the sources. If any(List.class) matches when\\nI pass an ArrayList to the Mock I can always wildcard by using the\\ndeclared argument type.\\n\\n> I don't think that's avoidable. I'm very happy to take better suggestions for anyAs(X.class) that make it clearer it's just a convenient casting method (without making it so nasty that it stops being convenient), but that method does still need to exist I think.\\n\\nForget about my proposed renaming., With the any/anyAs/isA/IsNullOrA\\nproposal, is there any case in which you must use anyAs() which cannot\\nbe solved by using isNullOrA(X.class)? I think they are synonims. The\\nproblem I see with anyAs as stated is that, in the previous example (\\nwithout overloads ), I could code a matcher as\\nwhen(x.method(anyAs(ArrayList.class))) and it shoud fire ( as it does\\nnot check type ) when I do x.method(new LinkedList()). I think this is\\nconfusing and asking for problem, and by making it check the type I\\ncould make when(x.method(anyAss(ArrayList.class))) to catch one\\nspecific thing and after that add when(x.method(anyAs(List.class)) for\\na catch all in java<8, or just plain any() in >=8.\\n\\nMy proposal of getting rid of anyAs can be read the other way, make\\nanyAs() check type and get rid of isNullOrA.\\n\\nRepeating my self, I proposed to get rid of anyAs(Class) as a I feel\\nit seems to match something which it does not, and it cannot do\\nanything which cannot be done with isNullOr(class). Name it whatever,\\nis the functionality with worries me.\\n\\n> In addition to all that: we'd rather the 'match a specific type' matcher didn't accept nulls by default (as your any(List.class) does). We need to make people opt in to matching nulls, because it's good practice, and because there's some potentially confusing behaviour there as nulls are kind of outside the type system. We also can't have the wildcard matcher reject nulls, or it's not matching everything any more. Thus, again, they need to be two different methods.\\n\\nThat's another thing. What I propose is to simplify so I have two\\nnames ( anyIncludingNull, anyNotNull ) which indicate wether null is\\naccepted, plus two overrides, no parameters and a class parameter. The\\nnull accepting behaviour is functionaly equivalent to haven just a\\nname plus a boolean parameter ( notReallyAny(boolean acceptNull) +\\nnotReallyAny(boolean acceptNull, Class klass) ).\\n\\nWhat makes me feel uncorfortable with the proposal is :\\n- Too many names, I think two suffice.\\n- Different names for similar methods, similar names for different\\n null accepting behaviour.\\n\\nGiven this, I think:\\n- anyIncludingNul(), anyIncludingNul(Class), anyNotNull(),\\n anyNotNul(Class) cover all cases, for jdk <8 & 8 ( although\\n parameterless ones are not too useful in <8 ) ( your example would be\\n served by when(x.method(anyIncludingNull(List.class)) ).\\n- names should be kept paired. You state opting in for nulls is good\\n practice, I'll accept that without discussion. You say people should\\n opt in to use them, I accept thas as a precondition. Writing\\n anyIncludingNull is for me opting in.\\n\\nBut then, we want 'any()'. It's nice, sounds good, it is short, reads\\ngood (any() in 8, I do not care, just need this to compile,\\nany(List.class) in 7, I do not care, but .Well, then writing 'any(' is\\nopting in to use nulls, so the class version should begin with 'any('\\ntoo. I have no problem with having the null accepting versions\\n'nonDefaultAcceptingNullsAnyMatcher', and the other one 'any', or\\n'isA', IDEs are really good at completing, and I can easily manage a\\ncouple of names, but having any, anyAs, isA, isNullOrA, and notNull\\nhorrifies me.\\n\\nWell, that's all for today. I hope it clarifies my position.\\n\\nRegards.\\n Francisco Olarte.\\n\",\n \"Ok, I think that mostly makes sense, although I'm not clear exactly what the full API you're proposing is that fits the requirements here. Your last paragraph seems to contradict the four methods you've suggested just above.\\n\\nI think you're still suggesting an `any()` method with actively different behaviour to an `any(X.class)` method though. Inconsistencies between those two are how we ended up here, because one does active type matching and the other doesn't, and you need different null matching behaviour too. In addition, you definitely need `any()` or it'll be confusing, so I don't think there's any way you can have an `any(X.class)` method that does actual matching.\\n\\nSounds like there is a route through though: what happens if we accept that Java 7 is on the way out, stick only to casts, and stop making the API confusing just to support now unsupported Java versions? That would give an API of:\\n- `any()` - matches anything\\n- `isA(X.class)` - matches things with X type, not nulls\\n- `isNullOrA(X.class)` - matches things with X type, or nulls\\n\\nIf you're using Java 8, all is good, simple and clear. If you're using Java 7 you have to cast `any()`, but `(MyClass) any()` is clearer about what it's doing than anything else we have here, actually shorter than `any(MyClass.class)` anyway, and good IDE's will automatically suggest the cast for you too, so pretty easy to find for newbies. Null behaviour is also clear here, and we're pushing people to be explicit about whether they match nulls in all arguments they care about.\\n\\nHow does that sound to everybody?\\n\",\n \"Hi Tim:\\n\\nOn Wed, Apr 8, 2015 at 8:38 PM, Tim Perry notifications@github.com wrote:\\n\\n> Ok, I think that mostly makes sense, although I'm not clear exactly what the full API you're proposing is that fits the requirements here. Your last paragraph seems to contradict the four methods you've suggested just above.\\n\\nAny of my paragraphs may seem contradictory, but I do not know how to\\nconvey the info and do not know what the exact requirements are., but\\nanyway, lets go on.\\n\\n> I think you're still suggesting an any() method with actively different behaviour to an any(X.class) method though.\\n\\nIn my full sugestion not exactly, I suggested any to be the same as\\nany(Object.class), ( declared parameter class really, but it could be\\nimplemented this way ). It checks the passed thing is null or a\\nsubclass of Object ( second check redundant, stated for completitude\\n).\\n\\n> Inconsistencies between those two are how we ended up here, because one does active type matching and the other doesn't, and you need different null matching behaviour too. In addition, you definitely need any() or it'll be confusing, so I don't think there's any way you can have an any(X.class) method that does actual matching.\\n> \\n> Sounds like there is a route through though: what happens if we accept that Java 7 is on the way out, stick only to casts, and stop making the API confusing just to support now unsupported Java versions? That would give an API of:\\n> any() - matches anything\\n> isA(X.class) - matches things with X type, not nulls\\n> isNullOrA(X.class) - matches things with X type, or nulls\\n\\nI'm definitely in favour of sticking to casts, as they are a standard\\nlanguage feature and should be clear.\\n\\nNow, on your three proposed methods, you are forgetting one, which is\\non another part of the current API, notNull() ( or it's cousing\\nnotNull(Class), I do not know whic notNull is not declared generic\\nlike any though, I think it SHOULD be for java 8 ).\\n\\nYou have 2 choices, 1.- accept nulls, 2.-check class, For 1 you need\\neither a boolean argument or different names, for 2 you need a Class\\nargument to check against. So, in your proposal you would have:\\n- accept nulls, do not check class: any(), used as is in java 8,\\n casted in 7 ( or for overload resolution in 8 ).\\n- accept nulls, check class: isNullOrA(Class)\\n- reject nulls, do not check class: notNull() ( same comments as any )\\n- reject nulls, check class: isA(Class)\\n\\nWhich is fine dandy for me ( the naming stuff is trivial to achieve\\nusing a FranciscoOlarteAdditionalMatchers helper class )\\n\\nBasically you can have a makeMatcher(boolean acceptNulls, Class klass\\n) and then any()==makeMatcher(true, Object.class),\\nisNullOrA(klass)=makeMatcher(true, klass),\\nnotNull()=makeMatcher(false, Object.class),\\nisA(klass)=makeMatcher(false, klass).\\n\\n> If you're using Java 8, all is good, simple and clear. If you're using Java 7 you have to cast any(), but (MyClass) any() is clearer about what it's doing than anything else we have here, actually shorter than any(MyClass.class) anyway, and good IDE's will automatically suggest the cast for you too, so pretty easy to find for newbies. Null behaviour is also clear here, and we're pushing people to be explicit about whether they match nulls in all arguments they care about.\\n\\nI think the null / check behaviour is clearer if you group them\\ntogether somehow ( like I've done above ). As this gets rid of the\\nconfusing (current) anyAs(Class). Also I think notNull(Class) must go,\\nas what is does is served by isA(class).\\n\\n> How does that sound to everybody?\\n\\nFine for me.\\n\\n---------------NOT A PROPOSAL----------------\\nNow, I'll explain what I proposed ( for NAMING along with some\\nmotivations ). I think this discussion seems to prove it is not easily\\nunderstood, this is only for reference.\\n\\nNote there are no functional changes with the proposal above, just\\nname reorganizations as I think current names are confusing ( and I\\nknow they are for me, but this is my problem and I can solve it ).\\n\\n0.- get rid of anyAs and notNull(class) ( served by isA and isNullOrA ).\\n\\n1.- any() - keep as it is.\\n2.- isNullOrA(class): rename to any(class), as functionality is very\\nsimilar (any()==isNullOrA(DeclaredParameterClass.class))\\n3.- isA() - rename to anyNotNull ( it appears next to any() in methods\\nlist, and makes the behavioural differences easy to spot. Also, if you\\nhave a method any() and anyNotNull ( both being offered by\\nautocomplete ) is natural to assume that any==anyIncludingNull, which\\nis correct ).\\n4.- notNull() - rename to anyNotNull() ( to complete the matrix ).\\n\\nNote: In my NAMING proposal naked any==acceptNulls, It could easily be\\nreversed ( any=>anyOrNull, anyNotNull=>any, it just sounds bad to me\\nthat way ( maybe because I'm used to x(Object) and x(@NonNull Object)\\nand/or explicitly documenting when nulls are not allowed).\\n\\nExtra things:\\n- anyObject() - seems to do the same thing as any, if so get rid of it\\n if to avoid confusion, if not do the same as with anyString below.\\n- isNull(Class) - given it can be done with (Class)isNull(), get rid\\n of it. No need for a class checking version on this.\\n- anyString: Confusing name with current behaviour, given any() accept\\n nulls. Rename it to isAString and then, per rule 3 above, to\\n anyNotNullString. THEN I would add an anyString, equal to\\n isNullOrA(String.class) or any(String.class) per rule 2. Also,\\n consider deleting it (note below)\\n- anyInt/anyChar/...: as with anyString, in nearly all aspects.\\n- anyMap/anyMapOf ( and it's friends anyList, anyCollection ): Similar\\n to anyString, rename to anyNotNullMap, and then use the now free\\n anyMap to build one accepting nulls.\\n\\nfor anyString/anyInt/..... I would consider having a basic matchers\\nclass, with any/anyNotNull etc.., and a matchers derived class ( a la\\nAdditionalMatchers ) and relegate all aliases to that one, so the\\njavadoc for the basic matchers class concentrates on basic\\nfunctionality and the one for the aliases/forwarders just states the\\nequivalence ). In fact I would better put a class for just the basic\\nany\\\\* matchers ( including just any(), any(Class), anyNotNull(),\\nanyNotNull(class) and isNull(class)), another one for\\neq/startsWith/... another one for the anyString and friends. Static\\nimports make them easy to use in modern Java and the documentation\\nwould be much easier to read (for me at least).\\n\\n## Hope this explains my vision.\\n\\nRegards.\\n Francisco Olarte.\\n\",\n \"I apologize, I haven't read the entire thread. I'm still setting up my\\nfamily in CA and trying to manage prioriorities.\\n\\nI think we have following use cases:\\n1. I don't care about the parameter\\n2. I care that it is not null\\n3. I care about the type (implies (2))\\n\\nSolutions:\\n\\n1) any(), perhaps kill anyObject(), needs explicit casting\\n2) no special API, kill isNotNull()/notNull() or just leave the\\nisNotNull()/notNull(), needs explicit casting\\n3) any(String.class) alias to isA(String.class) (or kill isA(...))\\n\\nI think it is ok if only use case 3) offers API that avoids casting. E.g.\\nif the user wants to avoid casting he needs to specify the matcher better\\n(which I don't think is a problem).\\n\\nCheers!\\n\\nOn Thu, Apr 9, 2015 at 2:39 AM, Francisco Olarte notifications@github.com\\nwrote:\\n\\n> Hi Tim:\\n> \\n> On Wed, Apr 8, 2015 at 8:38 PM, Tim Perry notifications@github.com\\n> wrote:\\n> \\n> > Ok, I think that mostly makes sense, although I'm not clear exactly what\\n> > the full API you're proposing is that fits the requirements here. Your last\\n> > paragraph seems to contradict the four methods you've suggested just above.\\n> \\n> Any of my paragraphs may seem contradictory, but I do not know how to\\n> convey the info and do not know what the exact requirements are., but\\n> anyway, lets go on.\\n> \\n> > I think you're still suggesting an any() method with actively different\\n> > behaviour to an any(X.class) method though.\\n> \\n> In my full sugestion not exactly, I suggested any to be the same as\\n> any(Object.class), ( declared parameter class really, but it could be\\n> implemented this way ). It checks the passed thing is null or a\\n> subclass of Object ( second check redundant, stated for completitude\\n> ).\\n> \\n> > Inconsistencies between those two are how we ended up here, because one\\n> > does active type matching and the other doesn't, and you need different\\n> > null matching behaviour too. In addition, you definitely need any() or\\n> > it'll be confusing, so I don't think there's any way you can have an\\n> > any(X.class) method that does actual matching.\\n> > \\n> > Sounds like there is a route through though: what happens if we accept\\n> > that Java 7 is on the way out, stick only to casts, and stop making the API\\n> > confusing just to support now unsupported Java versions? That would give an\\n> > API of:\\n> > any() - matches anything\\n> > isA(X.class) - matches things with X type, not nulls\\n> > isNullOrA(X.class) - matches things with X type, or nulls\\n> \\n> I'm definitely in favour of sticking to casts, as they are a standard\\n> language feature and should be clear.\\n> \\n> Now, on your three proposed methods, you are forgetting one, which is\\n> on another part of the current API, notNull() ( or it's cousing\\n> notNull(Class), I do not know whic notNull is not declared generic\\n> like any though, I think it SHOULD be for java 8 ).\\n> \\n> You have 2 choices, 1.- accept nulls, 2.-check class, For 1 you need\\n> either a boolean argument or different names, for 2 you need a Class\\n> argument to check against. So, in your proposal you would have:\\n> - accept nulls, do not check class: any(), used as is in java 8,\\n> casted in 7 ( or for overload resolution in 8 ).\\n> - accept nulls, check class: isNullOrA(Class)\\n> - reject nulls, do not check class: notNull() ( same comments as any )\\n> - reject nulls, check class: isA(Class)\\n> \\n> Which is fine dandy for me ( the naming stuff is trivial to achieve\\n> using a FranciscoOlarteAdditionalMatchers helper class )\\n> \\n> Basically you can have a makeMatcher(boolean acceptNulls, Class klass\\n> ) and then any()==makeMatcher(true, Object.class),\\n> isNullOrA(klass)=makeMatcher(true, klass),\\n> notNull()=makeMatcher(false, Object.class),\\n> isA(klass)=makeMatcher(false, klass).\\n> \\n> > If you're using Java 8, all is good, simple and clear. If you're using\\n> > Java 7 you have to cast any(), but (MyClass) any() is clearer about what\\n> > it's doing than anything else we have here, actually shorter than\\n> > any(MyClass.class) anyway, and good IDE's will automatically suggest the\\n> > cast for you too, so pretty easy to find for newbies. Null behaviour is\\n> > also clear here, and we're pushing people to be explicit about whether they\\n> > match nulls in all arguments they care about.\\n> \\n> I think the null / check behaviour is clearer if you group them\\n> together somehow ( like I've done above ). As this gets rid of the\\n> confusing (current) anyAs(Class). Also I think notNull(Class) must go,\\n> as what is does is served by isA(class).\\n> \\n> > How does that sound to everybody?\\n> \\n> Fine for me.\\n> \\n> ---------------NOT A PROPOSAL----------------\\n> Now, I'll explain what I proposed ( for NAMING along with some\\n> motivations ). I think this discussion seems to prove it is not easily\\n> understood, this is only for reference.\\n> \\n> Note there are no functional changes with the proposal above, just\\n> name reorganizations as I think current names are confusing ( and I\\n> know they are for me, but this is my problem and I can solve it ).\\n> \\n> 0.- get rid of anyAs and notNull(class) ( served by isA and isNullOrA ).\\n> \\n> 1.- any() - keep as it is.\\n> 2.- isNullOrA(class): rename to any(class), as functionality is very\\n> similar (any()==isNullOrA(DeclaredParameterClass.class))\\n> 3.- isA() - rename to anyNotNull ( it appears next to any() in methods\\n> list, and makes the behavioural differences easy to spot. Also, if you\\n> have a method any() and anyNotNull ( both being offered by\\n> autocomplete ) is natural to assume that any==anyIncludingNull, which\\n> is correct ).\\n> 4.- notNull() - rename to anyNotNull() ( to complete the matrix ).\\n> \\n> Note: In my NAMING proposal naked any==acceptNulls, It could easily be\\n> reversed ( any=>anyOrNull, anyNotNull=>any, it just sounds bad to me\\n> that way ( maybe because I'm used to x(Object) and x(@NonNull Object)\\n> and/or explicitly documenting when nulls are not allowed).\\n> \\n> Extra things:\\n> - anyObject() - seems to do the same thing as any, if so get rid of it\\n> if to avoid confusion, if not do the same as with anyString below.\\n> - isNull(Class) - given it can be done with (Class)isNull(), get rid\\n> of it. No need for a class checking version on this.\\n> - anyString: Confusing name with current behaviour, given any() accept\\n> nulls. Rename it to isAString and then, per rule 3 above, to\\n> anyNotNullString. THEN I would add an anyString, equal to\\n> isNullOrA(String.class) or any(String.class) per rule 2. Also,\\n> consider deleting it (note below)\\n> - anyInt/anyChar/...: as with anyString, in nearly all aspects.\\n> - anyMap/anyMapOf ( and it's friends anyList, anyCollection ): Similar\\n> to anyString, rename to anyNotNullMap, and then use the now free\\n> anyMap to build one accepting nulls.\\n> \\n> for anyString/anyInt/..... I would consider having a basic matchers\\n> class, with any/anyNotNull etc.., and a matchers derived class ( a la\\n> AdditionalMatchers ) and relegate all aliases to that one, so the\\n> javadoc for the basic matchers class concentrates on basic\\n> functionality and the one for the aliases/forwarders just states the\\n> equivalence ). In fact I would better put a class for just the basic\\n> any\\\\* matchers ( including just any(), any(Class), anyNotNull(),\\n> anyNotNull(class) and isNull(class)), another one for\\n> eq/startsWith/... another one for the anyString and friends. Static\\n> imports make them easy to use in modern Java and the documentation\\n> would be much easier to read (for me at least).\\n> \\n> ## Hope this explains my vision.\\n> \\n> Regards.\\n> Francisco Olarte.\\n> \\n> ## \\n> \\n> Reply to this email directly or view it on GitHub\\n> https://github.com/mockito/mockito/issues/194#issuecomment-91175598.\\n\\n## \\n\\nSzczepan Faber\\nFounder mockito.org; Core dev gradle.org\\ntweets as @szczepiq; blogs at blog.mockito.org\\n\",\n \"Hi Szczepan:\\n\\nmmmm, delicious top posting...., anyway:\\n\\nOn Thu, Apr 9, 2015 at 3:59 PM, Szczepan Faber notifications@github.com wrote:\\n\\n> I think we have following use cases:\\n> 1. I don't care about the parameter\\n> 2. I care that it is not null\\n> 3. I care about the type (implies (2))\\n\\nI think you lack at least one ( 4.- I care it is null, but it is\\nalready served by IsNull() ( or a casted null IIRC ) ,not discussed ).\\n\\n> Solutions:\\n> 1) any(), perhaps kill anyObject(), needs explicit casting\\n> 2) no special API, kill isNotNull()/notNull() or just leave the\\n> isNotNull()/notNull(), needs explicit casting\\n> 3) any(String.class) alias to isA(String.class) (or kill isA(...))\\n> \\n> I think it is ok if only use case 3) offers API that avoids casting. E.g.\\n> if the user wants to avoid casting he needs to specify the matcher better\\n> (which I don't think is a problem).\\n\\nI don't think casting, specially in such a specialized case as\\nmockiing in tests, is an issue. And J8 will avoid most of it. What I\\ndislike of this is having mock.m((String)any()) accept nulls and\\nmock.m(any(String.class)) reject nulls. isA sounds/reads fine to me. I\\nprefer anyNotNull as name for 2 and 3 as it reads better, highlights\\nthe relation with any ( they are the family of matchers which just\\nchecks type, not value ), but I've reached a point where I think the\\nonly form to expose a proposal is to implement it to expose how it\\nlooks, which will have to wait in my case.\\n\\nAlso, thinking about the previous stuff, I'm beginnging to think\\nIsNullOrA(Class), although it has a clear definition ( I have a\\nmock.m(List), I want to match anything assignable to an ArrayList,\\nwhich are null or ArrayList subclasses, so mock.m(any(ArrayList)) ),\\nI'm not too sure about it's usefulness ( as I can do it with two\\nmatchers, and isNull plus an isA with the same target, or use\\nAdditionalMatchers.or )\\n\\nFrancisco Olarte.\\n\",\n \"I agree with Francisco, if we're going for casts I don't think we can have `any(String.class)` still exist, because we can't make it usefully be consistent with `any()`. I think just `isA` works fine for that case though, and I find it quite readable and clear.\\n\\nI do marginally prefer `notNull()` to `anyNotNull()`, just because it's shorter and simpler. I think `when(o.method(notNull(), notNull()))...` reads easier than `when(o.method(anyNotNull(), anyNotNull()))...`, and while anyNotNull makes sense in relation to any it's less clear what it does when you see it standalone. 'notNull' however is very clear indeed. It also doesn't feel quite so much like `any` and `notNull` are the same family as much as `isA/isNullOrA` are, just because `any` is kind of a special case (any + specific values are all people will probably use 1/2 the time, I expect).\\n\\nI also do think `isNullOrA(X.class)` does need to exist explicitly too, just because it's a common case and having to write `or(isNull(), isA(String.class))` (or `or((String) isNull(), isA(String.class))` for Java 7) everywhere is quite substantially messier and harder to parse. Internally just being an alias to that is fine though.\\n\\nDefinitely feels like we're getting pretty close now! One more API update then:\\n- `any()` - matches anything, including nulls\\n- `notNull()` matches anything, except nulls\\n- `isA(X.class)` matches things of X type, except nulls\\n- `isNullOrA(X.class)` matches things of X type, including nulls\\n- We get rid of every other variant (`anyString()`, `isNotNull()`, etc)\\n\\nI think there are some other extra variants we will still need for things like generic list type checks and varargs, but those should follow on fairly cleanly from these. Thoughts?\\n\",\n \"Hi Time:\\n\\nOn Thu, Apr 9, 2015 at 6:34 PM, Tim Perry notifications@github.com wrote:\\n\\n> I agree with Francisco, if we're going for casts I don't think we can have any(String.class) still exist, because we can't make it usefully be consistent with any(). I think just isA works fine for that case though, and I find it quite readable and clear.\\n\\nOK.\\n\\n> I do marginally prefer notNull() to anyNotNull(), just because it's shorter and simpler. I think when(o.method(notNull(), notNull()))... reads easier than when(o.method(anyNotNull(), anyNotNull()))..., and while anyNotNull makes sense in relation to any it's less clear what it does when you see it standalone. 'notNull' however is very clear indeed.\\n\\nOK. I donot agree with the arguments but I feel voting for notNull now\\nis much better than following the thread. I retract all my proposals\\nfor anyNotNull.\\n\\n--- ASIDE---\\n\\n> It also doesn't feel quite so much like any and notNull are the same family as much as isA/isNullOrA are, just because any is kind of a special case (any + specific values are all people will probably use 1/2 the time, I expect).\\n> I think if you place them in a square, it does. isA is NW, isNullOrA\\n> is NE, any is SE, ¿ Which one goes into SW ? ( reminds me of the test\\n> I did in school ).\\n\\nAlso, any() is like isNullOrA(Object.class), notNull() is like\\nisA(Object.class).\\n\\nNOT A PROPOSAL/DISCUSSION on the main issue, just put here as an\\nexplanation of my abandoned views.\\n--- /ASIDE ---\\n\\n> I also do think isNullOrA(X.class) does need to exist explicitly too, just because it's a common case and having to write or(isNull(), isA(String.class)) (or or((String) isNull(), isA(String.class)) for Java 7) everywhere is quite substantially messier and harder to parse. Internally just being an alias to that is fine though.\\n\\nOK with it.\\n\\n> Definitely feels like we're getting pretty close now! One more API update then:\\n> \\n> any() - matches anything, including nulls\\n> notNull() matches anything, except nulls\\n> isA(X.class) matches things of X type, except nulls\\n> isNullOrA(X.class) matches things of X type, including nulls\\n> We get rid of every other variant (anyString(), isNotNull(), etc)\\n> \\n> I think there are some other extra variants we will still need for things like generic list type checks and varargs, but those should follow on fairly cleanly from these. Thoughts?\\n\\nOk. My main problem is I find current naming extremely confussing.\\nOnce anyAs is gone and replaced with ( more correct IMO ) isNullOrA\\nit nearly vanishes, but if variants are recovered/kept ( I would do it\\nin a separate class, which could be very easily documented at the top\\nand methods, otherwise they clutter the main matchers docs. Classed\\nare cheap, specially in test code ) keep their name coherent to the\\nimplementation. I.e., givien anyString() can (should?) be implemented\\nas isA(String.class) to achieve current behaviour, name it isAString()\\n(same goes if behaviour is simillar to isNullOrA) ( or zap it, I\\nprefer just a longer way to do a thing than a confusing alternative )\\n( I used to try to put short names to things, but since about 20 years\\nago I've been progresively going to longer and clearer, typing is\\neasier than thinking, YMMV ).\\n\\nFrancisco Olarte.\\n\",\n \"Cool, I think we're in agreement then. I'm very happy to zap lots of the extra methods like `anyString()` where Java 8 means they're not going to be useful and there's a simple easy to find alternative to them (like just casting `any()`, which most ide's will even suggest and do for you).\\n\\n@bric3 @szczepiq Are you two happy if I open a PR extending my previous changes to implement this API, as in my message above?\\n\",\n \"Hi @pimterry @folarte \\n\\nThanks for the discussion, I was also away staffed at Devoxx fr for the past week. I think there's some agreement here, I'm basically OK for these changes : \\n- ` T any()` - matches anything, including nulls\\n- ` T notNull()` matches anything, except nulls\\n- ` T isA(Class clazz)` matches things of `T` type but `null`\\n => naming could be tweaked without the `is`, thus becoming `a(X.class)`, I understand this one is kinda bold.\\n- ` T isNullOrA(Class clazz)` matches things of `T` type including `null`\\n => naming could be tweaked without the `is`, thus becoming `nullOrA(X.class)`\\n- We get rid of every other variant (`anyString()`, `isNotNull(Class)`, etc)\\n => there's still need for primitive matchers : `anyInt` should stay in my opinion, but this raises another issue with primitive wrappers, should they allow null, in my opinion they should not.\\n\\n@szczepiq Another related task would be to deprecate APIs in the 1.x line.\\n\",\n \"Happy to drop the `is` prefix, seems shorter and clearer. This might be one place where we do want an alias, for `a(String.class)` and `an(Element.class)`, as otherwise I think it's quite difficult to read.\\n\\n> - We get rid of every other variant (anyString(), isNotNull(Class), etc)\\n> \\n> => there's still need for primitive matchers : anyInt should stay in my opinion, but this raises another issue with primitive wrappers, should they allow null, in my opinion they should not.\\n\\nDo mean `anyInt()`, or `anInt()`? I think the conclusion of the above discussion is that we can't have an `anyInt()` method without breaking the API: either `anyInt()` actively matches the type and rejects null (confusingly inconsistent with `any()`), or it doesn't and it's confusing and people use it wrong (the current state of affairs).\\n\\nFor Java 8 `any()` should work everywhere I think, and for Java 7 you can use `(int) any()`. I can't easily test this right now; is there something about primitives, generics and our implementation that means this doesn't work? That's going to be a difficult problem to solve if so.\\n\\nFor `anInt()` on the other hand, it doesn't actually make the API inconsistent if we do add that as another method, so that's very doable. Not clear why we need it in this case either though.\\n\\nDo you have an example that doesn't work with this as given?\\n\",\n \"Hi Brice:\\n\\nOn Sun, Apr 12, 2015 at 7:55 PM, Brice Dutheil notifications@github.com wrote:\\n\\n> Thanks for the discussion, I was also away staffed at Devoxx fr for the past week. I think there's some agreement here, I'm basically OK for these changes :\\n> \\n> T any() - matches anything, including nulls\\n> T notNull() matches anything, except nulls\\n> \\n> T isA(Class clazz) matches things of T type but null\\n> => naming could be tweaked without the is, thus becoming a(X.class), I understand this one is kinda bold.\\n\\nI strongly disagree with naming it a or ( sorry Tim ) an. I feel they\\nare too short and error prone ( and this is not COBOL, a PL/DSL is not\\nEnglish ).\\n\\n> T isNullOrA(Class clazz) matches things of T type including null\\n> => naming could be tweaked without the is, thus becoming nullOrA(X.class)\\n\\nI stil think my any/anyNotNull overrrides where superior names, but as\\nthis is functionally equivalent I'll just wrap it. OK so far.\\n\\n> We get rid of every other variant (anyString(), isNotNull(Class), etc)\\n> => there's still need for primitive matchers : anyInt should stay in my opinion, but this raises another issue with primitive wrappers, should they allow null, in my opinion they should not.\\n\\nI think the point of allowing nulls for primitives is a no point. If I\\nhave a method mock.method(int) which I match with\\nwhen(mock.method(anyInt())) it doesn't matter that the matcher\\nreceives an Integer due to boxing/reflection stuff, it will never be\\nnull, becuase if I do \\\"Integer integer = null; mock.method(integer)\\\"\\nautounboxing will raise NPE before matchers get anything to say. And\\nif there was another override mock.method(Integer), well, first this\\nshould have been matched by an appropiately casted any/is\\\\* and second,\\nit's so perverse that user deserves whatever happens there.\\n\\nFrancisco Olarte.\\n\",\n \"Soon. It's next in my queue :) Thank you guys for patience.\\n\",\n \"Great discussion. Thanks everybody for chipping in. Let's get this sorted out.\\n\\n> What I\\n> dislike of this is having mock.m((String)any()) accept nulls and\\n> mock.m(any(String.class)) reject nulls.\\n\\nI agree. There is a gotcha: given that any(SomeType.class) is most used matcher method, it will be a pain to users to upgrade to Mockito 2.0.\\n\\nHowever, if we tell users that any(String.class) checks type but (String) any() does not it is rather awkward message and it might confusing down the road.\\n\\nBy now, most users are probably used to the behavior of Mockito matchers and the pitfall is well documented ;) So there is an option to leave things as they are.\\n\\nRemoving any(T) pretty much means that we need to remove all matcher methods like anyString() anyList(), etc. This increases the impact on the user.\\n\\nI'll think about this a bit more and get back by the end of today.\\n\",\n \"BTW. what do you guys think about #246?\\n\",\n \"I think we're down to following options. Please vote or suggest other options:\\n1. Shoot down any(T) and anyT() in favor of isA(). This thread seems to be converging on this approach. Consistent and clean. High impact, potential churn.\\n2. Change any(T) and anyT() methods to reject nulls. Suggested by the community originally, potentially confusing down the road due to inconsistence with any(). This inconsistence becomes less of a problem with java8.\\n3. Do (2) but also shoot down any() replacing it with anyObject() or anything() or '_' (ala spock ;). Not sure I like killing any() because it is neatly compact.\\n4. Leave things as they are for now. Perhaps revisit for java8 support.\\n\",\n \"Hi\\n \\nSzczepan:\\n\\n> BTW. what do you guys think about #246\\n> https://github.com/mockito/mockito/issues/246?\\n> \\n> I think it may have some problems, and be an overload abuse. If done this\\n> way I would vote for having long named methods with is() being just a\\n> forwarder. And I think there may be some ambiguities if overloaded is() is\\n> used to test overloaded method ( i.e., when you mock m(is(String.class))\\n> are you mocking m(Class c) ( as m(eq(String.class)) ) or m(String s) with\\n> any string? ( It's a contrived overload, but I've seem some of these where\\n> the String version takes a class name, I think OSGi has some of them ).\\n> Having a long method (anyIstanceOf, equalTo, evenm, specially, isNull()\\n> which I personally prefer to is(null) ( Which overload is it going to pick,\\n> the Object one with a null param ) ) lets people key a little more in the\\n> difficult cases and does not at too many complexity or a signigicant run\\n> time for test code ( is() is just a one line forwarder, and it's javedoc\\n> can be left as such which just an @link to the unoverloaded method ).\\n\\nRegarding readability, I'm not sure compact overloaded names are more\\nreadable, they may be easier to read aloud, but you need to invoke higher\\nlevel brain functions to parse it and distinguish the overload being used,\\nbut maybe I'm just becoming slower.\\n\\nFrancisco Olarte.\\n\",\n \"Yep, I prefer option 1.\\n\\n#246 sounds like a good idea to me, but we should definitely market it very clearly as a convenience method (as Francisco mentions), and obviously keep the explicit methods, so people are aware they can opt in to explicitly choosing the relevant option if they need to or they're not sure what the overloading does.\\n\\nThe overload I'm most suspicious of is `is(T)`, just because it's most likely to be ambiguous, in practice and when trying to just think about what a line is doing. `is(null)` seems clear, `is(stringStartingWithHello)` is fine, but if I saw`when(is(100), is(String.class))`, I think my default would be to assume that the argument needed to literally be the class object. Not totally sure about that though, happy to go with it if others are happy.\\n\",\n \"Any progress on this? Are people happy for me to put together a potential PR for option 1, which it sounds like we've settled on, as something concrete to discuss?\\n\",\n \"My preference is to have the following matchers (option 1?):\\n- ` T any()` that accepts anything including `null`. I associate _\\\"any\\\"_ to the _\\\"anything\\\"_ in my world that includes null-values and instances. It is compact and suitable for the most common cases.\\n- ` T anyObject()` or ` T notNull()` reject `null` values opposite to any(). The name should indicate that null is rejected to avoid confusion about its behaviour.\\n- ` T isA(Class)` reject `null` values and all values that are not a subtype of `T`, like instanceof.\\n- all `any*()` and `any(T)` should be dropped cause they have different behaviour (as described before)\\n\",\n \"> 1. Shoot down any(T) and anyT() in favor of isA(). This thread seems to be converging on this approach. Consistent and clean. High impact, potential churn.\\n> 2. Change any(T) and anyT() methods to reject nulls. Suggested by the community originally, potentially confusing down the road due to inconsistence with any(). This inconsistence becomes less of a problem with java8.\\n> 3. Do (2) but also shoot down any() replacing it with anyObject() or anything() or '_' (ala spock ;). Not sure I like killing any() because it is neatly compact.\\n> 4. Leave things as they are for now. Perhaps revisit for java8 support.\\n\\nLet's try to be decisive :)\\n\\nTim & Christian vote for option 1) I very much appreciate those votes and option 1 does have a lot of charm :)\\n\\nMyself, I vote for 2) because:\\n- any(T) reads better (seems more fluent), is more intuitive to write than isA(). It looks good in tests.\\n- it is consistent gramatically with any(), it makes the API a bit more consistent\\n- java8 is very popular, people use any() for matching anything and can use any(T) for matching specific type (not null)\\n- removing any(T) (options 1 and 3) seems like a churn and big impact on users without strong enough justification. It seems arbitrary that we remove the any(T) methods. E.g. myself as a user, I would not be convinced that migrating to Mockito 2.0 is a good idea because I need to fix hundreds of compilation errors due to removal fundamental API method (anyT/any(T)). Even if I make that search&replace, I'm not convinced that tests look better now. The change also hurts muscle memory and users would be finding themselves using any(T) methods, finding the code not compile, then realizing that aha! this method was removed. However, if we update the behavior of any() (option 2) we will provide very nice signal to users during the migration to 2.0. We could potentially expose bugs. Most users expect nulls to be rejected by any(T) - Mockito 2.0 will make expose tests that fail that assumption.\\n\\nWe don't have to agree. However, it would really cool if we were on the same page :) It would be so nice if everyone of us could stand behind decisions we make as a team.\\n\\nWe definitely need to make the decision!!! (if left undecided, we're effectively deciding on option 4).\\n\",\n \"I would like to suggest introducing the isA API alongside any. The latter would accept nulls while the former would rejecet them.\\n\\nNulls are pretty common as values so we ahould not make this more difficult than necessary. Also, tgis makes migration easier.\\n\",\n \"I already started the work on this a few days ago, and I chose to kinda follow option 2 as well, here's the plan :\\n- ` T any()` that accepts anything including `null`. I am pondering the addition of `anything` as it is the original meaning of `any`.\\n- `* any*()` / ` any(T)` will be aliases of ` isA(T)`, **this is the expected behaviour by users**, doing this will introduce the rejection of `null`, with Java 8 I saw young developer to switching to `any()` when `null` values where used instead of `anyInt`.\\n\\nSince we want to do a release candidate I suggest that we ship the _null safe_ `any*`, and remove the `null` check if too much people complain.\\n\\ncc @TimvdLippe @marcingrzejszczak @raphw @szpak \\n\",\n \"Thanks for feedback!\\n\\n+1 to your plan.\\n\\n-1 to 'anything', it feels that it does not add sufficient value. It's a\\nlonger alias - not sure why would someone want to use it.\\n\\nOn Mon, Jul 25, 2016 at 10:10 AM Brice Dutheil notifications@github.com\\nwrote:\\n\\n> I already started the work on this a few days ago, and I chose to kinda\\n> follow option 2 as well, here's the plan :\\n> - T any() that accepts anything including null. I am pondering the\\n> addition of anything as it is the original meaning of any.\\n> - \\\\* any_() / any(T) will be aliases of isA(T), *this is the\\n> expected behaviour by users_, doing this will introduce the rejection\\n> of null, with Java 8 I saw young developer to switching to any() when\\n> null values where used instead of anyInt.\\n> \\n> Since we want to do a release candidate I suggest that we ship the _null\\n> safe_ any*, and remove the null check if too much people complain.\\n> \\n> cc @TimvdLippe https://github.com/TimvdLippe @marcingrzejszczak\\n> https://github.com/marcingrzejszczak @raphw https://github.com/raphw\\n> @szpak https://github.com/szpak\\n> \\n> —\\n> You are receiving this because you were mentioned.\\n> Reply to this email directly, view it on GitHub\\n> https://github.com/mockito/mockito/issues/194#issuecomment-235017691,\\n> or mute the thread\\n> https://github.com/notifications/unsubscribe-auth/AABgp-nrLrlhKpwIt9XZjvOvBWLNnglBks5qZO3wgaJpZM4D6d0z\\n> .\\n\",\n \"+1 i agree, lets try this for the RC.\\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-07-28T17:54:59Z","string":"2016-07-28T17:54:59Z"},"labeled_as":{"kind":"list like","value":["refactoring","1.* incompatible"],"string":"[\n \"refactoring\",\n \"1.* incompatible\"\n]"},"problem_title":{"kind":"string","value":"Tweaks Matchers.any family matchers behavior"},"problem_statement":{"kind":"string","value":"This issue is a follow up of the work started in #141 by @pimterry. Also here's an extract of a message on [this thread](https://groups.google.com/forum/#!topic/mockito/8_WGBB3Jbtk) of the mailing list :\n\n---\n\nThe origin of these methods is they come from `anything` i.e. anything matches, later for shortness and cast avoidance the aliases grew, but the API naming thus became inconsistent with what a human would expect. So this behavior is being changed in mockito 2 beta, to be precise here's the status on these API in the version 2.0.5-beta :\n- `any`, `anyObject`, `any(Class)` won't check anything (at first they were just aliases for _anything_ and for cast avoidance), `null` is a valid value\n- `anyX` like `anyString` will check the arg is not `null` and that has the correct type\n- `anyList` will check the argument is not null and a `List` instance\n- `anyListOf` (and the likes) at the moment are just aliases to their non generic counter part like `anyList`\n\nNote this is work in progress (started here in [#141](https://github.com/mockito/mockito/pull/141)), these new behavior can / will change in the beta phase. I'm especially wondering if the `any` family should allow `null` and if not do a type check. For example with these matchers : \n- `any`, `anyObject` stay the same, they currently allow `null` and don't have to do type check anyway\n- `any(Class)` currently allows `null` and doesn't do type check => allows `null` and if not checks for the given type\n- `anyOf` currently doesn't allow `null` and does a type check of the collection, not elements => allows `null`, if not checks collection type, if not empty checks element type\n\nMaybe extend/create a _symmetric_ `isA` family API that won't allow any `null` arguments.\n\n---\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/ArgumentMatchers.java","src/main/java/org/mockito/internal/matchers/InstanceOf.java","src/main/java/org/mockito/internal/util/Primitives.java"],"string":"[\n \"src/main/java/org/mockito/ArgumentMatchers.java\",\n \"src/main/java/org/mockito/internal/matchers/InstanceOf.java\",\n \"src/main/java/org/mockito/internal/util/Primitives.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/ArgumentMatchers.java","src/main/java/org/mockito/internal/matchers/InstanceOf.java","src/main/java/org/mockito/internal/util/Primitives.java"],"string":"[\n \"src/main/java/org/mockito/ArgumentMatchers.java\",\n \"src/main/java/org/mockito/internal/matchers/InstanceOf.java\",\n \"src/main/java/org/mockito/internal/util/Primitives.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java","src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java","src/test/java/org/mockito/internal/invocation/InvocationImplTest.java","src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java","src/test/java/org/mockito/internal/matchers/InstanceOfTest.java","src/test/java/org/mockito/internal/util/PrimitivesTest.java","src/test/java/org/mockito/internal/util/TimerTest.java","src/test/java/org/mockito/internal/util/collections/ListUtilTest.java","src/test/java/org/mockitousage/IMethods.java","src/test/java/org/mockitousage/MethodsImpl.java","src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java","src/test/java/org/mockitousage/internal/invocation/realmethod/CleanTraceRealMethodTest.java","src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java","src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java","src/test/java/org/mockitousage/matchers/MatchersTest.java","src/test/java/org/mockitousage/matchers/MoreMatchersTest.java","src/test/java/org/mockitousage/matchers/NewMatchersTest.java","src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java","src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java","src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java","src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java","src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java","src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java","src/test/java/org/mockitoutil/Conditions.java","src/test/java/org/mockitoutil/JUnitResultAssert.java","src/test/java/org/mockitoutil/TestBase.java"],"string":"[\n \"src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java\",\n \"src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java\",\n \"src/test/java/org/mockito/internal/invocation/InvocationImplTest.java\",\n \"src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java\",\n \"src/test/java/org/mockito/internal/matchers/InstanceOfTest.java\",\n \"src/test/java/org/mockito/internal/util/PrimitivesTest.java\",\n \"src/test/java/org/mockito/internal/util/TimerTest.java\",\n \"src/test/java/org/mockito/internal/util/collections/ListUtilTest.java\",\n \"src/test/java/org/mockitousage/IMethods.java\",\n \"src/test/java/org/mockitousage/MethodsImpl.java\",\n \"src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java\",\n \"src/test/java/org/mockitousage/internal/invocation/realmethod/CleanTraceRealMethodTest.java\",\n \"src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java\",\n \"src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java\",\n \"src/test/java/org/mockitousage/matchers/MatchersTest.java\",\n \"src/test/java/org/mockitousage/matchers/MoreMatchersTest.java\",\n \"src/test/java/org/mockitousage/matchers/NewMatchersTest.java\",\n \"src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java\",\n \"src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java\",\n \"src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java\",\n \"src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java\",\n \"src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java\",\n \"src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java\",\n \"src/test/java/org/mockitoutil/Conditions.java\",\n \"src/test/java/org/mockitoutil/JUnitResultAssert.java\",\n \"src/test/java/org/mockitoutil/TestBase.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/ArgumentMatchers.java b/src/main/java/org/mockito/ArgumentMatchers.java\nindex 8c56882540..51a3bf4993 100644\n--- a/src/main/java/org/mockito/ArgumentMatchers.java\n+++ b/src/main/java/org/mockito/ArgumentMatchers.java\n@@ -13,10 +13,10 @@\n import org.mockito.internal.matchers.apachecommons.ReflectionEquals;\n import org.mockito.internal.util.Primitives;\n \n+import java.util.ArrayList;\n import java.util.Collection;\n import java.util.HashMap;\n import java.util.HashSet;\n-import java.util.LinkedList;\n import java.util.List;\n import java.util.Map;\n import java.util.Set;\n@@ -26,379 +26,744 @@\n \n /**\n * Allow flexible verification or stubbing. See also {@link AdditionalMatchers}.\n+ *\n * \n * {@link Mockito} extends ArgumentMatchers so to get access to all matchers just import Mockito class statically.\n+ *\n *
\n * //stubbing using anyInt() argument matcher\n * when(mockedList.get(anyInt())).thenReturn(\"element\");\n- * \n+ *\n * //following prints \"element\"\n * System.out.println(mockedList.get(999));\n- *
\n+ *\n * //you can also verify using argument matcher\n * verify(mockedList).get(anyInt());\n *
\n- * Warning: \n+ * Since Mockito any(Class) and anyInt family matchers perform a type check, thus they won't\n+ * match null arguments. Instead use the isNull matcher.\n+ *\n+ *
\n+ * // stubbing using anyBoolean() argument matcher\n+ * when(mock.dryRun(anyBoolean())).thenReturn(\"state\");\n+ *\n+ * // below the stub won't match, and won't return \"state\"\n+ * mock.dryRun(null);\n+ *\n+ * // either change the stub\n+ * when(mock.dryRun(isNull())).thenReturn(\"state\");\n+ * mock.dryRun(null); // ok\n+ *\n+ * // or fix the code ;)\n+ * when(mock.dryRun(anyBoolean())).thenReturn(\"state\");\n+ * mock.dryRun(true); // ok\n+ *\n+ *
\n+ *\n+ *\n+ * Scroll down to see all methods - full list of matchers.\n+ *\n * \n+ * Warning: all arguments have to be provided by matchers.\n- *
\n+ *\n * E.g: (example shows verification but the same applies to stubbing):\n+ *
\n+ *\n * \n * verify(mock).someMethod(anyInt(), anyString(), eq(\"third argument\") );\n * //above is correct - eq() is also an argument matcher\n- * \n+ *\n * verify(mock).someMethod(anyInt(), anyString(), \"third argument\" );\n * //above is incorrect - exception will be thrown because third argument is given without argument matcher.\n *
\n * Matcher methods like anyObject(), eq() do not return matchers.\n * Internally, they record a matcher on a stack and return a dummy value (usually null).\n * This implementation is due static type safety imposed by java compiler.\n * The consequence is that you cannot use anyObject(), eq() methods outside of verified/stubbed method.\n- *
\n+ *
\n+ *\n * Custom Argument ArgumentMatchers \n * \n * It is important to understand the use cases and available options for dealing with non-trivial arguments\n * before implementing custom argument matchers. This way, you can select the best possible approach\n * for given scenario and produce highest quality test (clean and maintainable).\n * Please read on in the javadoc for {@link ArgumentMatcher} to learn about approaches and see the examples.\n+ *
\n */\n @SuppressWarnings(\"unchecked\")\n public class ArgumentMatchers {\n \n /**\n- * Any boolean or non-null Boolean\n+ * Matches anything , including nulls and varargs.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n *\n- * @return false.\n+ * This is an alias of: {@link #anyObject()} and {@link #any(java.lang.Class)}\n+ *
\n+ *\n+ * \n+ * Notes :
\n+ * For primitive types use {@link #anyChar()} family or {@link #isA(Class)} or {@link #any(Class)}. \n+ * Since mockito 2.0 {@link #any(Class)} is not anymore an alias of this method. \n+ * \n+ * \n+ *\n+ * @return null.\n+ *\n+ * @see #any(Class)\n+ * @see #anyObject()\n+ * @see #anyVararg()\n+ * @see #anyChar()\n+ * @see #anyInt()\n+ * @see #anyBoolean()\n+ * @see #anyCollectionOf(Class)\n */\n- public static boolean anyBoolean() {\n- reportMatcher(new InstanceOf(Boolean.class));\n- return false;\n+ public static T any() {\n+ return anyObject();\n }\n \n /**\n- * Any byte or non-null Byte.\n+ * Matches anything, including null.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * This is an alias of: {@link #any()} and {@link #any(java.lang.Class)}.\n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n- * @return 0.\n+ * @return null.\n+ * @see #any()\n+ * @see #any(Class)\n+ * @see #notNull()\n+ * @see #notNull(Class)\n+ * @deprecated This will be removed in Mockito 3.0 (which will be java 8 only)\n */\n- public static byte anyByte() {\n- reportMatcher(new InstanceOf(Byte.class));\n- return 0;\n+ @Deprecated\n+ public static T anyObject() {\n+ reportMatcher(Any.ANY);\n+ return null;\n }\n \n /**\n- * Any char or non-null Character.\n+ * Matches any object of given type, excluding nulls.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * This matcher will perform a type check with the given type, thus excluding values.\n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n *\n- * @return 0.\n+ * This is an alias of: {@link #isA(Class)}}\n+ *
\n+ *\n+ * \n+ * Since Mockito 2.0, only allow non-null instance of null is not anymore a valid value.\n+ * As reference are nullable, the suggested API to match null\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * Notes :
\n+ * For primitive types use {@link #anyChar()} family. \n+ * Since Mockito 2.0 this method will perform a type check thus null values are not authorized. \n+ * Since mockito 2.0 {@link #any()} and {@link #anyObject()} are not anymore aliases of this method. \n+ * \n+ * \n+ *\n+ * @param The accepted type\n+ * @param type the class of the accepted type.\n+ * @return null.\n+ * @see #any()\n+ * @see #anyObject()\n+ * @see #anyVararg()\n+ * @see #isA(Class)\n+ * @see #notNull()\n+ * @see #notNull(Class)\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- public static char anyChar() {\n- reportMatcher(new InstanceOf(Character.class));\n- return 0;\n+ public static T any(Class type) {\n+ reportMatcher(new InstanceOf.VarArgAware(type, \"\"));\n+ return defaultValue(type);\n }\n \n /**\n- * Any int or non-null Integer.\n+ * Object argument that implements the given class.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n *\n- * @return 0.\n+ * @param the accepted type.\n+ * @param type the class of the accepted type.\n+ * @return null.\n+ * @see #any(Class)\n */\n- public static int anyInt() {\n- reportMatcher(new InstanceOf(Integer.class));\n- return 0;\n+ public static T isA(Class type) {\n+ reportMatcher(new InstanceOf(type));\n+ return defaultValue(type);\n }\n \n /**\n- * Any long or non-null Long.\n+ * Any vararg, meaning any number and values of arguments.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Example:\n+ *
\n+ * //verification:\n+ * mock.foo(1, 2);\n+ * mock.foo(1, 2, 3, 4);\n *\n- * @return 0.\n+ * verify(mock, times(2)).foo(anyVararg());\n+ *\n+ * //stubbing:\n+ * when(mock.foo(anyVararg()).thenReturn(100);\n+ *\n+ * //prints 100\n+ * System.out.println(mock.foo(1, 2));\n+ * //also prints 100\n+ * System.out.println(mock.foo(1, 2, 3, 4));\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n+ *\n+ * @return null.\n+ * @see #any()\n+ * @see #any(Class)\n+ * @deprecated as of 2.0 use {@link #any()}\n */\n- public static long anyLong() {\n- reportMatcher(new InstanceOf(Long.class));\n- return 0;\n+ @Deprecated\n+ public static T anyVararg() {\n+ any();\n+ return null;\n }\n \n /**\n- * Any float or non-null Float.\n+ * Any boolean or non-null Boolean\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow valued Boolean, thus null is not anymore a valid value.\n+ * As primitive wrappers are nullable, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n *\n- * @return 0.\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n+ *\n+ * @return false.\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- public static float anyFloat() {\n- reportMatcher(new InstanceOf(Float.class));\n- return 0;\n+ public static boolean anyBoolean() {\n+ reportMatcher(new InstanceOf(Boolean.class, \"\"));\n+ return false;\n }\n \n /**\n- * Any double or non-null Double.\n+ * Any byte or non-null Byte.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow valued Byte, thus null is not anymore a valid value.\n+ * As primitive wrappers are nullable, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @return 0.\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- public static double anyDouble() {\n- reportMatcher(new InstanceOf(Double.class));\n+ public static byte anyByte() {\n+ reportMatcher(new InstanceOf(Byte.class, \"\"));\n return 0;\n }\n \n /**\n- * Any short or non-null Short.\n+ * Any char or non-null Character.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow valued Character, thus null is not anymore a valid value.\n+ * As primitive wrappers are nullable, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @return 0.\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- public static short anyShort() {\n- reportMatcher(new InstanceOf(Short.class));\n+ public static char anyChar() {\n+ reportMatcher(new InstanceOf(Character.class, \"\"));\n return 0;\n }\n \n /**\n- * Matches anything, including null.\n+ * Any int or non-null Integer.\n+ *\n * \n- * This is an alias of: {@link #any()} and {@link #any(java.lang.Class)}\n+ * Since Mockito 2.0, only allow valued Integer, thus null is not anymore a valid value.\n+ * As primitive wrappers are nullable, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n- * @return null.\n+ * @return 0.\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- public static T anyObject() {\n- reportMatcher(Any.ANY);\n- return null;\n+ public static int anyInt() {\n+ reportMatcher(new InstanceOf(Integer.class, \"\"));\n+ return 0;\n }\n \n /**\n- * Any vararg, meaning any number and values of arguments.\n- * \n- * Example:\n- *
\n- * //verification:\n- * mock.foo(1, 2);\n- * mock.foo(1, 2, 3, 4);\n- * \n- * verify(mock, times(2)).foo(anyVararg());\n+ * Any long or non-null Long.\n+ *\n *
\n- * //stubbing:\n- * when(mock.foo(anyVararg()).thenReturn(100);\n+ * Since Mockito 2.0, only allow valued Long, thus null is not anymore a valid value.\n+ * As primitive wrappers are nullable, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n- * //prints 100\n- * System.out.println(mock.foo(1, 2));\n- * //also prints 100\n- * System.out.println(mock.foo(1, 2, 3, 4));\n- *
null.\n- * @deprecated as of 2.0 use {@link #any()}\n+ * @return 0.\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- @Deprecated\n- public static T anyVararg() {\n- any();\n- return null;\n+ public static long anyLong() {\n+ reportMatcher(new InstanceOf(Long.class, \"\"));\n+ return 0;\n }\n \n /**\n- * Matches any object, including nulls\n- * \n- * This method doesn't do type checks with the given parameter, it is only there\n- * to avoid casting in your code. This might however change (type checks could\n- * be added) in a future major release.\n- *
\n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Any float or non-null Float.\n+ *\n *
\n- * This is an alias of: {@link #any()} and {@link #anyObject()}\n+ * Since Mockito 2.0, only allow valued Float, thus null is not anymore a valid value.\n+ * As primitive wrappers are nullable, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n- * @return null.\n+ * @return 0.\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- public static T any(Class clazz) {\n- reportMatcher(Any.ANY);\n- return defaultValue(clazz);\n+ public static float anyFloat() {\n+ reportMatcher(new InstanceOf(Float.class, \"\"));\n+ return 0;\n }\n \n /**\n- * Matches anything, including nulls and varargs\n+ * Any double or non-null Double.\n+ *\n * \n- * Shorter alias to {@link ArgumentMatchers#anyObject()}\n+ * Since Mockito 2.0, only allow valued Double, thus null is not anymore a valid value.\n+ * As primitive wrappers are nullable, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n+ *\n+ * @return 0.\n+ * @see #isNull()\n+ * @see #isNull(Class)\n+ */\n+ public static double anyDouble() {\n+ reportMatcher(new InstanceOf(Double.class, \"\"));\n+ return 0;\n+ }\n+\n+ /**\n+ * Any short or non-null Short.\n+ *\n * \n- * This is an alias of: {@link #anyObject()} and {@link #any(java.lang.Class)}\n+ * Since Mockito 2.0, only allow valued Short, thus null is not anymore a valid value.\n+ * As primitive wrappers are nullable, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n- * @return null.\n+ * @return 0.\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- public static T any() {\n- return anyObject();\n+ public static short anyShort() {\n+ reportMatcher(new InstanceOf(Short.class, \"\"));\n+ return 0;\n }\n \n /**\n- * Any non-null String\n+ * Any non-null String\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow non-null String.\n+ * As this is a nullable reference, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @return empty String (\"\")\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n public static String anyString() {\n- reportMatcher(new InstanceOf(String.class));\n+ reportMatcher(new InstanceOf(String.class, \"\"));\n return \"\";\n }\n \n /**\n- * Any non-null List.\n+ * Any non-null List.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow non-null List.\n+ * As this is a nullable reference, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @return empty List.\n+ * @see #anyListOf(Class)\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n public static List anyList() {\n- reportMatcher(new InstanceOf(List.class));\n- return new LinkedList();\n+ reportMatcher(new InstanceOf(List.class, \"\"));\n+ return new ArrayList(0);\n }\n \n /**\n- * Generic friendly alias to {@link ArgumentMatchers#anyList()}.\n- * It's an alternative to @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ * Any non-null List.\n+ *\n+ * Generic friendly alias to {@link ArgumentMatchers#anyList()}. It's an alternative to\n+ * @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ *\n * \n- * Any non-null List.\n+ * This method doesn't do type checks of the list content with the given type parameter, it is only there\n+ * to avoid casting in the code.\n+ *
\n+ *\n * \n- * This method doesn't do type checks with the given parameter, it is only there\n- * to avoid casting in your code. This might however change (type checks could\n- * be added) in a future major release.\n+ * Since Mockito 2.0, only allow non-null List.\n+ * As this is a nullable reference, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @param clazz Type owned by the list to avoid casting\n * @return empty List.\n+ * @see #anyList()\n+ * @see #isNull()\n+ * @see #isNull(Class)\n+ * @deprecated With Java 8 this method will be removed in Mockito 3.0. This method is only used for generic\n+ * friendliness to avoid casting, this is not anymore needed in Java 8.\n */\n public static List anyListOf(Class clazz) {\n return anyList();\n }\n \n /**\n- * Any non-null Set.\n+ * Any non-null Set.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow non-null Set.\n+ * As this is a nullable reference, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @return empty Set\n+ * @see #anySetOf(Class)\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n public static Set anySet() {\n- reportMatcher(new InstanceOf(Set.class));\n- return new HashSet();\n+ reportMatcher(new InstanceOf(Set.class, \"\"));\n+ return new HashSet(0);\n }\n \n /**\n+ * Any non-null Set.\n+ *\n+ * \n * Generic friendly alias to {@link ArgumentMatchers#anySet()}.\n- * It's an alternative to @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ * It's an alternative to @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ *
\n+ *\n * \n- * Any non-null Set.\n+ * This method doesn't do type checks of the set content with the given type parameter, it is only there\n+ * to avoid casting in the code.\n+ *
\n+ *\n * \n- * This method doesn't do type checks with the given parameter, it is only there\n- * to avoid casting in your code. This might however change (type checks could\n- * be added) in a future major release.\n+ * Since Mockito 2.0, only allow non-null Set.\n+ * As this is a nullable reference, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @param clazz Type owned by the Set to avoid casting\n * @return empty Set\n+ * @see #anySet()\n+ * @see #isNull()\n+ * @see #isNull(Class)\n+ * @deprecated With Java 8 this method will be removed in Mockito 3.0. This method is only used for generic\n+ * friendliness to avoid casting, this is not anymore needed in Java 8.\n */\n public static Set anySetOf(Class clazz) {\n return anySet();\n }\n \n /**\n- * Any non-null Map.\n+ * Any non-null Map.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow non-null Map.\n+ * As this is a nullable reference, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @return empty Map.\n+ * @see #anyMapOf(Class, Class)\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n public static Map anyMap() {\n- reportMatcher(new InstanceOf(Map.class));\n- return new HashMap();\n+ reportMatcher(new InstanceOf(Map.class, \"\"));\n+ return new HashMap(0);\n }\n \n /**\n+ * Any non-null Map.\n+ *\n+ * \n * Generic friendly alias to {@link ArgumentMatchers#anyMap()}.\n- * It's an alternative to @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ * It's an alternative to @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ *
\n+ *\n * \n- * Any non-null Map.\n+ * This method doesn't do type checks of the map content with the given type parameter, it is only there\n+ * to avoid casting in the code.\n+ *
\n+ *\n * \n- * This method doesn't do type checks with the given parameter, it is only there\n- * to avoid casting in your code. This might however change (type checks could\n- * be added) in a future major release.\n+ * Since Mockito 2.0, only allow non-null Map.\n+ * As this is a nullable reference, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @param keyClazz Type of the map key to avoid casting\n * @param valueClazz Type of the value to avoid casting\n * @return empty Map.\n+ * @see #anyMap()\n+ * @see #isNull()\n+ * @see #isNull(Class)\n+ * @deprecated With Java 8 this method will be removed in Mockito 3.0. This method is only used for generic\n+ * friendliness to avoid casting, this is not anymore needed in Java 8.\n */\n public static Map anyMapOf(Class keyClazz, Class valueClazz) {\n return anyMap();\n }\n \n /**\n- * Any non-null Collection.\n+ * Any non-null Collection.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow non-null Collection.\n+ * As this is a nullable reference, the suggested API to match null\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @return empty Collection.\n+ * @see #anyCollectionOf(Class)\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n public static Collection anyCollection() {\n- reportMatcher(new InstanceOf(Collection.class));\n- return new LinkedList();\n+ reportMatcher(new InstanceOf(Collection.class, \"\"));\n+ return new ArrayList(0);\n }\n \n /**\n+ * Any non-null Collection.\n+ *\n+ * \n * Generic friendly alias to {@link ArgumentMatchers#anyCollection()}.\n- * It's an alternative to @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ * It's an alternative to @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ *
\n+ *\n * \n- * Any non-null Collection.\n+ * This method doesn't do type checks of the collection content with the given type parameter, it is only there\n+ * to avoid casting in the code.\n+ *
\n+ *\n * \n- * This method doesn't do type checks with the given parameter, it is only there\n- * to avoid casting in your code. This might however change (type checks could\n- * be added) in a future major release.\n+ * Since Mockito 2.0, only allow non-null Collection.\n+ * As this is a nullable reference, the suggested API to match null\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n *\n * @param clazz Type owned by the collection to avoid casting\n * @return empty Collection.\n+ * @see #anyCollection()\n+ * @see #isNull()\n+ * @see #isNull(Class)\n+ * @deprecated With Java 8 this method will be removed in Mockito 3.0. This method is only used for generic\n+ * friendliness to avoid casting, this is not anymore needed in Java 8.\n */\n public static Collection anyCollectionOf(Class clazz) {\n return anyCollection();\n }\n \n /**\n- * Object argument that implements the given class.\n+ * Any non-null Iterable.\n+ *\n * \n- * See examples in javadoc for {@link ArgumentMatchers} class\n+ * Since Mockito 2.0, only allow non-null Iterable.\n+ * As this is a nullable reference, the suggested API to match null\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n *\n- * @param the accepted type.\n- * @param type the class of the accepted type.\n- * @return null.\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n+ *\n+ * @return empty Iterable.\n+ * @see #anyIterableOf(Class)\n+ * @see #isNull()\n+ * @see #isNull(Class)\n+ * @since 2.0.0\n */\n- public static T isA(Class type) {\n- reportMatcher(new InstanceOf(type));\n+ public static Collection anyIterable() {\n+ reportMatcher(new InstanceOf(Iterable.class, \"\"));\n+ return new ArrayList(0);\n+ }\n \n- return defaultValue(type);\n+ /**\n+ * Any non-null Iterable.\n+ *\n+ * \n+ * Generic friendly alias to {@link ArgumentMatchers#anyIterable()}.\n+ * It's an alternative to @SuppressWarnings(\"unchecked\") to keep code clean of compiler warnings.\n+ *
\n+ *\n+ * \n+ * This method doesn't do type checks of the iterable content with the given type parameter, it is only there\n+ * to avoid casting in the code.\n+ *
\n+ *\n+ * \n+ * Since Mockito 2.0, only allow non-null String.\n+ * As strings are nullable reference, the suggested API to match null wrapper\n+ * would be {@link #isNull()}. We felt this change would make tests harness much safer that it was with Mockito\n+ * 1.x.\n+ *
\n+ *\n+ * \n+ * See examples in javadoc for {@link ArgumentMatchers} class.\n+ *
\n+ *\n+ * @param clazz Type owned by the collection to avoid casting\n+ * @return empty Iterable.\n+ * @see #anyIterable()\n+ * @see #isNull()\n+ * @see #isNull(Class)\n+ * @since 2.0.0\n+ * @deprecated With Java 8 this method will be removed in Mockito 3.0. This method is only used for generic\n+ * friendliness to avoid casting, this is not anymore needed in Java 8.\n+ */\n+ public static Iterable anyIterableOf(Class clazz) {\n+ return anyIterable();\n }\n \n+\n+\n /**\n * boolean argument that is equal to the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @return 0.\n@@ -410,8 +775,10 @@ public static boolean eq(boolean value) {\n \n /**\n * byte argument that is equal to the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @return 0.\n@@ -423,8 +790,10 @@ public static byte eq(byte value) {\n \n /**\n * char argument that is equal to the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @return 0.\n@@ -436,8 +805,10 @@ public static char eq(char value) {\n \n /**\n * double argument that is equal to the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @return 0.\n@@ -449,8 +820,10 @@ public static double eq(double value) {\n \n /**\n * float argument that is equal to the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @return 0.\n@@ -462,8 +835,10 @@ public static float eq(float value) {\n \n /**\n * int argument that is equal to the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @return 0.\n@@ -475,8 +850,10 @@ public static int eq(int value) {\n \n /**\n * long argument that is equal to the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @return 0.\n@@ -501,8 +878,10 @@ public static short eq(short value) {\n \n /**\n * Object argument that is equal to the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @return null.\n@@ -517,16 +896,22 @@ public static T eq(T value) {\n /**\n * Object argument that is reflection-equal to the given value with support for excluding\n * selected fields from a class.\n+ *\n * \n * This matcher can be used when equals() is not implemented on compared objects.\n * Matcher uses java reflection API to compare fields of wanted and actual object.\n+ *
\n+ *\n * \n- * Works similarly to EqualsBuilder.reflectionEquals(this, other, exlucdeFields) from\n+ * Works similarly to EqualsBuilder.reflectionEquals(this, other, exlucdeFields) from\n * apache commons library.\n *
\n * Warning The equality check is shallow!\n+ *
\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param value the given value.\n * @param excludeFields fields to exclude, if field does not exist it is ignored.\n@@ -539,8 +924,10 @@ public static T refEq(T value, String... excludeFields) {\n \n /**\n * Object argument that is the same as the given value.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param the type of the object, it is passed through to prevent casts.\n * @param value the given value.\n@@ -555,83 +942,123 @@ public static T same(T value) {\n \n /**\n * null argument.\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @return null.\n+ * @see #isNull(Class)\n+ * @see #isNotNull()\n+ * @see #isNotNull(Class)\n */\n- public static Object isNull() {\n+ public static T isNull() {\n reportMatcher(Null.NULL);\n return null;\n }\n \n /**\n * null argument.\n+ *\n+ * \n * The class argument is provided to avoid casting.\n+ *
\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param clazz Type to avoid casting\n * @return null.\n+ * @see #isNull()\n+ * @see #isNotNull()\n+ * @see #isNotNull(Class)\n+ * @deprecated With Java 8 this method will be removed in Mockito 3.0. This method is only used for generic\n+ * friendliness to avoid casting, this is not anymore needed in Java 8.\n */\n public static T isNull(Class clazz) {\n- reportMatcher(Null.NULL);\n- return null;\n+ return isNull();\n }\n \n /**\n * Not null argument.\n+ *\n * \n- * alias to {@link ArgumentMatchers#isNotNull()}\n+ * Alias to {@link ArgumentMatchers#isNotNull()}\n+ *
\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @return null.\n */\n- public static Object notNull() {\n+ public static T notNull() {\n reportMatcher(NotNull.NOT_NULL);\n return null;\n }\n \n /**\n * Not null argument, not necessary of the given class.\n+ *\n+ * \n * The class argument is provided to avoid casting.\n+ *\n+ * Alias to {@link ArgumentMatchers#isNotNull(Class)}\n *
\n- * alias to {@link ArgumentMatchers#isNotNull(Class)}\n+ *\n *
\n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param clazz Type to avoid casting\n * @return null.\n+ * @see #isNotNull()\n+ * @see #isNull()\n+ * @see #isNull(Class)\n+ * @deprecated With Java 8 this method will be removed in Mockito 3.0. This method is only used for generic\n+ * friendliness to avoid casting, this is not anymore needed in Java 8.\n */\n public static T notNull(Class clazz) {\n- reportMatcher(NotNull.NOT_NULL);\n- return null;\n+ return notNull();\n }\n \n /**\n * Not null argument.\n+ *\n * \n- * alias to {@link ArgumentMatchers#notNull()}\n+ * Alias to {@link ArgumentMatchers#notNull()}\n+ *
\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @return null.\n+ * @see #isNotNull(Class)\n+ * @see #isNull()\n+ * @see #isNull(Class)\n */\n- public static Object isNotNull() {\n+ public static T isNotNull() {\n return notNull();\n }\n \n /**\n * Not null argument, not necessary of the given class.\n- * The class argument is provided to avoid casting.\n+ *\n * \n- * alias to {@link ArgumentMatchers#notNull(Class)}\n+ * The class argument is provided to avoid casting.\n+ * Alias to {@link ArgumentMatchers#notNull(Class)}\n+ *
\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n+ *
\n *\n * @param clazz Type to avoid casting\n * @return null.\n+ * @deprecated With Java 8 this method will be removed in Mockito 3.0. This method is only used for generic\n+ * friendliness to avoid casting, this is not anymore needed in Java 8.\n */\n public static T isNotNull(Class clazz) {\n return notNull(clazz);\n@@ -691,13 +1118,19 @@ public static String startsWith(String prefix) {\n \n /**\n * Allows creating custom argument matchers.\n+ *\n+ * \n * This API has changed in 2.0, please read {@link ArgumentMatcher} for rationale and migration guide.\n * NullPointerException auto-unboxing caveat is described below.\n+ *
\n+ *\n * \n * It is important to understand the use cases and available options for dealing with non-trivial arguments\n * before implementing custom argument matchers. This way, you can select the best possible approach\n * for given scenario and produce highest quality test (clean and maintainable).\n * Please read the documentation for {@link ArgumentMatcher} to learn about approaches and see the examples.\n+ *
\n+ *\n * \n * NullPointerException auto-unboxing caveat.\n * In rare cases when matching primitive parameter types you *must* use relevant intThat(), floatThat(), etc. method.\n@@ -705,8 +1138,11 @@ public static String startsWith(String prefix) {\n * Due to how java works we don't really have a clean way of detecting this scenario and protecting the user from this problem.\n * Hopefully, the javadoc describes the problem and solution well.\n * If you have an idea how to fix the problem, let us know via the mailing list or the issue tracker.\n+ *
\n+ *\n * \n * See examples in javadoc for {@link ArgumentMatcher} class\n+ *
\n *\n * @param matcher decides whether argument matches\n * @return null.\n@@ -718,6 +1154,7 @@ public static T argThat(ArgumentMatcher matcher) {\n \n /**\n * Allows creating custom char argument matchers.\n+ *\n * Note that {@link #argThat} will not work with primitive char matchers due to NullPointerException auto-unboxing caveat.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n@@ -732,6 +1169,7 @@ public static char charThat(ArgumentMatcher matcher) {\n \n /**\n * Allows creating custom boolean argument matchers.\n+ *\n * Note that {@link #argThat} will not work with primitive boolean matchers due to NullPointerException auto-unboxing caveat.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n@@ -746,6 +1184,7 @@ public static boolean booleanThat(ArgumentMatcher matcher) {\n \n /**\n * Allows creating custom byte argument matchers.\n+ *\n * Note that {@link #argThat} will not work with primitive byte matchers due to NullPointerException auto-unboxing caveat.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n@@ -760,6 +1199,7 @@ public static byte byteThat(ArgumentMatcher matcher) {\n \n /**\n * Allows creating custom short argument matchers.\n+ *\n * Note that {@link #argThat} will not work with primitive short matchers due to NullPointerException auto-unboxing caveat.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n@@ -774,6 +1214,7 @@ public static short shortThat(ArgumentMatcher matcher) {\n \n /**\n * Allows creating custom int argument matchers.\n+ *\n * Note that {@link #argThat} will not work with primitive int matchers due to NullPointerException auto-unboxing caveat.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n@@ -788,6 +1229,7 @@ public static int intThat(ArgumentMatcher matcher) {\n \n /**\n * Allows creating custom long argument matchers.\n+ *\n * Note that {@link #argThat} will not work with primitive long matchers due to NullPointerException auto-unboxing caveat.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n@@ -802,6 +1244,7 @@ public static long longThat(ArgumentMatcher matcher) {\n \n /**\n * Allows creating custom float argument matchers.\n+ *\n * Note that {@link #argThat} will not work with primitive float matchers due to NullPointerException auto-unboxing caveat.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\n@@ -816,6 +1259,7 @@ public static float floatThat(ArgumentMatcher matcher) {\n \n /**\n * Allows creating custom double argument matchers.\n+ *\n * Note that {@link #argThat} will not work with primitive double matchers due to NullPointerException auto-unboxing caveat.\n * \n * See examples in javadoc for {@link ArgumentMatchers} class\ndiff --git a/src/main/java/org/mockito/internal/matchers/InstanceOf.java b/src/main/java/org/mockito/internal/matchers/InstanceOf.java\nindex c315c34ee4..2876aa24d0 100644\n--- a/src/main/java/org/mockito/internal/matchers/InstanceOf.java\n+++ b/src/main/java/org/mockito/internal/matchers/InstanceOf.java\n@@ -6,6 +6,7 @@\n package org.mockito.internal.matchers;\n \n import org.mockito.ArgumentMatcher;\n+import org.mockito.internal.util.Primitives;\n \n import java.io.Serializable;\n \n@@ -13,16 +14,37 @@\n public class InstanceOf implements ArgumentMatcher, Serializable {\n \n private final Class clazz;\n+ private String description;\n \n public InstanceOf(Class clazz) {\n+ this(clazz, \"isA(\" + clazz.getCanonicalName() + \")\");\n+ }\n+\n+ public InstanceOf(Class clazz, String describedAs) {\n this.clazz = clazz;\n+ this.description = describedAs;\n }\n \n public boolean matches(Object actual) {\n- return (actual != null) && clazz.isAssignableFrom(actual.getClass());\n+ return (actual != null) &&\n+ (Primitives.isAssignableFromWrapper(actual.getClass(), clazz)\n+ || clazz.isAssignableFrom(actual.getClass()));\n }\n \n public String toString() {\n- return \"isA(\" + clazz.getName() + \")\";\n+ return description;\n+ }\n+\n+ public static class VarArgAware extends InstanceOf implements VarargMatcher {\n+\n+ public VarArgAware(Class clazz) {\n+ super(clazz);\n+ }\n+\n+ public VarArgAware(Class clazz, String describedAs) {\n+ super(clazz, describedAs);\n+ }\n }\n+\n+\n }\ndiff --git a/src/main/java/org/mockito/internal/util/Primitives.java b/src/main/java/org/mockito/internal/util/Primitives.java\nindex e7a2f99c24..1540326129 100644\n--- a/src/main/java/org/mockito/internal/util/Primitives.java\n+++ b/src/main/java/org/mockito/internal/util/Primitives.java\n@@ -42,6 +42,13 @@ public static boolean isPrimitiveOrWrapper(Class type) {\n return PRIMITIVE_OR_WRAPPER_DEFAULT_VALUES.containsKey(type);\n }\n \n+ public static boolean isAssignableFromWrapper(Class valueClass, Class referenceType) {\n+ if(isPrimitiveOrWrapper(valueClass) && isPrimitiveOrWrapper(referenceType)) {\n+ return Primitives.primitiveTypeOf(valueClass).isAssignableFrom(referenceType);\n+ }\n+ return false;\n+ }\n+\n /**\n * Returns the boxed default value for a primitive or a primitive wrapper.\n *\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java b/src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java\nindex 64a5a39c52..88e2727b1e 100644\n--- a/src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java\n+++ b/src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java\n@@ -4,12 +4,13 @@\n */\n package org.mockito.internal.exceptions.stacktrace;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Test;\n import org.mockito.exceptions.base.TraceBuilder;\n import org.mockito.internal.configuration.ConfigurationAccess;\n import org.mockitoutil.TestBase;\n \n-import static org.mockitoutil.ExtraMatchers.hasOnlyThoseClassesInStackTrace;\n+import static org.mockitoutil.Conditions.onlyThoseClassesInStackTrace;\n \n public class ConditionalStackTraceFilterTest extends TestBase {\n \n@@ -26,7 +27,7 @@ public void shouldNotFilterWhenConfigurationSaysNo() {\n \n filter.filter(t);\n \n- assertThat(t, hasOnlyThoseClassesInStackTrace(\"org.mockito.Mockito\", \"org.test.MockitoSampleTest\"));\n+ Assertions.assertThat(t).has(onlyThoseClassesInStackTrace(\"org.mockito.Mockito\", \"org.test.MockitoSampleTest\"));\n }\n \n @Test\n@@ -40,6 +41,6 @@ public void shouldFilterWhenConfigurationSaysYes() {\n \n filter.filter(t);\n \n- assertThat(t, hasOnlyThoseClassesInStackTrace(\"org.test.MockitoSampleTest\"));\n+ Assertions.assertThat(t).has(onlyThoseClassesInStackTrace(\"org.test.MockitoSampleTest\"));\n }\n }\ndiff --git a/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java b/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java\nindex ff33eab770..27ee551479 100644\n--- a/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java\n+++ b/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java\n@@ -5,12 +5,13 @@\n \n package org.mockito.internal.exceptions.stacktrace;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Test;\n import org.mockito.exceptions.base.TraceBuilder;\n import org.mockitoutil.TestBase;\n \n import static junit.framework.TestCase.assertEquals;\n-import static org.mockitoutil.ExtraMatchers.hasOnlyThoseClasses;\n+import static org.mockitoutil.Conditions.onlyThoseClasses;\n \n public class StackTraceFilterTest extends TestBase {\n \n@@ -25,7 +26,7 @@ public void shouldFilterOutCglibGarbage() {\n \n StackTraceElement[] filtered = filter.filter(t, false);\n \n- assertThat(filtered, hasOnlyThoseClasses(\"MockitoExampleTest\"));\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\"MockitoExampleTest\"));\n }\n \n @Test\n@@ -37,7 +38,7 @@ public void shouldFilterOutByteBuddyGarbage() {\n \n StackTraceElement[] filtered = filter.filter(t, false);\n \n- assertThat(filtered, hasOnlyThoseClasses(\"MockitoExampleTest\"));\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\"MockitoExampleTest\"));\n }\n \n \n@@ -49,8 +50,8 @@ public void shouldFilterOutMockitoPackage() {\n ).toTraceArray();\n \n StackTraceElement[] filtered = filter.filter(t, false);\n- \n- assertThat(filtered, hasOnlyThoseClasses(\"org.test.MockitoSampleTest\"));\n+\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\"org.test.MockitoSampleTest\"));\n }\n \n @Test\n@@ -64,8 +65,8 @@ public void shouldNotFilterOutTracesMiddleGoodTraces() {\n ).toTraceArray();\n \n StackTraceElement[] filtered = filter.filter(t, false);\n- \n- assertThat(filtered, hasOnlyThoseClasses(\"org.test.TestSupport\", \"org.test.TestSupport\", \"org.test.MockitoSampleTest\"));\n+\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\"org.test.TestSupport\", \"org.test.TestSupport\", \"org.test.MockitoSampleTest\"));\n }\n \n @Test\n@@ -78,8 +79,8 @@ public void shouldKeepRunners() {\n ).toTraceArray();\n \n StackTraceElement[] filtered = filter.filter(t, false);\n- \n- assertThat(filtered, hasOnlyThoseClasses(\"org.test.MockitoSampleTest\", \"junit.stuff\", \"org.mockito.runners.Runner\"));\n+\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\"org.test.MockitoSampleTest\", \"junit.stuff\", \"org.mockito.runners.Runner\"));\n }\n \n @Test\n@@ -95,7 +96,7 @@ public void shouldNotFilterElementsAboveMockitoJUnitRule() {\n \n StackTraceElement[] filtered = filter.filter(t, false);\n \n- assertThat(filtered, hasOnlyThoseClasses(\"org.test.MockitoSampleTest\", \"junit.stuff\", \"org.mockito.runners.Runner\",\"org.mockito.internal.junit.JUnitRule$1.evaluate(JUnitRule.java:16)\"));\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\"org.test.MockitoSampleTest\", \"junit.stuff\", \"org.mockito.runners.Runner\",\"org.mockito.internal.junit.JUnitRule$1.evaluate(JUnitRule.java:16)\"));\n }\n \n @Test\n@@ -106,8 +107,8 @@ public void shouldKeepInternalRunners() {\n ).toTraceArray();\n \n StackTraceElement[] filtered = filter.filter(t, false);\n- \n- assertThat(filtered, hasOnlyThoseClasses(\"org.test.MockitoSampleTest\", \"org.mockito.internal.runners.Runner\"));\n+\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\"org.test.MockitoSampleTest\", \"org.mockito.internal.runners.Runner\"));\n }\n \n @Test\n@@ -123,7 +124,7 @@ public void shouldStartFilteringAndKeepTop() {\n StackTraceElement[] filtered = filter.filter(t, true);\n \n //then\n- assertThat(filtered, hasOnlyThoseClasses(\"org.test.MockitoSampleTest\", \"org.test.Good\"));\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\"org.test.MockitoSampleTest\", \"org.test.Good\"));\n }\n \n @Test\n@@ -136,8 +137,8 @@ public void shouldKeepGoodTraceFromTheTopBecauseRealImplementationsOfSpiesSometi\n ).toTraceArray();\n \n StackTraceElement[] filtered = filter.filter(t, true);\n- \n- assertThat(filtered, hasOnlyThoseClasses(\n+\n+ Assertions.assertThat(filtered).has(onlyThoseClasses(\n \"org.test.MockitoSampleTest\",\n \"org.yet.another.good.Trace\",\n \"org.good.Trace\"\ndiff --git a/src/test/java/org/mockito/internal/invocation/InvocationImplTest.java b/src/test/java/org/mockito/internal/invocation/InvocationImplTest.java\nindex 39d1c32024..5c68e7c536 100644\n--- a/src/test/java/org/mockito/internal/invocation/InvocationImplTest.java\n+++ b/src/test/java/org/mockito/internal/invocation/InvocationImplTest.java\n@@ -5,6 +5,7 @@\n \n package org.mockito.internal.invocation;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Before;\n import org.junit.Test;\n import org.mockito.exceptions.base.MockitoException;\n@@ -69,45 +70,45 @@ public void shouldPrintMethodName() {\n @Test\n public void shouldPrintMethodArgs() {\n invocation = new InvocationBuilder().args(\"foo\").toInvocation();\n- assertThat(invocation.toString(), endsWith(\"simpleMethod(\\\"foo\\\");\"));\n+ Assertions.assertThat(invocation.toString()).endsWith(\"simpleMethod(\\\"foo\\\");\");\n }\n \n @Test\n public void shouldPrintMethodIntegerArgAndString() {\n invocation = new InvocationBuilder().args(\"foo\", 1).toInvocation();\n- assertThat(invocation.toString(), endsWith(\"simpleMethod(\\\"foo\\\", 1);\"));\n+ Assertions.assertThat(invocation.toString()).endsWith(\"simpleMethod(\\\"foo\\\", 1);\");\n }\n \n @Test\n public void shouldPrintNull() {\n invocation = new InvocationBuilder().args((String) null).toInvocation();\n- assertThat(invocation.toString(), endsWith(\"simpleMethod(null);\"));\n+ Assertions.assertThat(invocation.toString()).endsWith(\"simpleMethod(null);\");\n }\n \n @Test\n public void shouldPrintArray() {\n invocation = new InvocationBuilder().method(\"oneArray\").args(new int[] { 1, 2, 3 }).toInvocation();\n- assertThat(invocation.toString(), endsWith(\"oneArray([1, 2, 3]);\"));\n+ Assertions.assertThat(invocation.toString()).endsWith(\"oneArray([1, 2, 3]);\");\n }\n \n @Test\n public void shouldPrintNullIfArrayIsNull() throws Exception {\n Method m = IMethods.class.getMethod(\"oneArray\", Object[].class);\n invocation = new InvocationBuilder().method(m).args((Object) null).toInvocation();\n- assertThat(invocation.toString(), endsWith(\"oneArray(null);\"));\n+ Assertions.assertThat(invocation.toString()).endsWith(\"oneArray(null);\");\n }\n \n @Test\n public void shouldPrintArgumentsInMultilinesWhenGetsTooBig() {\n invocation = new InvocationBuilder().args(\"veeeeery long string that makes it ugly in one line\", 1).toInvocation();\n- assertThat(invocation.toString(), endsWith(\n+ Assertions.assertThat(invocation.toString()).endsWith(\n \"simpleMethod(\" +\n \"\\n\" +\n \" \\\"veeeeery long string that makes it ugly in one line\\\",\" +\n \"\\n\" +\n \" 1\" +\n \"\\n\" +\n- \");\"));\n+ \");\");\n }\n \n @Test\ndiff --git a/src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java b/src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java\nindex c34a0258a8..6425ba877b 100644\n--- a/src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java\n+++ b/src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java\n@@ -5,6 +5,7 @@\n \n package org.mockito.internal.invocation;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Before;\n import org.junit.Test;\n import org.mockito.Mock;\n@@ -20,8 +21,9 @@\n import java.util.LinkedList;\n import java.util.List;\n \n-import static junit.framework.TestCase.*;\n-import static org.mockitoutil.ExtraMatchers.hasExactlyInOrder;\n+import static junit.framework.TestCase.assertNull;\n+import static junit.framework.TestCase.assertSame;\n+import static junit.framework.TestCase.assertTrue;\n \n \n public class InvocationsFinderTest extends TestBase {\n@@ -48,10 +50,10 @@ public void setup() throws Exception {\n @Test\n public void shouldFindActualInvocations() throws Exception {\n List actual = InvocationsFinder.findInvocations(invocations, new InvocationMatcher(simpleMethodInvocation));\n- assertThat(actual, hasExactlyInOrder(simpleMethodInvocation, simpleMethodInvocationTwo));\n+ Assertions.assertThat(actual).containsSequence(simpleMethodInvocation, simpleMethodInvocationTwo);\n \n actual = InvocationsFinder.findInvocations(invocations, new InvocationMatcher(differentMethodInvocation));\n- assertThat(actual, hasExactlyInOrder(differentMethodInvocation));\n+ Assertions.assertThat(actual).containsSequence(differentMethodInvocation);\n }\n \n @Test\n@@ -137,11 +139,11 @@ public void shouldGetLastStackTrace() throws Exception {\n @Test\n public void shouldFindAllMatchingUnverifiedChunks() throws Exception {\n List allMatching = InvocationsFinder.findAllMatchingUnverifiedChunks(invocations, new InvocationMatcher(simpleMethodInvocation), context);\n- assertThat(allMatching, hasExactlyInOrder(simpleMethodInvocation, simpleMethodInvocationTwo));\n+ Assertions.assertThat(allMatching).containsSequence(simpleMethodInvocation, simpleMethodInvocationTwo);\n \n context.markVerified(simpleMethodInvocation);\n allMatching = InvocationsFinder.findAllMatchingUnverifiedChunks(invocations, new InvocationMatcher(simpleMethodInvocation), context);\n- assertThat(allMatching, hasExactlyInOrder(simpleMethodInvocationTwo));\n+ Assertions.assertThat(allMatching).containsSequence(simpleMethodInvocationTwo);\n \n context.markVerified(simpleMethodInvocationTwo);\n allMatching = InvocationsFinder.findAllMatchingUnverifiedChunks(invocations, new InvocationMatcher(simpleMethodInvocation), context);\n@@ -151,7 +153,7 @@ public void shouldFindAllMatchingUnverifiedChunks() throws Exception {\n @Test\n public void shouldFindMatchingChunk() throws Exception {\n List chunk = InvocationsFinder.findMatchingChunk(invocations, new InvocationMatcher(simpleMethodInvocation), 2, context);\n- assertThat(chunk, hasExactlyInOrder(simpleMethodInvocation, simpleMethodInvocationTwo));\n+ Assertions.assertThat(chunk).containsSequence(simpleMethodInvocation, simpleMethodInvocationTwo);\n }\n \n @Test\n@@ -160,7 +162,7 @@ public void shouldReturnAllChunksWhenModeIsAtLeastOnce() throws Exception {\n invocations.add(simpleMethodInvocationThree);\n \n List chunk = InvocationsFinder.findMatchingChunk(invocations, new InvocationMatcher(simpleMethodInvocation), 1, context);\n- assertThat(chunk, hasExactlyInOrder(simpleMethodInvocation, simpleMethodInvocationTwo, simpleMethodInvocationThree));\n+ Assertions.assertThat(chunk).containsSequence(simpleMethodInvocation, simpleMethodInvocationTwo, simpleMethodInvocationThree);\n }\n \n @Test\n@@ -169,7 +171,7 @@ public void shouldReturnAllChunksWhenWantedCountDoesntMatch() throws Exception {\n invocations.add(simpleMethodInvocationThree);\n \n List chunk = InvocationsFinder.findMatchingChunk(invocations, new InvocationMatcher(simpleMethodInvocation), 1, context);\n- assertThat(chunk, hasExactlyInOrder(simpleMethodInvocation, simpleMethodInvocationTwo, simpleMethodInvocationThree));\n+ Assertions.assertThat(chunk).containsSequence(simpleMethodInvocation, simpleMethodInvocationTwo, simpleMethodInvocationThree);\n }\n \n @Test\ndiff --git a/src/test/java/org/mockito/internal/matchers/InstanceOfTest.java b/src/test/java/org/mockito/internal/matchers/InstanceOfTest.java\nnew file mode 100644\nindex 0000000000..4497c7c60a\n--- /dev/null\n+++ b/src/test/java/org/mockito/internal/matchers/InstanceOfTest.java\n@@ -0,0 +1,64 @@\n+package org.mockito.internal.matchers;\n+\n+import org.junit.Test;\n+\n+import java.util.ArrayList;\n+import java.util.List;\n+\n+import static org.assertj.core.api.Assertions.assertThat;\n+\n+public class InstanceOfTest {\n+\n+ @Test\n+ public void should_describe_the_matcher() {\n+ assertThat(new InstanceOf(Object.class).toString()).contains(\"isA\")\n+ .contains(\"Object\");\n+ assertThat(new InstanceOf(Object[].class).toString()).contains(\"isA\")\n+ .contains(\"Object[]\");\n+ assertThat(new InstanceOf(Object.class, \"matches something\").toString()).isEqualTo(\"matches something\");\n+ }\n+\n+ @Test\n+ public void should_check_instance_type() {\n+ assertThat(new InstanceOf(Object.class).matches(new Object())).isTrue();\n+ assertThat(new InstanceOf(Object.class).matches(new ArrayList())).isTrue();\n+ assertThat(new InstanceOf(List.class).matches(new ArrayList())).isTrue();\n+ assertThat(new InstanceOf(List.class).matches(new Object())).isFalse();\n+ }\n+\n+ @Test\n+ public void should_check_for_primitive_wrapper_types() {\n+ assertThat(new InstanceOf(int.class).matches(1000)).isTrue();\n+ assertThat(new InstanceOf(Integer.class).matches(1000)).isTrue();\n+ assertThat(new InstanceOf(int.class).matches(new Integer(1000))).isTrue();\n+ assertThat(new InstanceOf(Integer.class).matches(new Integer(1000))).isTrue();\n+\n+ assertThat(new InstanceOf(double.class).matches(1000.1)).isTrue();\n+ assertThat(new InstanceOf(Double.class).matches(1000.1)).isTrue();\n+ assertThat(new InstanceOf(double.class).matches(new Double(1000.1))).isTrue();\n+ assertThat(new InstanceOf(Double.class).matches(new Double(1000.1))).isTrue();\n+\n+ assertThat(new InstanceOf(int.class).matches(1000L)).isFalse();\n+ assertThat(new InstanceOf(Integer.class).matches(1000L)).isFalse();\n+ assertThat(new InstanceOf(int.class).matches(new Long(1000))).isFalse();\n+ assertThat(new InstanceOf(Integer.class).matches(new Long(1000))).isFalse();\n+\n+ assertThat(new InstanceOf(long.class).matches(1000L)).isTrue();\n+ assertThat(new InstanceOf(Long.class).matches(1000L)).isTrue();\n+ assertThat(new InstanceOf(long.class).matches(new Long(1000))).isTrue();\n+ assertThat(new InstanceOf(Long.class).matches(new Long(1000))).isTrue();\n+\n+ assertThat(new InstanceOf(long.class).matches(1000)).isFalse();\n+ assertThat(new InstanceOf(Long.class).matches(1000)).isFalse();\n+ assertThat(new InstanceOf(long.class).matches(new Integer(1000))).isFalse();\n+ assertThat(new InstanceOf(Long.class).matches(new Integer(1000))).isFalse();\n+ }\n+\n+ @Test\n+ public void can_be_vararg_aware() {\n+ assertThat(new InstanceOf.VarArgAware(Number[].class)).isInstanceOf(VarargMatcher.class);\n+ assertThat(new InstanceOf.VarArgAware(Number[].class).matches(new Integer[0])).isTrue();\n+ assertThat(new InstanceOf.VarArgAware(Number[].class).matches(new Number[0])).isTrue();\n+ assertThat(new InstanceOf.VarArgAware(Number[].class).matches(new Object[0])).isFalse();\n+ }\n+}\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockito/internal/progress/PrimitivesTest.java b/src/test/java/org/mockito/internal/progress/PrimitivesTest.java\ndeleted file mode 100644\nindex de24c6a383..0000000000\n--- a/src/test/java/org/mockito/internal/progress/PrimitivesTest.java\n+++ /dev/null\n@@ -1,72 +0,0 @@\n-/*\n- * Copyright (c) 2007 Mockito contributors\n- * This program is made available under the terms of the MIT License.\n- */\n-package org.mockito.internal.progress;\n-\n-import org.junit.Test;\n-import org.mockito.internal.util.Primitives;\n-\n-import static org.assertj.core.api.Assertions.assertThat;\n-import static org.junit.Assert.assertNotNull;\n-import static org.junit.Assert.assertNull;\n-\n-\n-public class PrimitivesTest {\n-\n-\n- @Test\n- public void should_not_return_null_for_primitives_wrappers() throws Exception {\n- assertNotNull(Primitives.defaultValue(Boolean.class));\n- assertNotNull(Primitives.defaultValue(Character.class));\n- assertNotNull(Primitives.defaultValue(Byte.class));\n- assertNotNull(Primitives.defaultValue(Short.class));\n- assertNotNull(Primitives.defaultValue(Integer.class));\n- assertNotNull(Primitives.defaultValue(Long.class));\n- assertNotNull(Primitives.defaultValue(Float.class));\n- assertNotNull(Primitives.defaultValue(Double.class));\n- }\n-\n- @Test\n- public void should_not_return_null_for_primitives() throws Exception {\n- assertNotNull(Primitives.defaultValue(boolean.class));\n- assertNotNull(Primitives.defaultValue(char.class));\n- assertNotNull(Primitives.defaultValue(byte.class));\n- assertNotNull(Primitives.defaultValue(short.class));\n- assertNotNull(Primitives.defaultValue(int.class));\n- assertNotNull(Primitives.defaultValue(long.class));\n- assertNotNull(Primitives.defaultValue(float.class));\n- assertNotNull(Primitives.defaultValue(double.class));\n- }\n-\n- @Test \n- public void should_default_values_for_primitive() {\n- assertThat(Primitives.defaultValue(boolean.class)).isFalse();\n- assertThat(Primitives.defaultValue(char.class)).isEqualTo('\\u0000');\n- assertThat(Primitives.defaultValue(byte.class)).isEqualTo((byte) 0);\n- assertThat(Primitives.defaultValue(short.class)).isEqualTo((short) 0);\n- assertThat(Primitives.defaultValue(int.class)).isEqualTo(0);\n- assertThat(Primitives.defaultValue(long.class)).isEqualTo(0L);\n- assertThat(Primitives.defaultValue(float.class)).isEqualTo(0.0F);\n- assertThat(Primitives.defaultValue(double.class)).isEqualTo(0.0D);\n- }\n- \n- @Test \n- public void should_default_values_for_wrapper() {\n- assertThat(Primitives.defaultValue(Boolean.class)).isFalse();\n- assertThat(Primitives.defaultValue(Character.class)).isEqualTo('\\u0000');\n- assertThat(Primitives.defaultValue(Byte.class)).isEqualTo((byte) 0);\n- assertThat(Primitives.defaultValue(Short.class)).isEqualTo((short) 0);\n- assertThat(Primitives.defaultValue(Integer.class)).isEqualTo(0);\n- assertThat(Primitives.defaultValue(Long.class)).isEqualTo(0L);\n- assertThat(Primitives.defaultValue(Float.class)).isEqualTo(0.0F);\n- assertThat(Primitives.defaultValue(Double.class)).isEqualTo(0.0D);\n- }\n-\n- @Test\n- public void should_return_null_for_everything_else() throws Exception {\n- assertNull(Primitives.defaultValue(Object.class));\n- assertNull(Primitives.defaultValue(String.class));\n- assertNull(Primitives.defaultValue(null));\n- }\n-}\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockito/internal/util/PrimitivesTest.java b/src/test/java/org/mockito/internal/util/PrimitivesTest.java\nindex 839763f820..2ea86c6118 100644\n--- a/src/test/java/org/mockito/internal/util/PrimitivesTest.java\n+++ b/src/test/java/org/mockito/internal/util/PrimitivesTest.java\n@@ -12,8 +12,6 @@\n \n \n public class PrimitivesTest {\n-\n-\n @Test\n public void should_not_return_null_for_primitives_wrappers() throws Exception {\n assertNotNull(Primitives.defaultValue(Boolean.class));\n@@ -68,4 +66,24 @@ public void should_return_null_for_everything_else() throws Exception {\n assertNull(Primitives.defaultValue(String.class));\n assertNull(Primitives.defaultValue(null));\n }\n+\n+ @Test\n+ public void should_check_that_value_type_is_assignable_to_wrapper_reference() {\n+ assertThat(Primitives.isAssignableFromWrapper(int.class, Integer.class));\n+ assertThat(Primitives.isAssignableFromWrapper(Integer.class, Integer.class));\n+ assertThat(Primitives.isAssignableFromWrapper(long.class, Long.class));\n+ assertThat(Primitives.isAssignableFromWrapper(Long.class, Long.class));\n+ assertThat(Primitives.isAssignableFromWrapper(double.class, Double.class));\n+ assertThat(Primitives.isAssignableFromWrapper(Double.class, Double.class));\n+ assertThat(Primitives.isAssignableFromWrapper(float.class, Float.class));\n+ assertThat(Primitives.isAssignableFromWrapper(Float.class, Float.class));\n+ assertThat(Primitives.isAssignableFromWrapper(char.class, Character.class));\n+ assertThat(Primitives.isAssignableFromWrapper(Character.class, Character.class));\n+ assertThat(Primitives.isAssignableFromWrapper(short.class, Short.class));\n+ assertThat(Primitives.isAssignableFromWrapper(Short.class, Short.class));\n+ assertThat(Primitives.isAssignableFromWrapper(byte.class, Byte.class));\n+ assertThat(Primitives.isAssignableFromWrapper(Byte.class, Byte.class));\n+ assertThat(Primitives.isAssignableFromWrapper(boolean.class, Boolean.class));\n+ assertThat(Primitives.isAssignableFromWrapper(Boolean.class, Boolean.class));\n+ }\n }\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockito/internal/util/TimerTest.java b/src/test/java/org/mockito/internal/util/TimerTest.java\nindex e1156688c1..49cd3c7cae 100644\n--- a/src/test/java/org/mockito/internal/util/TimerTest.java\n+++ b/src/test/java/org/mockito/internal/util/TimerTest.java\n@@ -1,12 +1,11 @@\n package org.mockito.internal.util;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Assert;\n import org.junit.Test;\n import org.mockito.exceptions.misusing.FriendlyReminderException;\n import org.mockitoutil.TestBase;\n \n-import static org.hamcrest.CoreMatchers.is;\n-\n public class TimerTest extends TestBase {\n \n @Test\n@@ -19,7 +18,7 @@ public void should_return_true_if_task_is_in_acceptable_time_bounds() {\n timer.start();\n \n //then\n- assertThat(timer.isCounting(), is(true));\n+ Assertions.assertThat(timer.isCounting()).isTrue();\n }\n \n @Test\n@@ -32,7 +31,7 @@ public void should_return_false_when_time_run_out() throws Exception {\n oneMillisecondPasses();\n \n //then\n- assertThat(timer.isCounting(), is(false));\n+ Assertions.assertThat(timer.isCounting()).isFalse();\n }\n \n @Test\ndiff --git a/src/test/java/org/mockito/internal/util/collections/ListUtilTest.java b/src/test/java/org/mockito/internal/util/collections/ListUtilTest.java\nindex 594fbc3d25..fcd4f9704a 100644\n--- a/src/test/java/org/mockito/internal/util/collections/ListUtilTest.java\n+++ b/src/test/java/org/mockito/internal/util/collections/ListUtilTest.java\n@@ -5,6 +5,7 @@\n \n package org.mockito.internal.util.collections;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Test;\n import org.mockito.internal.util.collections.ListUtil.Filter;\n import org.mockitoutil.TestBase;\n@@ -14,7 +15,6 @@\n \n import static java.util.Arrays.asList;\n import static junit.framework.TestCase.assertTrue;\n-import static org.mockitoutil.ExtraMatchers.hasExactlyInOrder;\n \n public class ListUtilTest extends TestBase {\n \n@@ -26,8 +26,8 @@ public boolean isOut(String object) {\n return object == \"x\";\n }\n });\n- \n- assertThat(filtered, hasExactlyInOrder(\"one\", \"two\", \"three\"));\n+\n+ Assertions.assertThat(filtered).containsSequence(\"one\", \"two\", \"three\");\n }\n \n @Test\ndiff --git a/src/test/java/org/mockitousage/IMethods.java b/src/test/java/org/mockitousage/IMethods.java\nindex a18d04697d..7234bd7976 100644\n--- a/src/test/java/org/mockitousage/IMethods.java\n+++ b/src/test/java/org/mockitousage/IMethods.java\n@@ -190,6 +190,8 @@ public interface IMethods {\n \n String forCollection(Collection collection);\n \n+ String forIterable(Iterable iterable);\n+\n Object[] arrayReturningMethod();\n \n IMethods iMethodsReturningMethod();\n@@ -202,6 +204,8 @@ public interface IMethods {\n \n Object collectionArgMethod(Collection collection);\n \n+ Object iterableArgMethod(Iterable collection);\n+\n Object setArgMethod(Set set);\n \n void longArg(long longArg);\ndiff --git a/src/test/java/org/mockitousage/MethodsImpl.java b/src/test/java/org/mockitousage/MethodsImpl.java\nindex cc4fb4155d..4f4bdcc8d8 100644\n--- a/src/test/java/org/mockitousage/MethodsImpl.java\n+++ b/src/test/java/org/mockitousage/MethodsImpl.java\n@@ -363,6 +363,10 @@ public String forCollection(Collection collection) {\n return null;\n }\n \n+ public String forIterable(Iterable iterable) {\n+ return null;\n+ }\n+\n public Object[] arrayReturningMethod() {\n return new Object[0];\n }\n@@ -387,6 +391,10 @@ public Object collectionArgMethod(Collection collection) {\n return null;\n }\n \n+ public Object iterableArgMethod(Iterable iterable) {\n+ return null;\n+ }\n+\n public Object setArgMethod(Set set) {\n return null;\n }\ndiff --git a/src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java b/src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java\nindex bc79a68e5e..dc6258c297 100644\n--- a/src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java\n+++ b/src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java\n@@ -5,13 +5,12 @@\n \n package org.mockitousage.basicapi;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Test;\n import org.mockito.Mockito;\n import org.mockitoutil.TestBase;\n \n import static junit.framework.TestCase.assertEquals;\n-import static org.hamcrest.CoreMatchers.equalTo;\n-import static org.hamcrest.CoreMatchers.not;\n \n public class ReplacingObjectMethodsTest extends TestBase {\n \n@@ -30,12 +29,11 @@ public void shouldProvideMockyImplementationOfToString() {\n public void shouldReplaceObjectMethods() {\n Object mock = Mockito.mock(ObjectMethodsOverridden.class);\n Object otherMock = Mockito.mock(ObjectMethodsOverridden.class);\n- \n- assertThat(mock, equalTo(mock));\n- assertThat(mock, not(equalTo(otherMock)));\n- \n- assertThat(mock.hashCode(), not(equalTo(otherMock.hashCode())));\n- \n+\n+ Assertions.assertThat(mock).isEqualTo(mock);\n+ Assertions.assertThat(mock).isNotEqualTo(otherMock);\n+ Assertions.assertThat(mock.hashCode()).isNotEqualTo(otherMock.hashCode());\n+\n assertContains(\"Mock for ObjectMethodsOverridden\", mock.toString());\n }\n \n@@ -43,12 +41,11 @@ public void shouldReplaceObjectMethods() {\n public void shouldReplaceObjectMethodsWhenOverridden() {\n Object mock = Mockito.mock(ObjectMethodsOverriddenSubclass.class);\n Object otherMock = Mockito.mock(ObjectMethodsOverriddenSubclass.class);\n- \n- assertThat(mock, equalTo(mock));\n- assertThat(mock, not(equalTo(otherMock)));\n- \n- assertThat(mock.hashCode(), not(equalTo(otherMock.hashCode())));\n- \n+\n+ Assertions.assertThat(mock).isEqualTo(mock);\n+ Assertions.assertThat(mock).isNotEqualTo(otherMock);\n+ Assertions.assertThat(mock.hashCode()).isNotEqualTo(otherMock.hashCode());\n+\n assertContains(\"Mock for ObjectMethodsOverriddenSubclass\", mock.toString());\n }\n \ndiff --git a/src/test/java/org/mockitousage/internal/invocation/realmethod/CleanTraceRealMethodTest.java b/src/test/java/org/mockitousage/internal/invocation/realmethod/CleanTraceRealMethodTest.java\nindex 48ee1e31be..10ec3da6b5 100644\n--- a/src/test/java/org/mockitousage/internal/invocation/realmethod/CleanTraceRealMethodTest.java\n+++ b/src/test/java/org/mockitousage/internal/invocation/realmethod/CleanTraceRealMethodTest.java\n@@ -4,6 +4,7 @@\n */\n package org.mockitousage.internal.invocation.realmethod;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Before;\n import org.junit.Test;\n import org.mockito.internal.invocation.realmethod.CleanTraceRealMethod;\n@@ -11,7 +12,7 @@\n import org.mockitoutil.TestBase;\n \n import static junit.framework.TestCase.fail;\n-import static org.mockitoutil.ExtraMatchers.hasMethodInStackTraceAt;\n+import static org.mockitoutil.Conditions.methodInStackTraceAt;\n \n public class CleanTraceRealMethodTest extends TestBase {\n \n@@ -42,9 +43,9 @@ public Object invoke(Object target, Object[] arguments) throws Throwable {\n fail();\n //then\n } catch (Exception e) {\n- assertThat(e, hasMethodInStackTraceAt(0, \"throwSomething\"));\n- assertThat(e, hasMethodInStackTraceAt(1, \"invoke\"));\n- assertThat(e, hasMethodInStackTraceAt(2, \"shouldRemoveMockitoInternalsFromStackTraceWhenRealMethodThrows\"));\n+ Assertions.assertThat(e).has(methodInStackTraceAt(0, \"throwSomething\"));\n+ Assertions.assertThat(e).has(methodInStackTraceAt(1, \"invoke\"));\n+ Assertions.assertThat(e).has(methodInStackTraceAt(2, \"shouldRemoveMockitoInternalsFromStackTraceWhenRealMethodThrows\"));\n }\n }\n }\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java b/src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java\nindex 134bea8944..df90dc10d2 100644\n--- a/src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java\n+++ b/src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java\n@@ -9,12 +9,16 @@\n import org.mockito.exceptions.verification.TooLittleActualInvocations;\n import org.mockito.runners.MockitoJUnitRunner;\n import org.mockitousage.IMethods;\n+import org.mockitoutil.JUnitResultAssert;\n import org.mockitoutil.TestBase;\n \n import java.util.List;\n \n import static org.junit.Assert.assertEquals;\n-import static org.mockito.Mockito.*;\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.times;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n \n /**\n * Created by sfaber on 4/22/16.\n@@ -29,7 +33,7 @@ public class SilentRunnerTest extends TestBase {\n SomeFeature.class\n );\n //then\n- assertThat(result).isSuccessful();\n+ JUnitResultAssert.assertThat(result).isSuccessful();\n }\n \n @Test public void failing_test() {\n@@ -38,7 +42,7 @@ public class SilentRunnerTest extends TestBase {\n SomeFailingFeature.class\n );\n //then\n- assertThat(result).fails(1, TooLittleActualInvocations.class);\n+ JUnitResultAssert.assertThat(result).fails(1, TooLittleActualInvocations.class);\n }\n \n @Test public void validates_framework_usage() {\n@@ -47,7 +51,7 @@ public class SilentRunnerTest extends TestBase {\n UsesFrameworkIncorrectly.class\n );\n //then\n- assertThat(result).fails(1, UnfinishedStubbingException.class);\n+ JUnitResultAssert.assertThat(result).fails(1, UnfinishedStubbingException.class);\n }\n \n @Test\n@@ -56,7 +60,7 @@ public void ignores_unused_stubs() {\n //when\n Result result = runner.run(HasUnnecessaryStubs.class);\n //then\n- assertThat(result).isSuccessful();\n+ JUnitResultAssert.assertThat(result).isSuccessful();\n }\n \n @RunWith(MockitoJUnitRunner.Silent.class)\ndiff --git a/src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java b/src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java\nindex bcd298edb1..c12df6acbf 100644\n--- a/src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java\n+++ b/src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java\n@@ -9,12 +9,14 @@\n import org.mockito.exceptions.misusing.UnnecessaryStubbingException;\n import org.mockito.runners.MockitoJUnitRunner;\n import org.mockitousage.IMethods;\n+import org.mockitoutil.JUnitResultAssert;\n import org.mockitoutil.TestBase;\n \n import static org.junit.Assert.assertEquals;\n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.when;\n \n+\n /**\n * Created by sfaber on 4/22/16.\n */\n@@ -30,7 +32,7 @@ public class StrictRunnerTest extends TestBase {\n StubbingInTestUsed.class\n );\n //then\n- assertThat(result).isSuccessful();\n+ JUnitResultAssert.assertThat(result).isSuccessful();\n }\n \n @Test public void fails_when_stubs_were_not_used() {\n@@ -42,7 +44,7 @@ public class StrictRunnerTest extends TestBase {\n Result result = runner.run(tests);\n \n //then\n- assertThat(result).fails(3, UnnecessaryStubbingException.class);\n+ JUnitResultAssert.assertThat(result).fails(3, UnnecessaryStubbingException.class);\n }\n \n @Test public void does_not_report_unused_stubs_when_different_failure_is_present() {\n@@ -50,7 +52,7 @@ public class StrictRunnerTest extends TestBase {\n Result result = runner.run(WithUnrelatedAssertionFailure.class);\n \n //then\n- assertThat(result).fails(1, MyAssertionError.class);\n+ JUnitResultAssert.assertThat(result).fails(1, MyAssertionError.class);\n }\n \n @RunWith(MockitoJUnitRunner.class)\ndiff --git a/src/test/java/org/mockitousage/matchers/MatchersTest.java b/src/test/java/org/mockitousage/matchers/MatchersTest.java\nindex 86f476cc84..46b0caeb52 100644\n--- a/src/test/java/org/mockitousage/matchers/MatchersTest.java\n+++ b/src/test/java/org/mockitousage/matchers/MatchersTest.java\n@@ -436,6 +436,27 @@ public void nullMatcher() {\n assertEquals(\"2\", mock.threeArgumentMethod(1, new Object(), \"\"));\n }\n \n+ @Test\n+ public void nullMatcherForPrimitiveWrappers() {\n+ when(mock.forBoolean(isNull(Boolean.class))).thenReturn(\"ok\");\n+ when(mock.forInteger(isNull(Integer.class))).thenReturn(\"ok\");\n+ when(mock.forLong(isNull(Long.class))).thenReturn(\"ok\");\n+ when(mock.forByte(isNull(Byte.class))).thenReturn(\"ok\");\n+ when(mock.forShort(isNull(Short.class))).thenReturn(\"ok\");\n+ when(mock.forCharacter(isNull(Character.class))).thenReturn(\"ok\");\n+ when(mock.forDouble(isNull(Double.class))).thenReturn(\"ok\");\n+ when(mock.forFloat(isNull(Float.class))).thenReturn(\"ok\");\n+\n+ assertEquals(\"ok\", mock.forBoolean(null));\n+ assertEquals(\"ok\", mock.forInteger(null));\n+ assertEquals(\"ok\", mock.forLong(null));\n+ assertEquals(\"ok\", mock.forByte(null));\n+ assertEquals(\"ok\", mock.forShort(null));\n+ assertEquals(\"ok\", mock.forCharacter(null));\n+ assertEquals(\"ok\", mock.forDouble(null));\n+ assertEquals(\"ok\", mock.forFloat(null));\n+ }\n+\n @Test\n public void notNullMatcher() {\n when(mock.threeArgumentMethod(eq(1), notNull(), eq(\"\"))).thenReturn(\"1\");\ndiff --git a/src/test/java/org/mockitousage/matchers/MoreMatchersTest.java b/src/test/java/org/mockitousage/matchers/MoreMatchersTest.java\nindex 026905bae6..3471fe0a19 100644\n--- a/src/test/java/org/mockitousage/matchers/MoreMatchersTest.java\n+++ b/src/test/java/org/mockitousage/matchers/MoreMatchersTest.java\n@@ -13,6 +13,7 @@\n import java.util.*;\n \n import static junit.framework.TestCase.assertEquals;\n+import static junit.framework.TestCase.fail;\n import static org.mockito.Matchers.*;\n import static org.mockito.Mockito.verify;\n import static org.mockito.Mockito.when;\n@@ -22,22 +23,41 @@ public class MoreMatchersTest extends TestBase {\n @Mock private IMethods mock;\n \n @Test\n- public void shouldHelpOutWithUnnecessaryCasting() {\n+ public void should_help_out_with_unnecessary_casting() {\n when(mock.objectArgMethod(any(String.class))).thenReturn(\"string\");\n \n assertEquals(\"string\", mock.objectArgMethod(\"foo\"));\n }\n \n @Test\n- public void shouldAnyBeActualAliasToAnyObject() {\n+ public void any_should_be_actual_alias_to_anyObject() {\n mock.simpleMethod((Object) null);\n \n+ verify(mock).simpleMethod(any());\n verify(mock).simpleMethod(anyObject());\n- verify(mock).simpleMethod(any(Object.class));\n }\n \n @Test\n- public void shouldHelpOutWithUnnecessaryCastingOfLists() {\n+ public void any_class_should_be_actual_alias_to_isA() {\n+ mock.simpleMethod(new ArrayList());\n+\n+ verify(mock).simpleMethod(isA(List.class));\n+ verify(mock).simpleMethod(any(List.class));\n+\n+\n+ mock.simpleMethod((String) null);\n+ try {\n+ verify(mock).simpleMethod(isA(String.class));\n+ fail();\n+ } catch (AssertionError ignored) { }\n+ try {\n+ verify(mock).simpleMethod(any(String.class));\n+ fail();\n+ } catch (AssertionError ignored) { }\n+ }\n+\n+ @Test\n+ public void should_help_out_with_unnecessary_casting_of_lists() {\n //Below yields compiler warning:\n //when(mock.listArgMethod(anyList())).thenReturn(\"list\");\n when(mock.listArgMethod(anyListOf(String.class))).thenReturn(\"list\");\n@@ -47,7 +67,7 @@ public void shouldHelpOutWithUnnecessaryCastingOfLists() {\n }\n \n @Test\n- public void shouldHelpOutWithUnnecessaryCastingOfSets() {\n+ public void should_help_out_with_unnecessary_casting_of_sets() {\n //Below yields compiler warning:\n //when(mock.setArgMethod(anySet())).thenReturn(\"set\");\n when(mock.setArgMethod(anySetOf(String.class))).thenReturn(\"set\");\n@@ -57,7 +77,7 @@ public void shouldHelpOutWithUnnecessaryCastingOfSets() {\n }\n \n @Test\n- public void shouldHelpOutWithUnnecessaryCastingOfMaps() {\n+ public void should_help_out_with_unnecessary_casting_of_maps() {\n //Below yields compiler warning:\n //when(mock.setArgMethod(anySet())).thenReturn(\"set\");\n when(mock.forMap(anyMapOf(String.class, String.class))).thenReturn(\"map\");\n@@ -67,17 +87,27 @@ public void shouldHelpOutWithUnnecessaryCastingOfMaps() {\n }\n \n @Test\n- public void shouldHelpOutWithUnnecessaryCastingOfCollections() {\n+ public void should_help_out_with_unnecessary_casting_of_collections() {\n+ //Below yields compiler warning:\n+ //when(mock.setArgMethod(anySet())).thenReturn(\"set\");\n+ when(mock.collectionArgMethod(anyCollectionOf(String.class))).thenReturn(\"collection\");\n+\n+ assertEquals(\"collection\", mock.collectionArgMethod(new ArrayList()));\n+ assertEquals(\"collection\", mock.collectionArgMethod(Collections.emptyList()));\n+ }\n+\n+ @Test\n+ public void should_help_out_with_unnecessary_casting_of_iterables() {\n //Below yields compiler warning:\n //when(mock.setArgMethod(anySet())).thenReturn(\"set\");\n- when(mock.collectionArgMethod(anyCollectionOf(String.class))).thenReturn(\"col\");\n+ when(mock.iterableArgMethod(anyIterableOf(String.class))).thenReturn(\"iterable\");\n \n- assertEquals(\"col\", mock.collectionArgMethod(new ArrayList()));\n- assertEquals(\"col\", mock.collectionArgMethod(Collections.emptyList()));\n+ assertEquals(\"iterable\", mock.iterableArgMethod(new ArrayList()));\n+ assertEquals(\"iterable\", mock.iterableArgMethod(Collections.emptyList()));\n }\n \n @Test\n- public void shouldHelpOutWithUnnecessaryCastingOfNullityChecks() {\n+ public void should_help_out_with_unnecessary_casting_of_nullity_checks() {\n when(mock.objectArgMethod(isNull(LinkedList.class))).thenReturn(\"string\");\n when(mock.objectArgMethod(notNull(LinkedList.class))).thenReturn(\"string\");\n when(mock.objectArgMethod(isNotNull(LinkedList.class))).thenReturn(\"string\");\ndiff --git a/src/test/java/org/mockitousage/matchers/NewMatchersTest.java b/src/test/java/org/mockitousage/matchers/NewMatchersTest.java\nindex 89b31cf02d..7c1dcffe0b 100644\n--- a/src/test/java/org/mockitousage/matchers/NewMatchersTest.java\n+++ b/src/test/java/org/mockitousage/matchers/NewMatchersTest.java\n@@ -70,4 +70,14 @@ public void shouldAllowAnySet() {\n \n verify(mock, times(1)).forSet(anySet());\n }\n+\n+ @Test\n+ public void shouldAllowAnyIterable() {\n+ when(mock.forIterable(anyIterable())).thenReturn(\"matched\");\n+\n+ assertEquals(\"matched\", mock.forIterable(new HashSet()));\n+ assertEquals(null, mock.forIterable(null));\n+\n+ verify(mock, times(1)).forIterable(anyIterable());\n+ }\n }\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java b/src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java\nindex 89a98fd664..a4c2061058 100644\n--- a/src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java\n+++ b/src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java\n@@ -5,13 +5,14 @@\n \n package org.mockitousage.puzzlers;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Test;\n import org.mockitoutil.TestBase;\n \n import static junit.framework.TestCase.assertEquals;\n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.verify;\n-import static org.mockitoutil.ExtraMatchers.hasBridgeMethod;\n+import static org.mockitoutil.Conditions.bridgeMethod;\n \n /**\n * Bridge method is generated by compiler when erasure in parent class is\n@@ -42,8 +43,8 @@ public void shouldHaveBridgeMethod() throws Exception {\n \n assertEquals(\"Dummy says: Hello\", s.say(\"Hello\"));\n \n- assertThat(Sub.class, hasBridgeMethod(\"say\"));\n- assertThat(s, hasBridgeMethod(\"say\"));\n+ Assertions.assertThat(Sub.class).has(bridgeMethod(\"say\"));\n+ Assertions.assertThat(s).has(bridgeMethod(\"say\"));\n }\n \n @Test\ndiff --git a/src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java b/src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java\nindex a863f3a368..d70dc14cc5 100644\n--- a/src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java\n+++ b/src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java\n@@ -5,14 +5,18 @@\n \n package org.mockitousage.spies;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Before;\n import org.junit.Test;\n-import org.mockitoutil.ExtraMatchers;\n import org.mockitoutil.TestBase;\n \n import static junit.framework.TestCase.assertEquals;\n import static junit.framework.TestCase.fail;\n-import static org.mockito.Mockito.*;\n+import static org.mockito.Mockito.doThrow;\n+import static org.mockito.Mockito.spy;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n+import static org.mockitoutil.Conditions.methodsInStackTrace;\n \n @SuppressWarnings(\"unchecked\")\n public class PartialMockingWithSpiesTest extends TestBase {\n@@ -105,7 +109,7 @@ public void shouldStackTraceGetFilteredOnUserExceptions() {\n fail();\n } catch (Throwable t) {\n // then\n- assertThat(t, ExtraMatchers.hasMethodsInStackTrace(\n+ Assertions.assertThat(t).has(methodsInStackTrace(\n \"throwSomeException\",\n \"getNameButDelegateToMethodThatThrows\",\n \"shouldStackTraceGetFilteredOnUserExceptions\"\ndiff --git a/src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java b/src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java\nindex 056603db94..22d6b26c77 100644\n--- a/src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java\n+++ b/src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java\n@@ -11,6 +11,7 @@\n import net.bytebuddy.description.modifier.Visibility;\n import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;\n import net.bytebuddy.implementation.FixedValue;\n+import org.assertj.core.api.Assertions;\n import org.junit.Test;\n import org.mockito.exceptions.base.MockitoException;\n import org.mockito.invocation.InvocationOnMock;\n@@ -20,9 +21,11 @@\n import java.util.List;\n \n import static junit.framework.TestCase.fail;\n-import static org.hamcrest.core.Is.is;\n import static org.junit.Assume.assumeTrue;\n-import static org.mockito.Mockito.*;\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.spy;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n \n @SuppressWarnings({\"unchecked\"})\n public class SpyingOnInterfacesTest extends TestBase {\n@@ -77,7 +80,7 @@ public void shouldAllowDelegatingToDefaultMethod() throws Exception {\n //when\n when(type.getMethod(\"foo\").invoke(object)).thenCallRealMethod();\n //then\n- assertThat(type.getMethod(\"foo\").invoke(object), is((Object) \"bar\"));\n+ Assertions.assertThat(type.getMethod(\"foo\").invoke(object)).isEqualTo((Object) \"bar\");\n type.getMethod(\"foo\").invoke(verify(object));\n }\n \n@@ -103,7 +106,7 @@ public void shouldAllowSpyingOnDefaultMethod() throws Exception {\n Object object = spy(impl.newInstance());\n \n //when\n- assertThat(impl.getMethod(\"foo\").invoke(object), is((Object) \"bar\"));\n+ Assertions.assertThat(impl.getMethod(\"foo\").invoke(object)).isEqualTo((Object) \"bar\");\n //then\n impl.getMethod(\"foo\").invoke(verify(object));\n }\ndiff --git a/src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java b/src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java\nindex ee2cd2da85..7c925c0073 100644\n--- a/src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java\n+++ b/src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java\n@@ -5,6 +5,7 @@\n \n package org.mockitousage.stacktrace;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.After;\n import org.junit.Before;\n import org.junit.Test;\n@@ -18,8 +19,12 @@\n import org.mockitoutil.TestBase;\n \n import static junit.framework.TestCase.fail;\n-import static org.mockito.Mockito.*;\n-import static org.mockitoutil.ExtraMatchers.hasFirstMethodInStackTrace;\n+import static org.mockito.Mockito.inOrder;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.verifyNoMoreInteractions;\n+import static org.mockito.Mockito.verifyZeroInteractions;\n+import static org.mockito.Mockito.when;\n+import static org.mockitoutil.Conditions.firstMethodInStackTrace;\n \n public class StackTraceFilteringTest extends TestBase {\n \n@@ -41,7 +46,7 @@ public void shouldFilterStackTraceOnVerify() {\n verify(mock).simpleMethod();\n fail();\n } catch (WantedButNotInvoked e) {\n- assertThat(e, hasFirstMethodInStackTrace(\"shouldFilterStackTraceOnVerify\"));\n+ Assertions.assertThat(e).has(firstMethodInStackTrace(\"shouldFilterStackTraceOnVerify\"));\n }\n }\n \n@@ -52,7 +57,7 @@ public void shouldFilterStackTraceOnVerifyNoMoreInteractions() {\n verifyNoMoreInteractions(mock);\n fail();\n } catch (NoInteractionsWanted e) {\n- assertThat(e, hasFirstMethodInStackTrace(\"shouldFilterStackTraceOnVerifyNoMoreInteractions\"));\n+ Assertions.assertThat(e).has(firstMethodInStackTrace(\"shouldFilterStackTraceOnVerifyNoMoreInteractions\"));\n }\n }\n \n@@ -63,7 +68,7 @@ public void shouldFilterStackTraceOnVerifyZeroInteractions() {\n verifyZeroInteractions(mock);\n fail();\n } catch (NoInteractionsWanted e) {\n- assertThat(e, hasFirstMethodInStackTrace(\"shouldFilterStackTraceOnVerifyZeroInteractions\"));\n+ Assertions.assertThat(e).has(firstMethodInStackTrace(\"shouldFilterStackTraceOnVerifyZeroInteractions\"));\n }\n }\n \n@@ -74,7 +79,7 @@ public void shouldFilterStacktraceOnMockitoException() {\n verify(mock).oneArg(true); \n fail();\n } catch (MockitoException expected) {\n- assertThat(expected, hasFirstMethodInStackTrace(\"shouldFilterStacktraceOnMockitoException\"));\n+ Assertions.assertThat(expected).has(firstMethodInStackTrace(\"shouldFilterStacktraceOnMockitoException\"));\n }\n }\n \n@@ -89,7 +94,7 @@ public void shouldFilterStacktraceWhenVerifyingInOrder() {\n inOrder.verify(mock).oneArg(true);\n fail();\n } catch (VerificationInOrderFailure e) {\n- assertThat(e, hasFirstMethodInStackTrace(\"shouldFilterStacktraceWhenVerifyingInOrder\"));\n+ Assertions.assertThat(e).has(firstMethodInStackTrace(\"shouldFilterStacktraceWhenVerifyingInOrder\"));\n }\n }\n \n@@ -99,7 +104,7 @@ public void shouldFilterStacktraceWhenInOrderThrowsMockitoException() {\n inOrder();\n fail();\n } catch (MockitoException expected) {\n- assertThat(expected, hasFirstMethodInStackTrace(\"shouldFilterStacktraceWhenInOrderThrowsMockitoException\"));\n+ Assertions.assertThat(expected).has(firstMethodInStackTrace(\"shouldFilterStacktraceWhenInOrderThrowsMockitoException\"));\n }\n }\n \n@@ -110,7 +115,7 @@ public void shouldFilterStacktraceWhenInOrderVerifies() {\n inOrder.verify(null);\n fail();\n } catch (MockitoException expected) {\n- assertThat(expected, hasFirstMethodInStackTrace(\"shouldFilterStacktraceWhenInOrderVerifies\"));\n+ Assertions.assertThat(expected).has(firstMethodInStackTrace(\"shouldFilterStacktraceWhenInOrderVerifies\"));\n }\n }\n \n@@ -120,7 +125,7 @@ public void shouldFilterStackTraceWhenThrowingExceptionFromMockHandler() {\n when(mock.oneArg(true)).thenThrow(new Exception());\n fail();\n } catch (MockitoException expected) {\n- assertThat(expected, hasFirstMethodInStackTrace(\"shouldFilterStackTraceWhenThrowingExceptionFromMockHandler\"));\n+ Assertions.assertThat(expected).has(firstMethodInStackTrace(\"shouldFilterStackTraceWhenThrowingExceptionFromMockHandler\"));\n }\n }\n \n@@ -132,7 +137,7 @@ public void shouldShowProperExceptionStackTrace() throws Exception {\n mock.simpleMethod();\n fail();\n } catch (RuntimeException e) {\n- assertThat(e, hasFirstMethodInStackTrace(\"shouldShowProperExceptionStackTrace\"));\n+ Assertions.assertThat(e).has(firstMethodInStackTrace(\"shouldShowProperExceptionStackTrace\"));\n }\n }\n }\ndiff --git a/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java b/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java\nindex 4a3a7ba7a2..d8e5bd157b 100644\n--- a/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java\n+++ b/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java\n@@ -237,7 +237,7 @@ public void should_print_method_when_matcher_used() throws Exception {\n \"Wanted but not invoked:\" +\n \"\\n\" +\n \"iMethods.twoArgumentMethod(\\n\" +\n- \" isA(java.lang.Integer),\\n\" +\n+ \" ,\\n\" +\n \" 100\\n\" +\n \");\";\n assertContains(expectedMessage, actualMessage);\ndiff --git a/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java b/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java\nindex 5e6c8624f5..4149e8b5bc 100644\n--- a/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java\n+++ b/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java\n@@ -5,13 +5,14 @@\n \n package org.mockitousage.verification;\n \n+import org.assertj.core.api.Assertions;\n import org.junit.Test;\n import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent;\n import org.mockitousage.IMethods;\n import org.mockitoutil.TestBase;\n \n import static junit.framework.TestCase.fail;\n-import static org.mockito.Matchers.any;\n+import static org.mockito.ArgumentMatchers.any;\n import static org.mockito.Matchers.eq;\n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.verify;\n@@ -21,17 +22,17 @@ public class PrintingVerboseTypesWithArgumentsTest extends TestBase {\n class Boo {\n public void withLong(long x) {\n }\n- \n+\n public void withLongAndInt(long x, int y) {\n }\n }\n- \n+\n @Test\n- public void shouldNotReportArgumentTypesWhenToStringIsTheSame() throws Exception {\n+ public void should_not_report_argument_types_when_to_string_is_the_same() {\n //given\n Boo boo = mock(Boo.class);\n boo.withLong(100);\n- \n+\n try {\n //when\n verify(boo).withLong(eq(100));\n@@ -42,13 +43,13 @@ public void shouldNotReportArgumentTypesWhenToStringIsTheSame() throws Exception\n assertContains(\"withLong((Long) 100);\", e.getMessage());\n }\n }\n- \n+\n @Test\n- public void shouldShowTheTypeOfOnlyTheArgumentThatDoesntMatch() throws Exception {\n+ public void should_show_the_type_of_only_the_argument_that_doesnt_match() {\n //given\n Boo boo = mock(Boo.class);\n boo.withLongAndInt(100, 200);\n- \n+\n try {\n //when\n verify(boo).withLongAndInt(eq(100), eq(200));\n@@ -59,30 +60,37 @@ public void shouldShowTheTypeOfOnlyTheArgumentThatDoesntMatch() throws Exception\n assertContains(\"withLongAndInt((Long) 100, 200)\", e.getMessage());\n }\n }\n- \n+\n @Test\n- public void shouldShowTheTypeOfTheMismatchingArgumentWhenOutputDescriptionsForInvocationsAreDifferent() throws Exception {\n+ public void should_show_the_type_of_the_mismatching_argument_when_output_descriptions_for_invocations_are_different() {\n //given\n Boo boo = mock(Boo.class);\n boo.withLongAndInt(100, 200);\n- \n+\n try {\n //when\n verify(boo).withLongAndInt(eq(100), any(Integer.class));\n fail();\n } catch (ArgumentsAreDifferent e) {\n //then\n- assertContains(\"withLongAndInt((Long) 100, 200)\", e.getMessage());\n- assertContains(\"withLongAndInt((Integer) 100, \", e.getMessage());\n+ Assertions.assertThat(e.getMessage())\n+ .contains(\"withLongAndInt(\\n\" +\n+ \" (Long) 100,\\n\" +\n+ \" 200\\n\" +\n+ \")\")\n+ .contains(\"withLongAndInt(\\n\" +\n+ \" (Integer) 100,\\n\" +\n+ \" \\n\" +\n+ \")\");\n }\n }\n- \n+\n @Test\n- public void shouldNotShowTypesWhenArgumentValueIsDifferent() throws Exception {\n+ public void should_not_show_types_when_argument_value_is_different() {\n //given\n Boo boo = mock(Boo.class);\n boo.withLongAndInt(100, 200);\n- \n+\n try {\n //when\n verify(boo).withLongAndInt(eq(100L), eq(230));\n@@ -93,34 +101,34 @@ public void shouldNotShowTypesWhenArgumentValueIsDifferent() throws Exception {\n assertContains(\"withLongAndInt(100, 230)\", e.getMessage());\n }\n }\n- \n+\n class Foo {\n- \n+\n private final int x;\n \n public Foo(int x) {\n this.x = x;\n }\n- \n+\n public boolean equals(Object obj) {\n return x == ((Foo) obj).x;\n }\n- \n+\n public int hashCode() {\n return 1;\n }\n- \n+\n public String toString() {\n return \"foo\";\n }\n }\n- \n+\n @Test\n- public void shouldNotShowTypesWhenTypesAreTheSameEvenIfToStringGivesTheSameResult() throws Exception {\n+ public void should_not_show_types_when_types_are_the_same_even_if_to_string_gives_the_same_result() {\n //given\n IMethods mock = mock(IMethods.class);\n mock.simpleMethod(new Foo(10));\n- \n+\n try {\n //when\n verify(mock).simpleMethod(new Foo(20));\ndiff --git a/src/test/java/org/mockitoutil/Conditions.java b/src/test/java/org/mockitoutil/Conditions.java\nnew file mode 100644\nindex 0000000000..39061cd080\n--- /dev/null\n+++ b/src/test/java/org/mockitoutil/Conditions.java\n@@ -0,0 +1,123 @@\n+/*\n+ * Copyright (c) 2007 Mockito contributors\n+ * This program is made available under the terms of the MIT License.\n+ */\n+\n+package org.mockitoutil;\n+\n+import org.assertj.core.api.Assertions;\n+import org.assertj.core.api.Condition;\n+import org.assertj.core.description.Description;\n+import org.assertj.core.description.TextDescription;\n+import org.hamcrest.CoreMatchers;\n+\n+import java.lang.reflect.Method;\n+import java.util.Arrays;\n+\n+@SuppressWarnings(\"unchecked\")\n+public class Conditions {\n+\n+ public static Condition onlyThoseClassesInStackTrace(final String... classes) {\n+ return new Condition() {\n+ @Override\n+ public boolean matches(Throwable traceElements) {\n+ StackTraceElement[] trace = traceElements.getStackTrace();\n+\n+ Assertions.assertThat(trace.length)\n+ .describedAs(\"Number of classes does not match.\\nExpected: %s\\nGot: %s\",\n+ Arrays.toString(classes),\n+ Arrays.toString(traceElements.getStackTrace()))\n+ .isEqualTo(classes.length);\n+\n+ for (int i = 0; i < trace.length; i++) {\n+ Assertions.assertThat(trace[i].getClassName()).isEqualTo(classes[i]);\n+ }\n+\n+ return true;\n+ }\n+ };\n+ }\n+\n+ public static Condition onlyThoseClasses(final String... classes) {\n+ return new Condition() {\n+\n+ @Override\n+ public boolean matches(StackTraceElement[] traceElements) {\n+ Assertions.assertThat(traceElements.length)\n+ .describedAs(\"Number of classes does not match.\\nExpected: %s\\nGot: %s\",\n+ Arrays.toString(classes),\n+ Arrays.toString(traceElements))\n+ .isEqualTo(classes.length);\n+\n+ for (int i = 0; i < traceElements.length; i++) {\n+ Assertions.assertThat(traceElements[i].getClassName()).isEqualTo(classes[i]);\n+ }\n+\n+ return true;\n+ }\n+ };\n+ }\n+\n+ public static Condition firstMethodInStackTrace(final String method) {\n+ return methodInStackTraceAt(0, method);\n+ }\n+\n+ public static Condition methodInStackTraceAt(final int stackTraceIndex, final String method) {\n+ return new Condition() {\n+ private String actualMethodAtIndex;\n+\n+ @Override\n+ public boolean matches(Throwable throwable) {\n+ actualMethodAtIndex = throwable.getStackTrace()[stackTraceIndex].getMethodName();\n+\n+ return actualMethodAtIndex.equals(method);\n+ }\n+\n+ @Override\n+ public Description description() {\n+ return new TextDescription(\"Method at index: %d\\nexpected to be: %s\\nbut is: %s\", stackTraceIndex, method, actualMethodAtIndex);\n+ }\n+ };\n+ }\n+\n+ public static Condition bridgeMethod(final String methodName) {\n+ return new Condition() {\n+\n+ public boolean matches(Object o) {\n+ Class clazz = null;\n+ if (o instanceof Class) {\n+ clazz = (Class) o;\n+ } else {\n+ clazz = o.getClass();\n+ }\n+\n+ for (Method m : clazz.getMethods()) {\n+ if (m.isBridge() && m.getName().equals(methodName)) {\n+ return true;\n+ }\n+ }\n+\n+ Assertions.fail(\"Bridge method [\" + methodName + \"]\\nnot found in:\\n\" + o);\n+ return false;\n+ }\n+ };\n+ }\n+\n+ public static org.hamcrest.Matcher clazz(Class type) {\n+ return CoreMatchers.instanceOf(type);\n+ }\n+\n+ public static Condition methodsInStackTrace(final String... methods) {\n+ return new Condition() {\n+ public boolean matches(Throwable value) {\n+ StackTraceElement[] trace = value.getStackTrace();\n+ for (int i = 0; i < methods.length; i++) {\n+ Assertions.assertThat(trace[i].getMethodName()).describedAs(\"Expected methods[%d] to be in the stack trace.\", i).isEqualTo(methods[i]);\n+ }\n+ return true;\n+ }\n+ };\n+ }\n+\n+\n+}\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockitoutil/ExtraMatchers.java b/src/test/java/org/mockitoutil/ExtraMatchers.java\ndeleted file mode 100644\nindex c3f80f34c6..0000000000\n--- a/src/test/java/org/mockitoutil/ExtraMatchers.java\n+++ /dev/null\n@@ -1,150 +0,0 @@\n-/*\n- * Copyright (c) 2007 Mockito contributors\n- * This program is made available under the terms of the MIT License.\n- */\n-\n-package org.mockitoutil;\n-\n-import org.hamcrest.CoreMatchers;\n-import org.hamcrest.Matcher;\n-\n-import java.lang.reflect.Method;\n-import java.util.Arrays;\n-import java.util.Collection;\n-import java.util.Collections;\n-import java.util.List;\n-\n-import static org.junit.Assert.*;\n-\n-@SuppressWarnings(\"unchecked\")\n-public class ExtraMatchers {\n-\n- public static Assertor hasFirstMethodInStackTrace(final String method) {\n- return hasMethodInStackTraceAt(0, method);\n- }\n- \n- public static Assertor hasOnlyThoseClassesInStackTrace(final String ... classes) {\n- return new Assertor() {\n- public void assertValue(Throwable traceElements) {\n- StackTraceElement[] trace = traceElements.getStackTrace();\n- \n- assertEquals(\"Number of classes does not match.\" +\n- \"\\nExpected: \" + Arrays.toString(classes) + \n- \"\\nGot: \" + Arrays.toString(traceElements.getStackTrace()),\n- classes.length, trace.length);\n- \n- for (int i = 0; i < trace.length; i++) {\n- assertEquals(classes[i], trace[i].getClassName());\n- }\n- }\n- };\n- }\n- \n- public static Assertor hasOnlyThoseClasses(final String ... classes) {\n- return new Assertor() {\n- public void assertValue(StackTraceElement[] traceElements) {\n- assertEquals(\"Number of classes does not match.\" +\n- \"\\nExpected: \" + Arrays.toString(classes) + \n- \"\\nGot: \" + Arrays.toString(traceElements),\n- classes.length, traceElements.length);\n- \n- for (int i = 0; i < traceElements.length; i++) {\n- assertEquals(classes[i], traceElements[i].getClassName());\n- }\n- }\n- };\n- }\n- \n- public static Assertor hasMethodInStackTraceAt(final int stackTraceIndex, final String method) {\n- return new Assertor() {\n-\n- private String actualMethodAtIndex;\n-\n- public void assertValue(Throwable throwable) {\n- actualMethodAtIndex = throwable.getStackTrace()[stackTraceIndex].getMethodName();\n- assertTrue(\n- \"Method at index: \" + stackTraceIndex + \n- \"\\n\" +\n- \"expected to be: \" + method + \n- \"\\n\" +\n- \"but is: \" + actualMethodAtIndex,\n- actualMethodAtIndex.equals(method));\n- }\n- };\n- }\n- \n- public static Assertor hasBridgeMethod(final String methodName) {\n- return new Assertor() {\n-\n- public void assertValue(Object o) {\n- Class clazz = null;\n- if (o instanceof Class) {\n- clazz = (Class) o;\n- } else {\n- clazz = o.getClass();\n- }\n- \n- for (Method m : clazz.getMethods()) {\n- if (m.isBridge() && m.getName().equals(methodName)) {\n- return;\n- }\n- }\n- \n- fail(\"Bridge method [\" + methodName + \"]\\nnot found in:\\n\" + o);\n- }\n- };\n- }\n- \n- public static Assertor hasExactlyInOrder(final T ... elements) {\n- return new Assertor() {\n-\n- public void assertValue(Collection value) {\n- assertEquals(elements.length, value.size());\n- \n- boolean containsSublist = Collections.indexOfSubList((List) value, Arrays.asList(elements)) != -1;\n- assertTrue(\n- \"Elements:\" +\n- \"\\n\" + \n- Arrays.toString(elements) + \n- \"\\n\" +\n- \"were not found in collection:\" +\n- \"\\n\" +\n- value, containsSublist);\n- }\n- };\n- }\n- \n- public static Assertor contains(final Matcher ... elements) {\n- return new Assertor() {\n- \n- public void assertValue(Collection value) {\n- int matched = 0;\n- for (Matcher m : elements) {\n- for (Object el : value) {\n- if (m.matches(el)) {\n- matched++;\n- continue;\n- }\n- }\n- }\n- \n- assertEquals(\"At least one of the matchers failed to match any of the elements\", elements.length, matched);\n- }\n- };\n- }\n- \n- public static org.hamcrest.Matcher clazz(Class type) {\n- return CoreMatchers.instanceOf(type);\n- }\n-\n- public static Assertor hasMethodsInStackTrace(final String ... methods) {\n- return new Assertor() {\n- public void assertValue(Throwable value) {\n- StackTraceElement[] trace = value.getStackTrace();\n- for (int i = 0; i < methods.length; i++) {\n- assertEquals(\"Expected methods[\" + i + \"] to be in the stack trace.\", methods[i], trace[i].getMethodName());\n- }\n- }\n- };\n- }\n-}\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockitoutil/JUnitResultAssert.java b/src/test/java/org/mockitoutil/JUnitResultAssert.java\nindex f4fd9f9769..8a425a91c6 100644\n--- a/src/test/java/org/mockitoutil/JUnitResultAssert.java\n+++ b/src/test/java/org/mockitoutil/JUnitResultAssert.java\n@@ -2,7 +2,6 @@\n \n import org.junit.runner.Result;\n import org.junit.runner.notification.Failure;\n-import org.mockito.exceptions.misusing.UnnecessaryStubbingException;\n \n import java.util.List;\n \n@@ -57,4 +56,11 @@ private static String formatFailures(List failures) {\n }\n return out.toString();\n }\n+\n+ /**\n+ * Clean assertions for JUnit's result object\n+ */\n+ public static JUnitResultAssert assertThat(Result result) {\n+ return new JUnitResultAssert(result);\n+ }\n }\ndiff --git a/src/test/java/org/mockitoutil/TestBase.java b/src/test/java/org/mockitoutil/TestBase.java\nindex 9ad32341bd..348e12f060 100644\n--- a/src/test/java/org/mockitoutil/TestBase.java\n+++ b/src/test/java/org/mockitoutil/TestBase.java\n@@ -5,10 +5,8 @@\n \n package org.mockitoutil;\n \n-import org.hamcrest.Matcher;\n import org.junit.After;\n import org.junit.Before;\n-import org.junit.runner.Result;\n import org.mockito.MockitoAnnotations;\n import org.mockito.StateMaster;\n import org.mockito.internal.MockitoCore;\n@@ -26,7 +24,6 @@\n import java.io.IOException;\n import java.io.PrintStream;\n import java.util.Collection;\n-import java.util.regex.Pattern;\n \n import static junit.framework.TestCase.assertFalse;\n import static junit.framework.TestCase.assertTrue;\n@@ -68,29 +65,6 @@ protected Invocation getLastInvocation() {\n return new MockitoCore().getLastInvocation();\n }\n \n- //I'm really tired of matchers, enter the assertor!\n- protected static void assertThat(T o, Assertor a) {\n- a.assertValue(o);\n- }\n-\n- protected static void assertThat(T actual, Matcher matcher) {\n- org.junit.Assert.assertThat(actual, matcher);\n- }\n- \n- protected static void assertThat(String message, T actual, Matcher m) {\n- org.junit.Assert.assertThat(message, actual, m);\n- }\n- \n- public static Assertor endsWith(final String substring) {\n- return new Assertor() {\n- public void assertValue(String value) {\n- assertTrue(\"This substring: \\n\" + substring + \n- \"\\nshould be at the end of:\\n\" + value\n- , value.endsWith(substring));\n- }\n- };\n- }\n- \n public static void assertNotEquals(Object expected, Object got) {\n assertFalse(expected.equals(got));\n }\n@@ -201,11 +175,4 @@ protected String getStackTrace(Throwable e) {\n protected String filterLineNo(String stackTrace) {\n return stackTrace.replaceAll(\"(\\\\((\\\\w+\\\\.java):(\\\\d)+\\\\))\", \"($2:0)\");\n }\n-\n- /**\n- * Clean assertions for JUnit's result object\n- */\n- protected JUnitResultAssert assertThat(Result result) {\n- return new JUnitResultAssert(result);\n- }\n }\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-07-28T03:59:24","string":"2016-07-28T03:59:24"},"issue_created_at":{"kind":"timestamp","value":"2015-04-05T10:23:55Z","string":"2015-04-05T10:23:55Z"},"issue_by_user":{"kind":"string","value":"bric3"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":478,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/497_549"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/497"},"pr_id":{"kind":"string","value":"mockito/mockito/549"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"4ce9ac2ea38153f4f0c7e272d52fdf9a494ccb14"},"merge_commit":{"kind":"string","value":"27bcbbb03709b23d0efaa300dab6cd5b9d345a83"},"hints_text":{"kind":"list like","value":["I have a hacky workaround using Guava's `TypeToken`:\n\n```\n private static final MockUtil mockUtil = new MockUtil();\n\n @SuppressWarnings(\"unchecked\")\n private static T createSmartDeepMock(TypeToken mockType) {\n return (T) mock(mockType.getRawType(), createSmartDeepMockAnswer(mockType));\n }\n\n private static Answer createSmartDeepMockAnswer(TypeToken mockType) {\n Map mocks = new LinkedHashMap<>();\n\n return invocation -> {\n Method method = invocation.getMethod();\n if (mocks.containsKey(method)) {\n return mocks.get(method);\n }\n\n Type returnType = method.getGenericReturnType();\n TypeToken resolvedReturnType = mockType.resolveType(returnType);\n Class returnClass = resolvedReturnType.getRawType();\n\n if (!mockUtil.isTypeMockable(returnClass)) {\n return Mockito.RETURNS_DEFAULTS.answer(invocation);\n } else {\n Object mock = createSmartDeepMock(resolvedReturnType);\n mocks.put(method, mock);\n return mock;\n }\n };\n }\n```\n"],"string":"[\n \"I have a hacky workaround using Guava's `TypeToken`:\\n\\n```\\n private static final MockUtil mockUtil = new MockUtil();\\n\\n @SuppressWarnings(\\\"unchecked\\\")\\n private static T createSmartDeepMock(TypeToken mockType) {\\n return (T) mock(mockType.getRawType(), createSmartDeepMockAnswer(mockType));\\n }\\n\\n private static Answer createSmartDeepMockAnswer(TypeToken mockType) {\\n Map mocks = new LinkedHashMap<>();\\n\\n return invocation -> {\\n Method method = invocation.getMethod();\\n if (mocks.containsKey(method)) {\\n return mocks.get(method);\\n }\\n\\n Type returnType = method.getGenericReturnType();\\n TypeToken resolvedReturnType = mockType.resolveType(returnType);\\n Class returnClass = resolvedReturnType.getRawType();\\n\\n if (!mockUtil.isTypeMockable(returnClass)) {\\n return Mockito.RETURNS_DEFAULTS.answer(invocation);\\n } else {\\n Object mock = createSmartDeepMock(resolvedReturnType);\\n mocks.put(method, mock);\\n return mock;\\n }\\n };\\n }\\n```\\n\"\n]"},"resolved_comments":{"kind":"list like","value":["Codecov complains about not testing this path. I don't think this line is required per https://github.com/JeffreyFalgout/mockito/blob/b4b5b0be26aaf6218cd5b8253faf03e2d116bdb8/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java#L272-L273 which handles the `instanceof` checks in `inferFrom` which is the only method that uses the `FromParameterizedTypeGenericMetadataSupport`.\n","This else clause is always when `clazz instanceof Class` so this Exception is not required. See above comment.\n","@JeffreyFalgout \n- Can this really happen? If yes more error infos would be usefule? E.g. \"Unable to determine the raw type of \"+type.\n- just a matter of style the `else` keywords can be removed\n","@TimvdLippe Haha i commented about the same in just the same minute!\n","Done.\n"],"string":"[\n \"Codecov complains about not testing this path. I don't think this line is required per https://github.com/JeffreyFalgout/mockito/blob/b4b5b0be26aaf6218cd5b8253faf03e2d116bdb8/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java#L272-L273 which handles the `instanceof` checks in `inferFrom` which is the only method that uses the `FromParameterizedTypeGenericMetadataSupport`.\\n\",\n \"This else clause is always when `clazz instanceof Class` so this Exception is not required. See above comment.\\n\",\n \"@JeffreyFalgout \\n- Can this really happen? If yes more error infos would be usefule? E.g. \\\"Unable to determine the raw type of \\\"+type.\\n- just a matter of style the `else` keywords can be removed\\n\",\n \"@TimvdLippe Haha i commented about the same in just the same minute!\\n\",\n \"Done.\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-08-12T03:36:03Z","string":"2016-08-12T03:36:03Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"DEEP_STUBS tries to mock final class"},"problem_statement":{"kind":"string","value":"```\n \n org.mockito \n mockito-core \n 1.10.19 \n test \n \n```\n\n```\n$ java -version\njava version \"1.8.0_91\"\nJava(TM) SE Runtime Environment (build 1.8.0_91-b14)\nJava HotSpot(TM) 64-Bit Server VM (build 25.91-b14, mixed mode)\n```\n\n```\nimport static org.junit.Assert.assertNull;\nimport static org.mockito.Mockito.RETURNS_DEEP_STUBS;\nimport static org.mockito.Mockito.mock;\n\nimport org.junit.Test;\n\npublic class MockitoBug {\n public interface Supplier {\n public T get();\n }\n\n public interface StringSupplier extends Supplier {}\n\n public interface InheritedSupplier extends StringSupplier {}\n\n @Test\n public void deepStubs() {\n StringSupplier mock = mock(StringSupplier.class, RETURNS_DEEP_STUBS);\n String s = mock.get();\n assertNull(s);\n }\n\n @Test\n public void inheritedDeepStubs() {\n InheritedSupplier mock = mock(InheritedSupplier.class, RETURNS_DEEP_STUBS);\n String s = mock.get(); // ClassCastException\n assertNull(s);\n }\n}\n```\n\n```\njava.lang.ClassCastException: org.mockito.internal.creation.cglib.ClassImposterizer$ClassWithSuperclassToWorkAroundCglibBug$$EnhancerByMockitoWithCGLIB$$322ebf6e cannot be cast to java.lang.String\n at MockitoBug.inheritedDeepStubs(MockitoBug.java:26)\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n at java.lang.reflect.Method.invoke(Method.java:498)\n at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)\n at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\n at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)\n at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\n at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)\n at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)\n at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)\n at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)\n at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)\n at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)\n at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)\n at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)\n at org.junit.runners.ParentRunner.run(ParentRunner.java:363)\n at org.eclipse.jdt.internal.junit4.runner.JUnit4TestReference.run(JUnit4TestReference.java:86)\n at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:38)\n at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:459)\n at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:678)\n at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:382)\n at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:192)\n```\n\nI expect the behavior for `StringSupplier` and `InheritedSupplier` to be the same: return `null` for `get`. However, `InheritedSupplier` tries to return a mock `Object` for `get`.\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java"],"string":"[\n \"src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java"],"string":"[\n \"src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java","src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java\",\n \"src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java b/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java\nindex 50baa3c2f6..8d150ff787 100644\n--- a/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java\n+++ b/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java\n@@ -62,6 +62,48 @@ public abstract class GenericMetadataSupport {\n */\n protected Map contextualActualTypeParameters = new HashMap();\n \n+ /**\n+ * Registers the type variables for the given type and all of its superclasses and superinterfaces.\n+ */\n+ protected void registerAllTypeVariables(Type classType) {\n+ Queue typesToRegister = new LinkedList();\n+ Set registeredTypes = new HashSet();\n+ typesToRegister.add(classType);\n+\n+ while (!typesToRegister.isEmpty()) {\n+ Type typeToRegister = typesToRegister.poll();\n+ if (typeToRegister == null || registeredTypes.contains(typeToRegister)) {\n+ continue;\n+ }\n+\n+ registerTypeVariablesOn(typeToRegister);\n+ registeredTypes.add(typeToRegister);\n+\n+ Class rawType = extractRawTypeOf(typeToRegister);\n+ typesToRegister.add(rawType.getGenericSuperclass());\n+ typesToRegister.addAll(Arrays.asList(rawType.getGenericInterfaces()));\n+ }\n+ }\n+\n+ protected Class extractRawTypeOf(Type type) {\n+ if (type instanceof Class) {\n+ return (Class) type;\n+ }\n+ if (type instanceof ParameterizedType) {\n+ return (Class) ((ParameterizedType) type).getRawType();\n+ }\n+ if (type instanceof BoundedType) {\n+ return extractRawTypeOf(((BoundedType) type).firstBound());\n+ }\n+ if (type instanceof TypeVariable) {\n+ /*\n+ * If type is a TypeVariable, then it is needed to gather data elsewhere. Usually TypeVariables are declared\n+ * on the class definition, such as such as List.\n+ */\n+ return extractRawTypeOf(contextualActualTypeParameters.get(type));\n+ }\n+ throw new MockitoException(\"Raw extraction not supported for : '\" + type + \"'\");\n+ }\n \n protected void registerTypeVariablesOn(Type classType) {\n if (!(classType instanceof ParameterizedType)) {\n@@ -270,28 +312,8 @@ private static class FromClassGenericMetadataSupport extends GenericMetadataSupp\n public FromClassGenericMetadataSupport(Class clazz) {\n this.clazz = clazz;\n \n- for (Class currentExploredClass = clazz;\n- currentExploredClass != null && currentExploredClass != Object.class;\n- currentExploredClass = superClassOf(currentExploredClass)) {\n- readActualTypeParametersOnDeclaringClass(currentExploredClass);\n- }\n- }\n-\n- private Class superClassOf(Class currentExploredClass) {\n- Type genericSuperclass = currentExploredClass.getGenericSuperclass();\n- if (genericSuperclass instanceof ParameterizedType) {\n- Type rawType = ((ParameterizedType) genericSuperclass).getRawType();\n- return (Class) rawType;\n- }\n- return (Class) genericSuperclass;\n- }\n-\n- private void readActualTypeParametersOnDeclaringClass(Class clazz) {\n registerTypeParametersOn(clazz.getTypeParameters());\n- registerTypeVariablesOn(clazz.getGenericSuperclass());\n- for (Type genericInterface : clazz.getGenericInterfaces()) {\n- registerTypeVariablesOn(genericInterface);\n- }\n+ registerAllTypeVariables(clazz);\n }\n \n @Override\n@@ -321,8 +343,7 @@ public FromParameterizedTypeGenericMetadataSupport(ParameterizedType parameteriz\n }\n \n private void readActualTypeParameters() {\n- registerTypeVariablesOn(parameterizedType.getRawType());\n- registerTypeVariablesOn(parameterizedType);\n+ registerAllTypeVariables(parameterizedType);\n }\n \n @Override\n@@ -403,26 +424,6 @@ public Class rawType() {\n return rawType;\n }\n \n- private Class extractRawTypeOf(Type type) {\n- if (type instanceof Class) {\n- return (Class) type;\n- }\n- if (type instanceof ParameterizedType) {\n- return (Class) ((ParameterizedType) type).getRawType();\n- }\n- if (type instanceof BoundedType) {\n- return extractRawTypeOf(((BoundedType) type).firstBound());\n- }\n- if (type instanceof TypeVariable) {\n- /*\n- * If type is a TypeVariable, then it is needed to gather data elsewhere. Usually TypeVariables are declared\n- * on the class definition, such as such as List.\n- */\n- return extractRawTypeOf(contextualActualTypeParameters.get(type));\n- }\n- throw new MockitoException(\"Raw extraction not supported for : '\" + type + \"'\");\n- }\n-\n @Override\n public List extraInterfaces() {\n Type type = extractActualBoundedTypeOf(typeVariable);\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java b/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java\nindex 44066b8ced..f580b359a3 100644\n--- a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java\n+++ b/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java\n@@ -19,6 +19,8 @@\n public class ReturnsGenericDeepStubsTest {\n interface ListOfInteger extends List {}\n \n+ interface AnotherListOfInteger extends ListOfInteger {}\n+\n interface GenericsNest & Cloneable> extends Map> {\n Set remove(Object key); // override with fixed ParameterizedType\n List returningWildcard();\n@@ -93,9 +95,11 @@ public void can_still_work_with_raw_type_in_the_return_type() throws Exception {\n public void will_return_default_value_on_non_mockable_nested_generic() throws Exception {\n GenericsNest genericsNest = mock(GenericsNest.class, RETURNS_DEEP_STUBS);\n ListOfInteger listOfInteger = mock(ListOfInteger.class, RETURNS_DEEP_STUBS);\n+ AnotherListOfInteger anotherListOfInteger = mock(AnotherListOfInteger.class, RETURNS_DEEP_STUBS);\n \n assertThat(genericsNest.returningNonMockableNestedGeneric().keySet().iterator().next()).isNull();\n assertThat(listOfInteger.get(25)).isEqualTo(0);\n+ assertThat(anotherListOfInteger.get(25)).isEqualTo(0);\n }\n \n @Test(expected = ClassCastException.class)\ndiff --git a/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java b/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java\nindex d068e043d5..dff0d7f3ea 100644\n--- a/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java\n+++ b/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java\n@@ -28,6 +28,11 @@ interface UpperBoundedTypeWithInterfaces & Cloneable> {\n E get();\n }\n interface ListOfNumbers extends List {}\n+ interface AnotherListOfNumbers extends ListOfNumbers {}\n+\n+ abstract class ListOfNumbersImpl implements ListOfNumbers {}\n+ abstract class AnotherListOfNumbersImpl extends ListOfNumbersImpl {}\n+\n interface ListOfAnyNumbers extends List {}\n \n interface GenericsNest & Cloneable> extends Map> {\n@@ -76,6 +81,13 @@ public void can_get_type_variables_from_Class() throws Exception {\n assertThat(inferFrom(StringList.class).actualTypeArguments().keySet()).isEmpty();\n }\n \n+ @Test\n+ public void can_resolve_type_variables_from_ancestors() throws Exception {\n+ Method listGet = List.class.getMethod(\"get\", int.class);\n+ assertThat(inferFrom(AnotherListOfNumbers.class).resolveGenericReturnType(listGet).rawType()).isEqualTo(Number.class);\n+ assertThat(inferFrom(AnotherListOfNumbersImpl.class).resolveGenericReturnType(listGet).rawType()).isEqualTo(Number.class);\n+ }\n+\n @Test\n public void can_get_type_variables_from_ParameterizedType() throws Exception {\n assertThat(inferFrom(GenericsNest.class.getGenericInterfaces()[0]).actualTypeArguments().keySet()).hasSize(2).extracting(\"name\").contains(\"K\", \"V\");\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-15T15:27:39","string":"2016-08-15T15:27:39"},"issue_created_at":{"kind":"timestamp","value":"2016-07-16T17:59:01Z","string":"2016-07-16T17:59:01Z"},"issue_by_user":{"kind":"string","value":"JeffFaer"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":479,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/538_550"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/538"},"pr_id":{"kind":"string","value":"mockito/mockito/550"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"f80dd4a95d78d15dfea814877d143e8e31cfd880"},"merge_commit":{"kind":"string","value":"fea4074f8d4a7b1f7b8e89d4819bef25b1b6228f"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":["Please don't remove these indication, lot of people would like to see this.\n"],"string":"[\n \"Please don't remove these indication, lot of people would like to see this.\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-08-12T20:46:56Z","string":"2016-08-12T20:46:56Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"Improve error message when @InjectMocks is uses on an interface or enum field"},"problem_statement":{"kind":"string","value":"By accident a tests delares a field of an interface type instead of the implementing class. \n\n```\n@InjectMocks\npublic InterfaceType unitUnderTest;\n```\n\nInjection is not possible on interfaces or enums. The error message should make this clear, the currenta message that doesn't help much:\n\n```\norg.mockito.exceptions.base.MockitoException: \nCannot instantiate @InjectMocks field named 'configurationManager'.\nYou haven't provided the instance at field declaration so I tried to construct the instance.\nHowever, I failed because: the type 'ConfigurationManager' is an interface.\nExamples of correct usage of @InjectMocks:\n @InjectMocks Service service = new Service();\n @InjectMocks Service service;\n //also, don't forget about MockitoAnnotations.initMocks();\n //and... don't forget about some @Mocks for injection :)\n```\n\nThe error message should be someting like:\n`The field 'unitUnderTest' can not be annotated with @InjectMocks cause the type 'InterfaceType ' not a class!\n`\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java","src/main/java/org/mockito/internal/exceptions/Reporter.java","src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java"],"string":"[\n \"src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java\",\n \"src/main/java/org/mockito/internal/exceptions/Reporter.java\",\n \"src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java","src/main/java/org/mockito/internal/exceptions/Reporter.java","src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java"],"string":"[\n \"src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java\",\n \"src/main/java/org/mockito/internal/exceptions/Reporter.java\",\n \"src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java","src/test/java/org/mockitousage/basicapi/MocksCreationTest.java"],"string":"[\n \"src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java\",\n \"src/test/java/org/mockitousage/basicapi/MocksCreationTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java b/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java\nindex 92e5868913..5b52a71262 100644\n--- a/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java\n+++ b/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java\n@@ -98,7 +98,7 @@ private FieldInitializationReport initializeInjectMocksField(Field field, Object\n Throwable realCause = e.getCause().getCause();\n throw fieldInitialisationThrewException(field, realCause);\n }\n- throw cannotInitializeForInjectMocksAnnotation(field.getName(), e);\n+ throw cannotInitializeForInjectMocksAnnotation(field.getName(),e.getMessage());\n }\n }\n \ndiff --git a/src/main/java/org/mockito/internal/exceptions/Reporter.java b/src/main/java/org/mockito/internal/exceptions/Reporter.java\nindex 3a63d69ddc..8a28e67f89 100644\n--- a/src/main/java/org/mockito/internal/exceptions/Reporter.java\n+++ b/src/main/java/org/mockito/internal/exceptions/Reporter.java\n@@ -627,16 +627,14 @@ public static MockitoException cannotInitializeForSpyAnnotation(String fieldName\n \"\"), details);\n }\n \n- public static MockitoException cannotInitializeForInjectMocksAnnotation(String fieldName, Exception details) {\n- return new MockitoException(join(\"Cannot instantiate @InjectMocks field named '\" + fieldName + \"'.\",\n+ public static MockitoException cannotInitializeForInjectMocksAnnotation(String fieldName, String causeMessage) {\n+ return new MockitoException(join(\"Cannot instantiate @InjectMocks field named '\" + fieldName + \"'! Cause: \"+causeMessage,\n \"You haven't provided the instance at field declaration so I tried to construct the instance.\",\n- \"However, I failed because: \" + details.getMessage(),\n \"Examples of correct usage of @InjectMocks:\",\n \" @InjectMocks Service service = new Service();\",\n \" @InjectMocks Service service;\",\n- \" //also, don't forget about MockitoAnnotations.initMocks();\",\n \" //and... don't forget about some @Mocks for injection :)\",\n- \"\"), details);\n+ \"\"));\n }\n \n public static MockitoException atMostAndNeverShouldNotBeUsedWithTimeout() {\ndiff --git a/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java b/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java\nindex 7a49e1f6b5..fdc6975498 100644\n--- a/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java\n+++ b/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java\n@@ -7,6 +7,7 @@\n import org.mockito.exceptions.base.MockitoException;\n import org.mockito.internal.util.MockUtil;\n \n+import static java.lang.reflect.Modifier.isStatic;\n import static org.mockito.internal.util.reflection.FieldSetter.setField;\n \n import java.lang.reflect.Constructor;\n@@ -68,7 +69,9 @@ private FieldInitializer(Object fieldOwner, Field field, ConstructorInstantiator\n checkNotLocal(field);\n checkNotInner(field);\n checkNotInterface(field);\n+ checkNotEnum(field);\n checkNotAbstract(field);\n+ \n }\n this.fieldOwner = fieldOwner;\n this.field = field;\n@@ -100,8 +103,9 @@ private void checkNotLocal(Field field) {\n }\n \n private void checkNotInner(Field field) {\n- if(field.getType().isMemberClass() && !Modifier.isStatic(field.getType().getModifiers())) {\n- throw new MockitoException(\"the type '\" + field.getType().getSimpleName() + \"' is an inner class.\");\n+ Class type = field.getType();\n+ if(type.isMemberClass() && !isStatic(type.getModifiers())) {\n+ throw new MockitoException(\"the type '\" + type.getSimpleName() + \"' is an inner non static class.\");\n }\n }\n \n@@ -113,10 +117,17 @@ private void checkNotInterface(Field field) {\n \n private void checkNotAbstract(Field field) {\n if(Modifier.isAbstract(field.getType().getModifiers())) {\n- throw new MockitoException(\"the type '\" + field.getType().getSimpleName() + \" is an abstract class.\");\n+ throw new MockitoException(\"the type '\" + field.getType().getSimpleName() + \"' is an abstract class.\");\n+ }\n+ }\n+ \n+ private void checkNotEnum(Field field) {\n+ if(field.getType().isEnum()) {\n+ throw new MockitoException(\"the type '\" + field.getType().getSimpleName() + \"' is an enum.\");\n }\n }\n \n+\n private FieldInitializationReport acquireFieldInstance() throws IllegalAccessException {\n Object fieldInstance = field.get(fieldOwner);\n if(fieldInstance != null) {\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java b/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java\nindex 4ae5590012..a11a3a7332 100644\n--- a/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java\n+++ b/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java\n@@ -5,9 +5,24 @@\n \n package org.mockitousage.annotation;\n \n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.junit.Assert.assertFalse;\n+import static org.junit.Assert.assertNotNull;\n+import static org.junit.Assert.assertTrue;\n+import static org.junit.Assert.fail;\n+import static org.mockito.Mockito.when;\n+import static org.mockito.MockitoAnnotations.initMocks;\n+\n+import java.util.AbstractCollection;\n+import java.util.List;\n+import java.util.Set;\n+import java.util.concurrent.TimeUnit;\n+import org.assertj.core.api.Assertions;\n import org.junit.Ignore;\n+import org.junit.Rule;\n import org.junit.Test;\n import org.junit.internal.TextListener;\n+import org.junit.rules.ExpectedException;\n import org.junit.runner.JUnitCore;\n import org.junit.runner.RunWith;\n import org.mockito.InjectMocks;\n@@ -17,17 +32,11 @@\n import org.mockito.exceptions.base.MockitoException;\n import org.mockito.internal.util.MockUtil;\n import org.mockito.runners.MockitoJUnitRunner;\n+import org.mockitousage.IMethods;\n import org.mockitousage.examples.use.ArticleCalculator;\n import org.mockitousage.examples.use.ArticleDatabase;\n import org.mockitousage.examples.use.ArticleManager;\n \n-import java.util.List;\n-import java.util.Set;\n-\n-import static org.assertj.core.api.Assertions.assertThat;\n-import static org.junit.Assert.*;\n-import static org.mockito.Mockito.when;\n-\n @RunWith(MockitoJUnitRunner.class)\n public class MockInjectionUsingConstructorTest {\n \n@@ -37,8 +46,8 @@ public class MockInjectionUsingConstructorTest {\n @InjectMocks private ArticleManager articleManager;\n @Spy @InjectMocks private ArticleManager spiedArticleManager;\n \n-\n-// @InjectMocks private ArticleVisitor should_be_initialized_3_times;\n+ @Rule\n+ public ExpectedException exception = ExpectedException.none();\n \n @Test\n public void shouldNotFailWhenNotInitialized() {\n@@ -120,5 +129,91 @@ private static class ATest {\n @InjectMocks FailingConstructor failingConstructor;\n }\n \n+ \n+ @Test\n+ public void injectMocksMustFailWithInterface() throws Exception {\n+ class TestCase {\n+ @InjectMocks\n+ IMethods f;\n+ }\n+\n+ exception.expect(MockitoException.class);\n+ exception.expectMessage(\"Cannot instantiate @InjectMocks field named 'f'! Cause: the type 'IMethods' is an interface\");\n+\n+ \n+ initMocks(new TestCase());\n+ }\n+ \n+ @Test\n+ public void injectMocksMustFailWithEnum() throws Exception {\n+ class TestCase {\n+ @InjectMocks\n+ TimeUnit f;\n+ }\n+\n+ exception.expect(MockitoException.class);\n+ exception.expectMessage(\"Cannot instantiate @InjectMocks field named 'f'! Cause: the type 'TimeUnit' is an enum\");\n+ \n+ initMocks(new TestCase());\n+ }\n+ \n+ @Test\n+ public void injectMocksMustFailWithAbstractClass() throws Exception {\n+ class TestCase {\n+ @InjectMocks\n+ AbstractCollection f;\n+ }\n+\n+ exception.expect(MockitoException.class);\n+ exception.expectMessage(\"Cannot instantiate @InjectMocks field named 'f'! Cause: the type 'AbstractCollection' is an abstract class\");\n+ \n+ initMocks(new TestCase());\n+ }\n+ \n+ @Test\n+ public void injectMocksMustFailWithNonStaticInnerClass() throws Exception {\n+ class TestCase {\n+ class InnerClass {}\n+ @InjectMocks\n+ InnerClass f;\n+ }\n+ \n+\n+ exception.expect(MockitoException.class);\n+ exception.expectMessage(\"Cannot instantiate @InjectMocks field named 'f'! Cause: the type 'InnerClass' is an inner non static class\");\n+ \n+ initMocks(new TestCase());\n+ }\n+ \n+ static class StaticInnerClass {}\n+ @Test\n+ public void injectMocksMustSucceedWithStaticInnerClass() throws Exception {\n+ class TestCase {\n+ @InjectMocks\n+ StaticInnerClass f;\n+ }\n+\n+ TestCase testClass = new TestCase();\n+ initMocks(testClass);\n+ \n+ assertThat(testClass.f).isInstanceOf(StaticInnerClass.class);\n+ }\n+ \n+ @Test\n+ public void injectMocksMustSucceedWithInstance() throws Exception {\n+ class TestCase {\n+ @InjectMocks\n+ StaticInnerClass f = new StaticInnerClass();\n+ }\n+\n+ TestCase testClass = new TestCase();\n+ StaticInnerClass original = testClass.f;\n+ initMocks(testClass);\n+ \n+ assertThat(testClass.f).isSameAs(original);\n+ }\n+ \n+ \n+ \n \n }\ndiff --git a/src/test/java/org/mockitousage/basicapi/MocksCreationTest.java b/src/test/java/org/mockitousage/basicapi/MocksCreationTest.java\nindex 7d6ae465ba..5915fe71cd 100644\n--- a/src/test/java/org/mockitousage/basicapi/MocksCreationTest.java\n+++ b/src/test/java/org/mockitousage/basicapi/MocksCreationTest.java\n@@ -6,7 +6,9 @@\n package org.mockitousage.basicapi;\n \n import org.junit.Test;\n+import org.mockito.InjectMocks;\n import org.mockito.Mockito;\n+import org.mockito.MockitoAnnotations;\n import org.mockito.exceptions.base.MockitoException;\n import org.mockito.exceptions.verification.SmartNullPointerException;\n import org.mockito.internal.debugging.LocationImpl;\n@@ -16,6 +18,7 @@\n import java.util.LinkedList;\n import java.util.List;\n import java.util.Set;\n+import java.util.concurrent.TimeUnit;\n \n import static junit.framework.TestCase.*;\n import static org.assertj.core.api.Assertions.assertThat;\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-13T20:05:32","string":"2016-08-13T20:05:32"},"issue_created_at":{"kind":"timestamp","value":"2016-08-09T14:00:29Z","string":"2016-08-09T14:00:29Z"},"issue_by_user":{"kind":"string","value":"ChristianSchwarz"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":480,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/551_556"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/551"},"pr_id":{"kind":"string","value":"mockito/mockito/556"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"4ce9ac2ea38153f4f0c7e272d52fdf9a494ccb14"},"merge_commit":{"kind":"string","value":"669a05c1dcc6423ae15d5cf04f40720e3a8f0765"},"hints_text":{"kind":"list like","value":["`VerificationCollectorImpl` is package-protected and is not generated in the Javadoc either: http://site.mockito.org/mockito/docs/current/org/mockito/junit/package-summary.html\n\nThe other `VerificationWrapper`s can be package-protected too.\n","This is a good point!\n\nI suggest we move it to internal package anyway. This way:\n- it is consistent how we manage public / private API\n- it can be used more easily by devs who experiment / hack (e.g. they know what they are doing when using private API :)\n- it is less error prone (e.g. when someone forgets to remove 'public' or when someone adds 'public' not realizing consequences)\n"],"string":"[\n \"`VerificationCollectorImpl` is package-protected and is not generated in the Javadoc either: http://site.mockito.org/mockito/docs/current/org/mockito/junit/package-summary.html\\n\\nThe other `VerificationWrapper`s can be package-protected too.\\n\",\n \"This is a good point!\\n\\nI suggest we move it to internal package anyway. This way:\\n- it is consistent how we manage public / private API\\n- it can be used more easily by devs who experiment / hack (e.g. they know what they are doing when using private API :)\\n- it is less error prone (e.g. when someone forgets to remove 'public' or when someone adds 'public' not realizing consequences)\\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-08-15T14:42:45Z","string":"2016-08-15T14:42:45Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"Unexpected new public API: VerificationWrapper, VerificationWrapperInOrder, VerificationCollectorImpl"},"problem_statement":{"kind":"string","value":"It looks like some classes leaked to the public API: VerificationWrapper, VerificationWrapperInOrder, VerificationCollectorImpl\n\nThey seem like internal classes because:\na) they are concrete implementation where public API should be an interface\nb) no javadoc\nc) looking at their API, they don't seem like something we want to expose to the users :)\n\nWe need to fix it before 2.0, perhaps it's just the matter of moving it to internal packages.\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/InOrderImpl.java","src/main/java/org/mockito/junit/VerificationCollectorImpl.java","src/main/java/org/mockito/verification/VerificationWrapper.java","src/main/java/org/mockito/verification/VerificationWrapperInOrderWrapper.java","src/main/java/org/mockito/junit/MockitoJUnit.java","src/main/java/org/mockito/verification/After.java","src/main/java/org/mockito/verification/Timeout.java"],"string":"[\n \"src/main/java/org/mockito/internal/InOrderImpl.java\",\n \"src/main/java/org/mockito/junit/VerificationCollectorImpl.java\",\n \"src/main/java/org/mockito/verification/VerificationWrapper.java\",\n \"src/main/java/org/mockito/verification/VerificationWrapperInOrderWrapper.java\",\n \"src/main/java/org/mockito/junit/MockitoJUnit.java\",\n \"src/main/java/org/mockito/verification/After.java\",\n \"src/main/java/org/mockito/verification/Timeout.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/InOrderImpl.java","src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java","src/main/java/org/mockito/internal/verification/VerificationWrapper.java","src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java","src/main/java/org/mockito/junit/MockitoJUnit.java","src/main/java/org/mockito/verification/After.java","src/main/java/org/mockito/verification/Timeout.java"],"string":"[\n \"src/main/java/org/mockito/internal/InOrderImpl.java\",\n \"src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java\",\n \"src/main/java/org/mockito/internal/verification/VerificationWrapper.java\",\n \"src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java\",\n \"src/main/java/org/mockito/junit/MockitoJUnit.java\",\n \"src/main/java/org/mockito/verification/After.java\",\n \"src/main/java/org/mockito/verification/Timeout.java\"\n]"},"test_files":{"kind":"list like","value":[],"string":"[]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/InOrderImpl.java b/src/main/java/org/mockito/internal/InOrderImpl.java\nindex cb3442f373..ce37b23da4 100644\n--- a/src/main/java/org/mockito/internal/InOrderImpl.java\n+++ b/src/main/java/org/mockito/internal/InOrderImpl.java\n@@ -14,8 +14,8 @@\n import org.mockito.internal.verification.api.VerificationInOrderMode;\n import org.mockito.invocation.Invocation;\n import org.mockito.verification.VerificationMode;\n-import org.mockito.verification.VerificationWrapper;\n-import org.mockito.verification.VerificationWrapperInOrderWrapper;\n+import org.mockito.internal.verification.VerificationWrapper;\n+import org.mockito.internal.verification.VerificationWrapperInOrderWrapper;\n \n import static org.mockito.internal.exceptions.Reporter.inOrderRequiresFamiliarMock;\n \ndiff --git a/src/main/java/org/mockito/junit/VerificationCollectorImpl.java b/src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java\nsimilarity index 94%\nrename from src/main/java/org/mockito/junit/VerificationCollectorImpl.java\nrename to src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java\nindex b1ffeb8946..da9c4515f6 100644\n--- a/src/main/java/org/mockito/junit/VerificationCollectorImpl.java\n+++ b/src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java\n@@ -1,4 +1,4 @@\n-package org.mockito.junit;\n+package org.mockito.internal.junit;\n \n import static org.mockito.internal.progress.ThreadSafeMockingProgress.mockingProgress;\n \n@@ -7,18 +7,19 @@\n import org.mockito.exceptions.base.MockitoAssertionError;\n import org.mockito.internal.progress.MockingProgressImpl;\n import org.mockito.internal.verification.api.VerificationData;\n+import org.mockito.junit.VerificationCollector;\n import org.mockito.verification.VerificationMode;\n import org.mockito.verification.VerificationStrategy;\n \n /**\n * Mockito implementation of VerificationCollector.\n */\n-class VerificationCollectorImpl implements VerificationCollector {\n+public class VerificationCollectorImpl implements VerificationCollector {\n \n private StringBuilder builder;\n private int numberOfFailures;\n \n- VerificationCollectorImpl() {\n+ public VerificationCollectorImpl() {\n this.resetBuilder();\n }\n \ndiff --git a/src/main/java/org/mockito/verification/VerificationWrapper.java b/src/main/java/org/mockito/internal/verification/VerificationWrapper.java\nsimilarity index 93%\nrename from src/main/java/org/mockito/verification/VerificationWrapper.java\nrename to src/main/java/org/mockito/internal/verification/VerificationWrapper.java\nindex d32fab221d..13ad8d8164 100644\n--- a/src/main/java/org/mockito/verification/VerificationWrapper.java\n+++ b/src/main/java/org/mockito/internal/verification/VerificationWrapper.java\n@@ -1,7 +1,7 @@\n-package org.mockito.verification;\n+package org.mockito.internal.verification;\n \n-import org.mockito.internal.verification.VerificationModeFactory;\n import org.mockito.internal.verification.api.VerificationData;\n+import org.mockito.verification.VerificationMode;\n \n public abstract class VerificationWrapper implements VerificationMode {\n \ndiff --git a/src/main/java/org/mockito/verification/VerificationWrapperInOrderWrapper.java b/src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java\nsimilarity index 91%\nrename from src/main/java/org/mockito/verification/VerificationWrapperInOrderWrapper.java\nrename to src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java\nindex e04cfd749d..f04ebadbfb 100644\n--- a/src/main/java/org/mockito/verification/VerificationWrapperInOrderWrapper.java\n+++ b/src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java\n@@ -1,12 +1,10 @@\n-package org.mockito.verification;\n+package org.mockito.internal.verification;\n \n import org.mockito.exceptions.base.MockitoException;\n import org.mockito.internal.InOrderImpl;\n-import org.mockito.internal.verification.InOrderWrapper;\n-import org.mockito.internal.verification.VerificationModeFactory;\n-import org.mockito.internal.verification.VerificationOverTimeImpl;\n import org.mockito.internal.verification.api.VerificationData;\n import org.mockito.internal.verification.api.VerificationInOrderMode;\n+import org.mockito.verification.VerificationMode;\n \n public class VerificationWrapperInOrderWrapper implements VerificationMode {\n private final VerificationMode delegate;\ndiff --git a/src/main/java/org/mockito/junit/MockitoJUnit.java b/src/main/java/org/mockito/junit/MockitoJUnit.java\nindex 8c6c32ea6e..fac86b4572 100644\n--- a/src/main/java/org/mockito/junit/MockitoJUnit.java\n+++ b/src/main/java/org/mockito/junit/MockitoJUnit.java\n@@ -1,6 +1,7 @@\n package org.mockito.junit;\n \n import org.mockito.internal.junit.JUnitRule;\n+import org.mockito.internal.junit.VerificationCollectorImpl;\n import org.mockito.internal.util.ConsoleMockitoLogger;\n \n /**\ndiff --git a/src/main/java/org/mockito/verification/After.java b/src/main/java/org/mockito/verification/After.java\nindex cc63dfbfd5..089324ebcc 100644\n--- a/src/main/java/org/mockito/verification/After.java\n+++ b/src/main/java/org/mockito/verification/After.java\n@@ -2,6 +2,7 @@\n \n import org.mockito.internal.verification.VerificationModeFactory;\n import org.mockito.internal.verification.VerificationOverTimeImpl;\n+import org.mockito.internal.verification.VerificationWrapper;\n \n /**\n * See the javadoc for {@link VerificationAfterDelay}\ndiff --git a/src/main/java/org/mockito/verification/Timeout.java b/src/main/java/org/mockito/verification/Timeout.java\nindex dcb8b46c9b..f49765a270 100644\n--- a/src/main/java/org/mockito/verification/Timeout.java\n+++ b/src/main/java/org/mockito/verification/Timeout.java\n@@ -9,6 +9,7 @@\n import org.mockito.internal.util.Timer;\n import org.mockito.internal.verification.VerificationModeFactory;\n import org.mockito.internal.verification.VerificationOverTimeImpl;\n+import org.mockito.internal.verification.VerificationWrapper;\n \n /**\n * See the javadoc for {@link VerificationWithTimeout}\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-15T15:27:39","string":"2016-08-15T15:27:39"},"issue_created_at":{"kind":"timestamp","value":"2016-08-13T15:17:16Z","string":"2016-08-13T15:17:16Z"},"issue_by_user":{"kind":"string","value":"mockitoguy"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":481,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/533_557"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/533"},"pr_id":{"kind":"string","value":"mockito/mockito/557"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue","timestamp(timedelta=0.0, similarity=0.8874129473043729)"],"string":"[\n \"keyword_pr_to_issue\",\n \"timestamp(timedelta=0.0, similarity=0.8874129473043729)\"\n]"},"base_commit":{"kind":"string","value":"4ce9ac2ea38153f4f0c7e272d52fdf9a494ccb14"},"merge_commit":{"kind":"string","value":"a8c9b1c9a40a3702979b6feace16e1acd6349281"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-08-15T15:30:34Z","string":"2016-08-15T15:30:34Z"},"labeled_as":{"kind":"list like","value":["docs"],"string":"[\n \"docs\"\n]"},"problem_title":{"kind":"string","value":"Remove code.google.com from javadoc"},"problem_statement":{"kind":"string","value":"Looks like the javadoc still has some references to code.google.com, let's replace them with up to date links.\n"},"gold_files":{"kind":"list like","value":[".github/CONTRIBUTING.md","src/main/java/org/mockito/AdditionalAnswers.java","src/main/java/org/mockito/MockSettings.java","src/main/java/org/mockito/Mockito.java"],"string":"[\n \".github/CONTRIBUTING.md\",\n \"src/main/java/org/mockito/AdditionalAnswers.java\",\n \"src/main/java/org/mockito/MockSettings.java\",\n \"src/main/java/org/mockito/Mockito.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":[".github/CONTRIBUTING.md","src/main/java/org/mockito/AdditionalAnswers.java","src/main/java/org/mockito/MockSettings.java","src/main/java/org/mockito/Mockito.java"],"string":"[\n \".github/CONTRIBUTING.md\",\n \"src/main/java/org/mockito/AdditionalAnswers.java\",\n \"src/main/java/org/mockito/MockSettings.java\",\n \"src/main/java/org/mockito/Mockito.java\"\n]"},"test_files":{"kind":"list like","value":[],"string":"[]"},"gold_patch":{"kind":"string","value":"diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md\nindex ebab07f5f0..1fe4857285 100644\n--- a/.github/CONTRIBUTING.md\n+++ b/.github/CONTRIBUTING.md\n@@ -27,7 +27,7 @@\n * Also, don't hesitate to ask questions on the [mailing list](https://groups.google.com/forum/#!forum/mockito) - that helps us improve javadocs/FAQ.\n * Please suggest changes to javadoc/exception messages when you find something unclear.\n * If you miss a particular feature in Mockito - browse or ask on the mailing list, show us a sample code and describe the problem.\n-* Wondering what to work on? See [task/bug list](https://github.com/mockito/mockito/issues/) [(old task/bug list)](http://code.google.com/p/mockito/issues/list) and pick up something you would like to work on. Remember that some feature requests we somewhat not agree with so not everything we want to work on :)\n+* Wondering what to work on? See [task/bug list](https://github.com/mockito/mockito/issues/) and pick up something you would like to work on. Remember that some feature requests we somewhat not agree with so not everything we want to work on :)\n * Mockito currently uses GitHub for versioning so you can *create a fork of Mockito in no time*. Go to the [github project](https://github.com/mockito/mockito) and \"Create your own fork\". Create a new branch, commit, ..., when you're ready let us know about your pull request so we can discuss it and merge the PR!\n * Note the project now uses *gradle*, when your Gradle install is ready, make your IDE project's files (for example **`gradle idea`**). Other gradle commands are listed via **`gradle tasks`**.\n \n@@ -38,18 +38,18 @@ For that reason each pull request has to go through a thorough review and/or dis\n \n Things we pay attention in a PR :\n \n-* On pull requests, please document the change, what it brings, what is the benefit. If the issue exists on the old issue tracker on [Google Code](https://code.google.com/p/mockito/issues/list), please add cross links. But don't create a new one there.\n+* On pull requests, please document the change, what it brings, what is the benefit.\n * **Clean commit history** in the topic branch in your fork of the repository, even during review. That means that commits are _rebased_ and _squashed_ if necessary, so that each commit clearly changes one things and there are no extraneous fix-ups.\n \n For that matter it's possible to commit [_semantic_ changes](http://lemike-de.tumblr.com/post/79041908218/semantic-commits). _Tests are an asset, so is history_.\n- \n+\n _Exemple gratia_:\n- \n+\n ```\n Fixes #73 : The new feature\n Fixes #73 : Refactors this part of Mockito to make feature possible\n ```\n- \n+\n * In the code, always test your feature / change, in unit tests and in our `acceptance test suite` located in `org.mockitousage`. Older tests will be migrated when a test is modified.\n * New test methods should follow a snake case convention (`ensure_that_stuff_is_doing_that`), this allows the test name to be fully expressive on intent while still readable.\n * When reporting errors to the users, if it's a user report report it gently and explain how a user should deal with it, see the `Reporter` class. However not all errors should go there, some unlikely technical errors don't need to be in the `Reporter` class.\n@@ -58,4 +58,3 @@ Things we pay attention in a PR :\n \n \n _If you are unsure about git you can have a look on our [git tips to have a clean history](https://github.com/mockito/mockito/wiki/Using git to prepare your PR to have a clean history)._\n-\ndiff --git a/src/main/java/org/mockito/AdditionalAnswers.java b/src/main/java/org/mockito/AdditionalAnswers.java\nindex fd97305ef2..9ee4a20013 100644\n--- a/src/main/java/org/mockito/AdditionalAnswers.java\n+++ b/src/main/java/org/mockito/AdditionalAnswers.java\n@@ -122,8 +122,7 @@ public static Answer returnsArgAt(int position) {\n * Already custom proxied object \n * Special objects with a finalize method, i.e. to avoid executing it 2 times \n * \n- * For more details including the use cases reported by users take a look at\n- * issue 145 .\n+ *\n * \n * The difference with the regular spy:\n *
\ndiff --git a/src/main/java/org/mockito/MockSettings.java b/src/main/java/org/mockito/MockSettings.java\nindex 2b5f934694..137764c35f 100644\n--- a/src/main/java/org/mockito/MockSettings.java\n+++ b/src/main/java/org/mockito/MockSettings.java\n@@ -40,7 +40,6 @@ public interface MockSettings extends Serializable {\n \n /**\n * Specifies extra interfaces the mock should implement. Might be useful for legacy code or some corner cases.\n- * For background, see issue 51 here \n * \n * This mysterious feature should be used very occasionally.\n * The object under test should know exactly its collaborators & dependencies.\ndiff --git a/src/main/java/org/mockito/Mockito.java b/src/main/java/org/mockito/Mockito.java\nindex ec953791d2..f92ff50d51 100644\n--- a/src/main/java/org/mockito/Mockito.java\n+++ b/src/main/java/org/mockito/Mockito.java\n@@ -674,8 +674,7 @@\n *
\n * The only reason we added reset() method is to\n * make it possible to work with container-injected mocks.\n- * See issue 55 (here )\n- * or FAQ (here ).\n+ * For more information see FAQ (here ).\n *
\n * Don't harm yourself. reset() in the middle of the test method is a code smell (you're probably testing too much).\n *
\n@@ -693,7 +692,7 @@\n * \n *\n * First of all, in case of any trouble, I encourage you to read the Mockito FAQ:\n- * http://code.google.com/p/mockito/wiki/FAQ \n+ * https://github.com/mockito/mockito/wiki/FAQ \n * \n * In case of questions you may also post to mockito mailing list:\n * http://groups.google.com/group/mockito \n@@ -1812,8 +1811,7 @@ public static T verify(T mock, VerificationMode mode) {\n * \n * The only reason we added reset() method is to\n * make it possible to work with container-injected mocks.\n- * See issue 55 (here )\n- * or FAQ (here ).\n+ * For more information see the FAQ (here ).\n *
\n * Don't harm yourself. reset() in the middle of the test method is a code smell (you're probably testing too much).\n *
\n@@ -2202,8 +2200,8 @@ public static Stubber doReturn(Object toBeReturned, Object... toBeReturnedNext)\n * Also, you can create InOrder object passing only mocks that are relevant for in-order verification.\n * \n * InOrder verification is 'greedy', but you will hardly ever notice it.\n- * If you want to find out more, search for 'greedy' in the Mockito\n- * wiki pages .\n+ * If you want to find out more, read\n+ * this wiki page .\n *
\n * As of Mockito 1.8.4 you can verifyNoMoreInvocations() in order-sensitive way. Read more: {@link InOrder#verifyNoMoreInteractions()}\n *
\n@@ -2485,7 +2483,7 @@ public static VerificationAfterDelay after(long millis) {\n }\n \n /**\n- * First of all, in case of any trouble, I encourage you to read the Mockito FAQ: http://code.google.com/p/mockito/wiki/FAQ \n+ * First of all, in case of any trouble, I encourage you to read the Mockito FAQ: https://github.com/mockito/mockito/wiki/FAQ \n *
\n * In case of questions you may also post to mockito mailing list: http://groups.google.com/group/mockito \n *
\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"val"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-15T15:27:39","string":"2016-08-15T15:27:39"},"issue_created_at":{"kind":"timestamp","value":"2016-08-05T21:12:20Z","string":"2016-08-05T21:12:20Z"},"issue_by_user":{"kind":"string","value":"bric3"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":482,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/554_560"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/554"},"pr_id":{"kind":"string","value":"mockito/mockito/560"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=1.0, similarity=0.8625271174305021)","keyword_pr_to_issue"],"string":"[\n \"timestamp(timedelta=1.0, similarity=0.8625271174305021)\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"d5fec63dd1268fae0cdd91e3e8f760e4b806af55"},"merge_commit":{"kind":"string","value":"38610245f27225fb7ce1b50dd355bd7b0ac86792"},"hints_text":{"kind":"list like","value":["Definitely! Personally I hate throwing NPEs. NPE can be thrown because you've forgotten to inject sth and your test (if you test for an NPE exception to be thrown) will pass.\n","Agreed \n"],"string":"[\n \"Definitely! Personally I hate throwing NPEs. NPE can be thrown because you've forgotten to inject sth and your test (if you test for an NPE exception to be thrown) will pass.\\n\",\n \"Agreed \\n\"\n]"},"resolved_comments":{"kind":"list like","value":[],"string":"[]"},"created_at":{"kind":"timestamp","value":"2016-08-16T10:18:25Z","string":"2016-08-16T10:18:25Z"},"labeled_as":{"kind":"list like","value":["enhancement"],"string":"[\n \"enhancement\"\n]"},"problem_title":{"kind":"string","value":"Checks.checkNotNull should emit IllegalArgumentException instead of NPE"},"problem_statement":{"kind":"string","value":"Checks.checkNotNull emits NPE. I think it is better to emit IAE, because:\n- IAE is more specific whereas NPE is more generic. Specific exception is easier to test.\n- Specific exception gives better experience for users, NPE is often assumed to be developer error.\n\nThis change is not backwards compatible.\n\n@bric3, thoughts?\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/util/Checks.java"],"string":"[\n \"src/main/java/org/mockito/internal/util/Checks.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/util/Checks.java"],"string":"[\n \"src/main/java/org/mockito/internal/util/Checks.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/configuration/MockInjectionTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/configuration/MockInjectionTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/util/Checks.java b/src/main/java/org/mockito/internal/util/Checks.java\nindex 00ed8a8f22..acb8e914b0 100644\n--- a/src/main/java/org/mockito/internal/util/Checks.java\n+++ b/src/main/java/org/mockito/internal/util/Checks.java\n@@ -12,7 +12,7 @@ public class Checks {\n \n public static T checkNotNull(T value, String checkedValue) {\n if(value == null) {\n- throw new NullPointerException(checkedValue + \" should not be null\");\n+ throw new IllegalArgumentException(checkedValue + \" should not be null\");\n }\n return value;\n }\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/configuration/MockInjectionTest.java b/src/test/java/org/mockito/internal/configuration/MockInjectionTest.java\nindex ed20c9ccc2..4abb528042 100644\n--- a/src/test/java/org/mockito/internal/configuration/MockInjectionTest.java\n+++ b/src/test/java/org/mockito/internal/configuration/MockInjectionTest.java\n@@ -29,22 +29,22 @@ public void reset() throws Exception {\n withoutConstructor = null;\n }\n \n- @Test(expected = NullPointerException.class)\n+ @Test(expected = IllegalArgumentException.class)\n public void should_not_allow_null_on_field() {\n MockInjection.onField((Field) null, this);\n }\n \n- @Test(expected = NullPointerException.class)\n+ @Test(expected = IllegalArgumentException.class)\n public void should_not_allow_null_on_fields() {\n MockInjection.onFields((Set) null, this);\n }\n \n- @Test(expected = NullPointerException.class)\n+ @Test(expected = IllegalArgumentException.class)\n public void should_not_allow_null_on_instance_owning_the_field() throws Exception {\n MockInjection.onField(field(\"withConstructor\"), null);\n }\n \n- @Test(expected = NullPointerException.class)\n+ @Test(expected = IllegalArgumentException.class)\n public void should_not_allow_null_on_mocks() throws Exception {\n MockInjection.onField(field(\"withConstructor\"), this).withMocks(null);\n }\n"},"split_random":{"kind":"string","value":"test"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-16T10:27:07","string":"2016-08-16T10:27:07"},"issue_created_at":{"kind":"timestamp","value":"2016-08-14T18:08:05Z","string":"2016-08-14T18:08:05Z"},"issue_by_user":{"kind":"string","value":"mockitoguy"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":483,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/541_569"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/541"},"pr_id":{"kind":"string","value":"mockito/mockito/569"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=0.0, similarity=0.9188712415398987)"],"string":"[\n \"timestamp(timedelta=0.0, similarity=0.9188712415398987)\"\n]"},"base_commit":{"kind":"string","value":"e38764fa0c5fb0373b8a82120b12a2b635e363a9"},"merge_commit":{"kind":"string","value":"18d421778e1952f8e8f291201207702ac590edc9"},"hints_text":{"kind":"list like","value":["OK but let's deprecate them instead of removing them (possibly in mockito 3).\n","Given that getMockedType() and getExtraInterfaces() are unreleased yet (e.g. 2.0), do you still opt for deprecation?\n","good point, let's remove them then !\n"],"string":"[\n \"OK but let's deprecate them instead of removing them (possibly in mockito 3).\\n\",\n \"Given that getMockedType() and getExtraInterfaces() are unreleased yet (e.g. 2.0), do you still opt for deprecation?\\n\",\n \"good point, let's remove them then !\\n\"\n]"},"resolved_comments":{"kind":"list like","value":["I think the assertions should be on the constructor. This enable a fail fast behavior.\n","We cannot have them on constructor at the moment because isMock / isSpy methods permit null / non-mock arguments. Options:\n1. separate isMock / isSpy API somewhere else\n2. return empty / null result from getInvocations / getCreationSettings - then we don't need any exception\n3. leave things as they are (merge PR :D)\n4. ?\n\nMy thinking process\n\n1 - API discoverability suffers\n2 - poor API, no distinction between non-mock and mock without invocations, null handling required for the client code\n3 - late exception not ideal but acceptable IMO\n\nGood feedback!\n","> We cannot have them on constructor at the moment because isMock / isSpy methods permit null / non-mock arguments. \n\nGood point. That was a suggestion only. But that work too !\n\nDiscoverability won't suffer that much. Imho\n","@szczepiq We should use the ExpectedException Rule here. WDYT?\n","@ChristianSchwarz I'm not a fan of `ExpectedException` rule, this make the test a bit awkward, try/catch is a bit more bulky but it offers more control.\n\nAlso when we switch to Java8 after mockito 2, we can bump to AssertJ 3.x which has interesting assertions like : \n\n``` java\nAssertions.assertThatThrownBy(() -> mockingDetails(null).getInvocations())\n .isInstanceOf(NotAMockException.class)\n .hasMessageContaining(\"Argument passed to Mockito.mockingDetails() should be a mock, but is null!\")\n```\n"],"string":"[\n \"I think the assertions should be on the constructor. This enable a fail fast behavior.\\n\",\n \"We cannot have them on constructor at the moment because isMock / isSpy methods permit null / non-mock arguments. Options:\\n1. separate isMock / isSpy API somewhere else\\n2. return empty / null result from getInvocations / getCreationSettings - then we don't need any exception\\n3. leave things as they are (merge PR :D)\\n4. ?\\n\\nMy thinking process\\n\\n1 - API discoverability suffers\\n2 - poor API, no distinction between non-mock and mock without invocations, null handling required for the client code\\n3 - late exception not ideal but acceptable IMO\\n\\nGood feedback!\\n\",\n \"> We cannot have them on constructor at the moment because isMock / isSpy methods permit null / non-mock arguments. \\n\\nGood point. That was a suggestion only. But that work too !\\n\\nDiscoverability won't suffer that much. Imho\\n\",\n \"@szczepiq We should use the ExpectedException Rule here. WDYT?\\n\",\n \"@ChristianSchwarz I'm not a fan of `ExpectedException` rule, this make the test a bit awkward, try/catch is a bit more bulky but it offers more control.\\n\\nAlso when we switch to Java8 after mockito 2, we can bump to AssertJ 3.x which has interesting assertions like : \\n\\n``` java\\nAssertions.assertThatThrownBy(() -> mockingDetails(null).getInvocations())\\n .isInstanceOf(NotAMockException.class)\\n .hasMessageContaining(\\\"Argument passed to Mockito.mockingDetails() should be a mock, but is null!\\\")\\n```\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-08-19T23:13:16Z","string":"2016-08-19T23:13:16Z"},"labeled_as":{"kind":"list like","value":["enhancement"],"string":"[\n \"enhancement\"\n]"},"problem_title":{"kind":"string","value":"improve Mockito.mockingDetails API"},"problem_statement":{"kind":"string","value":"In order to make the API cleaner & expose useful information:\n1. MockingDetails.getInvocations() throws meaningful exception when passed object is not a mock and documents this behavior\n2. getMockedType() and getExtraInterfaces() are replaced with getMockCreationSettings() that returns MockCreationSettings instance.\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/MockingDetails.java","src/main/java/org/mockito/internal/util/DefaultMockingDetails.java"],"string":"[\n \"src/main/java/org/mockito/MockingDetails.java\",\n \"src/main/java/org/mockito/internal/util/DefaultMockingDetails.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/MockingDetails.java","src/main/java/org/mockito/internal/util/DefaultMockingDetails.java"],"string":"[\n \"src/main/java/org/mockito/MockingDetails.java\",\n \"src/main/java/org/mockito/internal/util/DefaultMockingDetails.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/MockingDetails.java b/src/main/java/org/mockito/MockingDetails.java\nindex ee8496380e..534cbd02f8 100644\n--- a/src/main/java/org/mockito/MockingDetails.java\n+++ b/src/main/java/org/mockito/MockingDetails.java\n@@ -5,9 +5,9 @@\n package org.mockito;\n \n import org.mockito.invocation.Invocation;\n+import org.mockito.mock.MockCreationSettings;\n \n import java.util.Collection;\n-import java.util.Set;\n \n /**\n * Provides mocking information.\n@@ -36,27 +36,24 @@ public interface MockingDetails {\n /**\n * All method invocations on this mock.\n * Can be empty - it means there were no interactions with the mock.\n+ * \n+ * This method is useful for framework integrators and for certain edge cases.\n *\n * @since 1.10.0\n */\n Collection getInvocations();\n \n /**\n- * Returns the type that is mocked. It is the type originally passed to\n- * the {@link Mockito#mock(Class)} or {@link Mockito#spy(Class)} function,\n- * or the type referenced by a Mockito annotation.\n- *\n- * @return The mocked type\n- * @since 2.0.0\n- */\n- Class getMockedType();\n-\n- /**\n- * Returns the extra-interfaces of the mock. The interfaces that were configured at the mock creation\n- * with the {@link MockSettings#extraInterfaces(Class[])}.\n- *\n- * @return The extra-interfaces\n+ * Returns various mock settings provided when the mock was created, for example:\n+ * mocked class, mock name (if any), any extra interfaces (if any), etc.\n+ * See also {@link MockCreationSettings}.\n+ * \n+ * This method is useful for framework integrators and for certain edge cases.\n+ *
\n+ * If null or non-mock was passed to {@link Mockito#mockingDetails(Object)}\n+ * then this method will throw with an appropriate exception.\n+ * After all, non-mock objects do not have any mock creation settings.\n * @since 2.0.0\n */\n- Set> getExtraInterfaces();\n+ MockCreationSettings getMockCreationSettings();\n }\ndiff --git a/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java b/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java\nindex f7a91dfbba..5117ccbf96 100644\n--- a/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java\n+++ b/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java\n@@ -5,12 +5,14 @@\n package org.mockito.internal.util;\n \n import org.mockito.MockingDetails;\n+import org.mockito.exceptions.misusing.NotAMockException;\n+import org.mockito.internal.InternalMockHandler;\n import org.mockito.invocation.Invocation;\n-\n-import static org.mockito.internal.util.MockUtil.getMockHandler;\n+import org.mockito.mock.MockCreationSettings;\n \n import java.util.Collection;\n-import java.util.Set;\n+\n+import static org.mockito.internal.util.MockUtil.getMockHandler;\n \n /**\n * Class to inspect any object, and identify whether a particular object is either a mock or a spy. This is\n@@ -36,17 +38,25 @@ public boolean isSpy(){\n \n @Override\n public Collection getInvocations() {\n- return getMockHandler(toInspect).getInvocationContainer().getInvocations();\n+ return mockHandler().getInvocationContainer().getInvocations();\n }\n \n @Override\n- public Class getMockedType() {\n- return getMockHandler(toInspect).getMockSettings().getTypeToMock();\n+ public MockCreationSettings getMockCreationSettings() {\n+ return mockHandler().getMockSettings();\n }\n \n- @Override\n- public Set> getExtraInterfaces() {\n- return getMockHandler(toInspect).getMockSettings().getExtraInterfaces();\n+ private InternalMockHandler mockHandler() {\n+ assertGoodMock();\n+ return getMockHandler(toInspect);\n+ }\n+\n+ private void assertGoodMock() {\n+ if (toInspect == null) {\n+ throw new NotAMockException(\"Argument passed to Mockito.mockingDetails() should be a mock, but is null!\");\n+ } else if (!isMock()) {\n+ throw new NotAMockException(\"Argument passed to Mockito.mockingDetails() should be a mock, but is an instance of \" + toInspect.getClass() + \"!\");\n+ }\n }\n }\n \n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/MockingDetailsTest.java b/src/test/java/org/mockito/MockingDetailsTest.java\ndeleted file mode 100644\nindex ba870517a3..0000000000\n--- a/src/test/java/org/mockito/MockingDetailsTest.java\n+++ /dev/null\n@@ -1,51 +0,0 @@\n-package org.mockito;\n-\n-import org.junit.Test;\n-import org.mockito.internal.MockitoCore;\n-import org.mockito.invocation.Invocation;\n-import org.mockitoutil.TestBase;\n-\n-import java.util.ArrayList;\n-import java.util.Collection;\n-import java.util.List;\n-\n-import static junit.framework.TestCase.*;\n-import static org.mockito.Mockito.mock;\n-\n-public class MockingDetailsTest extends TestBase {\n- \n- @Test\n- public void should_provide_invocations() {\n- List methodsInvoked = new ArrayList() {{\n- add(\"add\");\n- add(\"remove\");\n- add(\"clear\");\n- }};\n-\n- @SuppressWarnings(\"unchecked\")\n- List mockedList = (List) mock(List.class);\n- \n- mockedList.add(\"one\");\n- mockedList.remove(0);\n- mockedList.clear();\n- \n- MockingDetails mockingDetails = new MockitoCore().mockingDetails(mockedList);\n- Collection invocations = mockingDetails.getInvocations();\n- \n- assertNotNull(invocations);\n- assertEquals(invocations.size(),3);\n- for (Invocation method : invocations) {\n- assertTrue(methodsInvoked.contains(method.getMethod().getName()));\n- if (method.getMethod().getName().equals(\"add\")) {\n- assertEquals(method.getArguments().length,1);\n- assertEquals(method.getArguments()[0],\"one\");\n- }\n- } \n- }\n-\n- @Test\n- public void should_handle_null_input() {\n- //TODO 541, decide how to handle it and ensure the there is a top level integ test for the mockingDetails().getInvocations()\n- //assertTrue(new MockitoCore().mockingDetails(null).getInvocations().isEmpty());\n- }\n-}\ndiff --git a/src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java b/src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java\nindex 3c151a96f5..225f1a0b48 100644\n--- a/src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java\n+++ b/src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java\n@@ -1,16 +1,17 @@\n package org.mockito.internal.util;\n \n+import junit.framework.TestCase;\n import org.junit.Test;\n import org.junit.runner.RunWith;\n import org.mockito.Mock;\n import org.mockito.Spy;\n import org.mockito.exceptions.misusing.NotAMockException;\n import org.mockito.runners.MockitoJUnitRunner;\n+import org.mockitousage.IMethods;\n \n-import java.util.*;\n-\n+import static junit.framework.TestCase.fail;\n import static org.junit.Assert.assertEquals;\n-import static org.mockito.Mockito.*;\n+import static org.mockito.Mockito.mockingDetails;\n \n @SuppressWarnings(\"unchecked\")\n @RunWith(MockitoJUnitRunner.class)\n@@ -18,6 +19,7 @@ public class DefaultMockingDetailsTest {\n \n @Mock private Foo foo;\n @Mock private Bar bar;\n+ @Mock private IMethods mock;\n @Spy private Gork gork;\n \n @Test\n@@ -42,28 +44,51 @@ public void should_check_that_a_spy_is_also_a_mock() throws Exception {\n }\n \n @Test\n- public void should_get_mocked_type() throws Exception {\n- assertEquals(Bar.class, mockingDetails(bar).getMockedType());\n- }\n+ public void provides_invocations() {\n+ //when\n+ mock.simpleMethod(10);\n+ mock.otherMethod();\n \n- @Test(expected = NotAMockException.class)\n- public void should_report_when_not_a_mockito_mock_on_getMockedType() throws Exception {\n- mockingDetails(\"not a mock\").getMockedType();\n+ //then\n+ assertEquals(0, mockingDetails(foo).getInvocations().size());\n+ assertEquals(\"[mock.simpleMethod(10);, mock.otherMethod();]\", mockingDetails(mock).getInvocations().toString());\n }\n \n @Test\n- public void should_get_extra_interfaces() throws Exception {\n- Bar loup = mock(Bar.class, withSettings().extraInterfaces(List.class, Observer.class));\n- assertEquals(setOf(Observer.class, List.class), mockingDetails(loup).getExtraInterfaces());\n+ public void provides_mock_creation_settings() {\n+ //smoke test some creation settings\n+ assertEquals(Foo.class, mockingDetails(foo).getMockCreationSettings().getTypeToMock());\n+ assertEquals(Bar.class, mockingDetails(bar).getMockCreationSettings().getTypeToMock());\n+ assertEquals(0, mockingDetails(mock).getMockCreationSettings().getExtraInterfaces().size());\n }\n \n @Test(expected = NotAMockException.class)\n- public void should_report_when_not_a_mockito_mock_on_getExtraInterfaces() throws Exception {\n- mockingDetails(\"not a mock\").getExtraInterfaces();\n+ public void fails_when_getting_creation_settings_for_incorrect_input() {\n+ mockingDetails(null).getMockCreationSettings();\n }\n \n- private Set setOf(T... items) {\n- return new HashSet(Arrays.asList(items));\n+ @Test\n+ public void fails_when_getting_invocations_when_null() {\n+ try {\n+ //when\n+ mockingDetails(null).getInvocations();\n+ //then\n+ fail();\n+ } catch (NotAMockException e) {\n+ TestCase.assertEquals(\"Argument passed to Mockito.mockingDetails() should be a mock, but is null!\", e.getMessage());\n+ }\n+ }\n+\n+ @Test\n+ public void fails_when_getting_invocations_when_not_mock() {\n+ try {\n+ //when\n+ mockingDetails(new Object()).getInvocations();\n+ //then\n+ fail();\n+ } catch (NotAMockException e) {\n+ TestCase.assertEquals(\"Argument passed to Mockito.mockingDetails() should be a mock, but is an instance of class java.lang.Object!\", e.getMessage());\n+ }\n }\n \n public class Foo { }\n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-17T12:02:24","string":"2016-08-17T12:02:24"},"issue_created_at":{"kind":"timestamp","value":"2016-08-10T00:38:47Z","string":"2016-08-10T00:38:47Z"},"issue_by_user":{"kind":"string","value":"mockitoguy"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":484,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/570_571"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/570"},"pr_id":{"kind":"string","value":"mockito/mockito/571"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue"],"string":"[\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"92d71605142dda602d7f6032c187d223695f29d8"},"merge_commit":{"kind":"string","value":"78214f71330b74fc436fe2f932647df39dbf03a0"},"hints_text":{"kind":"list like","value":["@tokuhirom Thanks for the report\n\nIt seems this issue holds true for older versions of mockito like 1.9.5.\n"],"string":"[\n \"@tokuhirom Thanks for the report\\n\\nIt seems this issue holds true for older versions of mockito like 1.9.5.\\n\"\n]"},"resolved_comments":{"kind":"list like","value":["Also add an assert for multiple values in a hashmap.\n","Probably for multiple values it would be good to add some white-space around the `=` and maybe put them on a new-line.\n","Added test case for mutliple values in a hashmap.\n","And, added white-spaces around the '='\n","@tokuhirom \nfor better readability better use [Collections.singletonMap(K,V)](https://docs.oracle.com/javase/7/docs/api/java/util/Collections.html#singletonMap%28K,%20V%29) here \n"],"string":"[\n \"Also add an assert for multiple values in a hashmap.\\n\",\n \"Probably for multiple values it would be good to add some white-space around the `=` and maybe put them on a new-line.\\n\",\n \"Added test case for mutliple values in a hashmap.\\n\",\n \"And, added white-spaces around the '='\\n\",\n \"@tokuhirom \\nfor better readability better use [Collections.singletonMap(K,V)](https://docs.oracle.com/javase/7/docs/api/java/util/Collections.html#singletonMap%28K,%20V%29) here \\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-08-20T02:31:50Z","string":"2016-08-20T02:31:50Z"},"labeled_as":{"kind":"list like","value":["enhancement"],"string":"[\n \"enhancement\"\n]"},"problem_title":{"kind":"string","value":"Hard to understand argument difference between int and long"},"problem_statement":{"kind":"string","value":"check that\n- [x] The mockito message in the stacktrace have useful information, but it didn't help\n- [x] The problematic code (if that's possible) is copied here;\n Note that some configuration are impossible to mock via Mockito\n- [x] Provide versions (mockito / jdk / os / any other relevant information)\n- [x] Provide a [Short, Self Contained, Correct (Compilable), Example](http://sscce.org) of the issue\n (same as any question on stackoverflow.com)\n- [x] Read the [contributing guide](https://github.com/mockito/mockito/blob/master/.github/CONTRIBUTING.md)\n\nJDK: 1.8\nOS: linux\nmockito: master branch\n\nSample code:\n\n```\npackage com.example;\n\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.mockito.InjectMocks;\nimport org.mockito.runners.MockitoJUnitRunner;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport static org.mockito.Mockito.mock;\nimport static org.mockito.Mockito.verify;\n\npublic class HogeTest {\n @Test\n public void test() {\n Hello hello = mock(Hello.class);\n hello.greeting(new HashMap() {{\n put(\"hello\", 3L);\n }});\n verify(hello).greeting(new HashMap() {{\n put(\"hello\", 3);\n }});\n }\n\n public static class Hello {\n void greeting(Map l) {\n }\n }\n}\n```\n\nOutput:\n\n```\nTesting started at 8:37 AM ...\n8:37:01 AM: Executing external tasks ':cleanTest :test --tests \"com.example.HogeTest.test\"'...\n:cleanTest\n:compileJava UP-TO-DATE\n:processResources UP-TO-DATE\n:classes UP-TO-DATE\n:compileTestJava\n:processTestResources UP-TO-DATE\n:testClasses\n:test\ncom.example.HogeTest > test FAILED\n org.mockito.exceptions.verification.junit.ArgumentsAreDifferent at HogeTest.java:31\n\n\nArgument(s) are different! Wanted:\nhello.greeting(() {hello=3});\n-> at com.example.HogeTest.test(HogeTest.java:31)\nActual invocation has different arguments:\nhello.greeting(() {hello=3});\n-> at com.example.HogeTest.test(HogeTest.java:26)\n\nArgument(s) are different! Wanted:\nhello.greeting(() {hello=3});\n-> at com.example.HogeTest.test(HogeTest.java:31)\nActual invocation has different arguments:\nhello.greeting(() {hello=3});\n-> at com.example.HogeTest.test(HogeTest.java:26)\n\n at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)\n at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)\n at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)\n at java.lang.reflect.Constructor.newInstance(Constructor.java:423)\n at com.example.HogeTest.test(HogeTest.java:31)\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n at java.lang.reflect.Method.invoke(Method.java:498)\n at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)\n at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\n at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)\n at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\n at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)\n at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)\n at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)\n at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)\n at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)\n at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)\n at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)\n at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)\n at org.junit.runners.ParentRunner.run(ParentRunner.java:309)\n at org.mockito.internal.runners.JUnit45AndHigherRunnerImpl.run(JUnit45AndHigherRunnerImpl.java:37)\n at org.mockito.runners.MockitoJUnitRunner.run(MockitoJUnitRunner.java:62)\n at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecuter.runTestClass(JUnitTestClassExecuter.java:105)\n at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecuter.execute(JUnitTestClassExecuter.java:56)\n at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassProcessor.processTestClass(JUnitTestClassProcessor.java:64)\n at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:50)\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n at java.lang.reflect.Method.invoke(Method.java:498)\n at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)\n at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)\n at org.gradle.messaging.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)\n at org.gradle.messaging.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)\n at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)\n at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:106)\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n at java.lang.reflect.Method.invoke(Method.java:498)\n at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)\n at org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)\n at org.gradle.messaging.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:360)\n at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:54)\n at org.gradle.internal.concurrent.StoppableExecutorImpl$1.run(StoppableExecutorImpl.java:40)\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)\n at java.lang.Thread.run(Thread.java:745)\n\n1 test completed, 1 failed\n:test FAILED\nFAILURE: Build failed with an exception.\n* What went wrong:\nExecution failed for task ':test'.\n> There were failing tests. See the report at: file:///Users/tokuhirom/dev/mockito-sample/build/reports/tests/index.html\n* Try:\nRun with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output.\nBUILD FAILED\nTotal time: 1.713 secs\nThere were failing tests. See the report at: file:///Users/tokuhirom/dev/mockito-sample/build/reports/tests/index.html\n```\n\nIn this case, user can't understand the difference between _wanted_ and _actual_. Since 2 dumps are same!\n\n```\nArgument(s) are different! Wanted:\nhello.greeting(() {hello=3});\n-> at com.example.HogeTest.test(HogeTest.java:31)\nActual invocation has different arguments:\nhello.greeting(() {hello=3});\n-> at com.example.HogeTest.test(HogeTest.java:26)\n```\n\nIf there's a _L_ suffix for long value, user can understand the difference.\n"},"gold_files":{"kind":"list like","value":["src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java"],"string":"[\n \"src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java"],"string":"[\n \"src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java\"\n]"},"test_files":{"kind":"list like","value":["src/test/java/org/mockito/internal/matchers/EqualsTest.java","src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java","src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java","src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java","src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java"],"string":"[\n \"src/test/java/org/mockito/internal/matchers/EqualsTest.java\",\n \"src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java\",\n \"src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java\",\n \"src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java\",\n \"src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java b/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java\nindex f382c39ffb..10575d3ae1 100644\n--- a/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java\n+++ b/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java\n@@ -1,6 +1,7 @@\n package org.mockito.internal.matchers.text;\n \n import java.util.Iterator;\n+import java.util.Map;\n \n import static java.lang.String.valueOf;\n \n@@ -21,6 +22,16 @@ public static String print(Object value) {\n return \"\\\"\" + value + \"\\\"\";\n } else if (value instanceof Character) {\n return printChar((Character) value);\n+ } else if (value instanceof Long) {\n+ return value + \"L\";\n+ } else if (value instanceof Double) {\n+ return value + \"d\";\n+ } else if (value instanceof Float) {\n+ return value + \"f\";\n+ } else if (value instanceof Byte) {\n+ return String.format(\"0x%02X\", (Byte) value);\n+ } else if (value instanceof Map) {\n+ return printMap((Map) value);\n } else if (value.getClass().isArray()) {\n return printValues(\"[\", \", \", \"]\", new org.mockito.internal.matchers.text.ArrayIterator(value));\n } else if (value instanceof FormattedText) {\n@@ -30,6 +41,19 @@ public static String print(Object value) {\n return descriptionOf(value);\n }\n \n+ private static String printMap(Map map) {\n+ StringBuilder result = new StringBuilder();\n+ Iterator> iterator = map.entrySet().iterator();\n+ while (iterator.hasNext()) {\n+ Map.Entry entry = iterator.next();\n+ result.append(print(entry.getKey())).append(\" = \").append(print(entry.getValue()));\n+ if (iterator.hasNext()) {\n+ result.append(\", \");\n+ }\n+ }\n+ return \"{\" + result.toString() + \"}\";\n+ }\n+\n /**\n * Print values in a nice format, e.g. (1, 2, 3)\n *\n"},"test_patch":{"kind":"string","value":"diff --git a/src/test/java/org/mockito/internal/matchers/EqualsTest.java b/src/test/java/org/mockito/internal/matchers/EqualsTest.java\nindex d0d92d6a75..6664f68bb7 100644\n--- a/src/test/java/org/mockito/internal/matchers/EqualsTest.java\n+++ b/src/test/java/org/mockito/internal/matchers/EqualsTest.java\n@@ -39,7 +39,7 @@ public void shouldDescribeWithExtraTypeInfo() throws Exception {\n public void shouldDescribeWithExtraTypeInfoOfLong() throws Exception {\n String descStr = new Equals(100L).toStringWithType();\n \n- assertEquals(\"(Long) 100\", descStr);\n+ assertEquals(\"(Long) 100L\", descStr);\n }\n \n @Test\ndiff --git a/src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java b/src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java\nindex efbf377621..eaeea5ec5e 100644\n--- a/src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java\n+++ b/src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java\n@@ -36,7 +36,7 @@ public void shouldDescribeTypeInfoOnlyMarkedMatchers() {\n //when\n String line = printer.getArgumentsLine((List) Arrays.asList(new Equals(1L), new Equals(2)), PrintSettings.verboseMatchers(1));\n //then\n- assertEquals(\"(1, (Integer) 2);\", line);\n+ assertEquals(\"(1L, (Integer) 2);\", line);\n }\n \n @Test\n@@ -44,7 +44,7 @@ public void shouldDescribeStringMatcher() {\n //when\n String line = printer.getArgumentsLine((List) Arrays.asList(new Equals(1L), new Equals(\"x\")), PrintSettings.verboseMatchers(1));\n //then\n- assertEquals(\"(1, (String) \\\"x\\\");\", line);\n+ assertEquals(\"(1L, (String) \\\"x\\\");\", line);\n }\n \n @Test\n@@ -52,7 +52,7 @@ public void shouldGetVerboseArgumentsInBlock() {\n //when\n String line = printer.getArgumentsBlock((List) Arrays.asList(new Equals(1L), new Equals(2)), PrintSettings.verboseMatchers(0, 1));\n //then\n- assertEquals(\"(\\n (Long) 1,\\n (Integer) 2\\n);\", line);\n+ assertEquals(\"(\\n (Long) 1L,\\n (Integer) 2\\n);\", line);\n }\n \n @Test\n@@ -60,6 +60,6 @@ public void shouldGetVerboseArgumentsEvenIfSomeMatchersAreNotVerbose() {\n //when\n String line = printer.getArgumentsLine((List) Arrays.asList(new Equals(1L), NotNull.NOT_NULL), PrintSettings.verboseMatchers(0));\n //then\n- assertEquals(\"((Long) 1, notNull());\", line);\n+ assertEquals(\"((Long) 1L, notNull());\", line);\n }\n }\n\\ No newline at end of file\ndiff --git a/src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java b/src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java\nindex 1ecc8cfb3e..ac7235b345 100644\n--- a/src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java\n+++ b/src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java\n@@ -3,6 +3,8 @@\n \n import org.junit.Test;\n \n+import java.util.LinkedHashMap;\n+\n import static org.junit.Assert.assertEquals;\n import static org.junit.Assert.assertTrue;\n import static org.mockito.internal.matchers.text.ValuePrinter.print;\n@@ -14,7 +16,26 @@ public void prints_values() throws Exception {\n assertEquals(\"null\", print(null));\n assertEquals(\"\\\"str\\\"\", print(\"str\"));\n assertEquals(\"\\\"x\\ny\\\"\", print(\"x\\ny\"));\n+ assertEquals(\"3\", print(3));\n+ assertEquals(\"3L\", print(3L));\n+ assertEquals(\"3.14d\", print(3.14d));\n+ assertEquals(\"3.14f\", print(3.14f));\n assertEquals(\"[1, 2]\", print(new int[]{1, 2}));\n+ assertEquals(\"{\\\"foo\\\" = 2L}\", print(new LinkedHashMap() {\n+ {\n+ put(\"foo\", 2L);\n+ }\n+ }));\n+ assertEquals(\"{\\\"byte\\\" = 0x01, \\\"short\\\" = 2, \\\"int\\\" = 3, \\\"long\\\" = 4L, \\\"float\\\" = 2.71f, \\\"double\\\" = 3.14d}\", print(new LinkedHashMap() {\n+ {\n+ put(\"byte\", (byte)1);\n+ put(\"short\", (short)2);\n+ put(\"int\", 3);\n+ put(\"long\", 4L);\n+ put(\"float\", 2.71f);\n+ put(\"double\", 3.14d);\n+ }\n+ }));\n assertTrue(print(new UnsafeToString()).contains(\"UnsafeToString\"));\n assertEquals(\"ToString\", print(new ToString()));\n assertEquals(\"formatted\", print(new FormattedText(\"formatted\")));\ndiff --git a/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java b/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java\nindex 1a2a10cde4..c75b6b05d3 100644\n--- a/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java\n+++ b/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java\n@@ -374,7 +374,7 @@ public void should_print_method_name_and_arguments_of_other_interactions_with_di\n assertThat(e)\n .hasMessageContaining(\"iMethods.threeArgumentMethod(12, foo, \\\"xx\\\")\")\n .hasMessageContaining(\"iMethods.arrayMethod([\\\"a\\\", \\\"b\\\", \\\"c\\\"])\")\n- .hasMessageContaining(\"iMethods.forByte(25)\");\n+ .hasMessageContaining(\"iMethods.forByte(0x19)\");\n }\n }\n \ndiff --git a/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java b/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java\nindex 233ea4dabb..2c44d9bb44 100644\n--- a/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java\n+++ b/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java\n@@ -42,7 +42,7 @@ public void should_not_report_argument_types_when_to_string_is_the_same() {\n //then\n assertThat(e)\n .hasMessageContaining(\"withLong((Integer) 100);\")\n- .hasMessageContaining(\"withLong((Long) 100);\");\n+ .hasMessageContaining(\"withLong((Long) 100L);\");\n }\n }\n \n@@ -60,7 +60,7 @@ public void should_show_the_type_of_only_the_argument_that_doesnt_match() {\n //then\n assertThat(e)\n .hasMessageContaining(\"withLongAndInt((Integer) 100, 200)\")\n- .hasMessageContaining(\"withLongAndInt((Long) 100, 200)\");\n+ .hasMessageContaining(\"withLongAndInt((Long) 100L, 200)\");\n }\n }\n \n@@ -78,7 +78,7 @@ public void should_show_the_type_of_the_mismatching_argument_when_output_descrip\n //then\n Assertions.assertThat(e.getMessage())\n .contains(\"withLongAndInt(\\n\" +\n- \" (Long) 100,\\n\" +\n+ \" (Long) 100L,\\n\" +\n \" 200\\n\" +\n \")\")\n .contains(\"withLongAndInt(\\n\" +\n@@ -101,8 +101,8 @@ public void should_not_show_types_when_argument_value_is_different() {\n } catch (ArgumentsAreDifferent e) {\n //then\n assertThat(e)\n- .hasMessageContaining(\"withLongAndInt(100, 200)\")\n- .hasMessageContaining(\"withLongAndInt(100, 230)\");\n+ .hasMessageContaining(\"withLongAndInt(100L, 200)\")\n+ .hasMessageContaining(\"withLongAndInt(100L, 230)\");\n }\n }\n \n"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-20T20:06:42","string":"2016-08-20T20:06:42"},"issue_created_at":{"kind":"timestamp","value":"2016-08-20T02:30:50Z","string":"2016-08-20T02:30:50Z"},"issue_by_user":{"kind":"string","value":"tokuhirom"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":485,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/564_576"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/564"},"pr_id":{"kind":"string","value":"mockito/mockito/576"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=0.0, similarity=0.8430518118731711)","keyword_pr_to_issue"],"string":"[\n \"timestamp(timedelta=0.0, similarity=0.8430518118731711)\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"cc9f19cceb40c7f9fa66d9495f95d2c4dc2f47f8"},"merge_commit":{"kind":"string","value":"64be0917781a12f42eeea44f199d7340b5693f73"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":[":joy: \n"],"string":"[\n \":joy: \\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-08-20T15:12:54Z","string":"2016-08-20T15:12:54Z"},"labeled_as":{"kind":"list like","value":[],"string":"[]"},"problem_title":{"kind":"string","value":"Publish Mockito build results to Gradle Build Scans"},"problem_statement":{"kind":"string","value":"Let's start publishing Mockito build results to Gradle Build Scans. This way we have extra intel about Gradle builds. This also helps friends at Gradle as they will have more projects on board!\n"},"gold_files":{"kind":"list like","value":[".travis.yml","build.gradle","gradle/wrapper/gradle-wrapper.properties","gradlew","gradlew.bat","src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java","src/main/java/org/mockito/internal/junit/UnusedStubbings.java"],"string":"[\n \".travis.yml\",\n \"build.gradle\",\n \"gradle/wrapper/gradle-wrapper.properties\",\n \"gradlew\",\n \"gradlew.bat\",\n \"src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java\",\n \"src/main/java/org/mockito/internal/junit/UnusedStubbings.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":[".travis.yml","build.gradle","gradle/wrapper/gradle-wrapper.properties","gradlew","gradlew.bat","src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java","src/main/java/org/mockito/internal/junit/UnusedStubbings.java"],"string":"[\n \".travis.yml\",\n \"build.gradle\",\n \"gradle/wrapper/gradle-wrapper.properties\",\n \"gradlew\",\n \"gradlew.bat\",\n \"src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java\",\n \"src/main/java/org/mockito/internal/junit/UnusedStubbings.java\"\n]"},"test_files":{"kind":"list like","value":[],"string":"[]"},"gold_patch":{"kind":"string","value":"diff --git a/.travis.yml b/.travis.yml\nindex 7ec6b9b61d..46a81e5c81 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -49,7 +49,7 @@ branches:\n install:\n - true\n script:\n- - ./gradlew ciBuild release\n+ - ./gradlew ciBuild release -Dscan\n after_success:\n - ./gradlew --stacktrace coverageReport && cp build/reports/jacoco/mockitoCoverage/mockitoCoverage.xml jacoco.xml || echo \"Code coverage failed\"\n - bash <(curl -s https://codecov.io/bash) || echo \"Codecov did not collect coverage reports\"\ndiff --git a/build.gradle b/build.gradle\nindex 9d40980a89..ea9a70728e 100644\n--- a/build.gradle\n+++ b/build.gradle\n@@ -8,6 +8,11 @@ buildscript {\n classpath 'org.codehaus.groovy.modules.http-builder:http-builder:0.5.2' //rest calls to bintray api\n }\n }\n+\n+plugins {\n+ id 'com.gradle.build-scan' version '1.0'\n+}\n+\n apply plugin: 'java'\n group = 'org.mockito'\n description = 'Core API and implementation.'\n@@ -117,7 +122,7 @@ apply from: 'gradle/release.gradle'\n apply from: \"gradle/pom.gradle\"\n \n task wrapper(type: Wrapper) {\n- gradleVersion = '2.4'\n+ gradleVersion = '2.14.1'\n }\n \n task ciBuild {\n@@ -128,3 +133,9 @@ task ciBuild {\n \n //Making sure that release task is only invoked after the entire ciBuild validation\n release.mustRunAfter ciBuild\n+\n+//Posting Build scans to https://scans.gradle.com\n+buildScan {\n+ licenseAgreementUrl = 'https://gradle.com/terms-of-service'\n+ licenseAgree = 'yes'\n+}\ndiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties\nindex 0b5a32f1e1..69ef29851a 100644\n--- a/gradle/wrapper/gradle-wrapper.properties\n+++ b/gradle/wrapper/gradle-wrapper.properties\n@@ -1,6 +1,6 @@\n-#Wed Jul 06 11:31:59 CEST 2016\n+#Fri Aug 19 18:41:31 PDT 2016\n distributionBase=GRADLE_USER_HOME\n distributionPath=wrapper/dists\n zipStoreBase=GRADLE_USER_HOME\n zipStorePath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-2.11-all.zip\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-2.14.1-bin.zip\ndiff --git a/gradlew b/gradlew\nindex 91a7e269e1..9d82f78915 100755\n--- a/gradlew\n+++ b/gradlew\n@@ -42,11 +42,6 @@ case \"`uname`\" in\n ;;\n esac\n \n-# For Cygwin, ensure paths are in UNIX format before anything is touched.\n-if $cygwin ; then\n- [ -n \"$JAVA_HOME\" ] && JAVA_HOME=`cygpath --unix \"$JAVA_HOME\"`\n-fi\n-\n # Attempt to set APP_HOME\n # Resolve links: $0 may be a link\n PRG=\"$0\"\n@@ -61,9 +56,9 @@ while [ -h \"$PRG\" ] ; do\n fi\n done\n SAVED=\"`pwd`\"\n-cd \"`dirname \\\"$PRG\\\"`/\" >&-\n+cd \"`dirname \\\"$PRG\\\"`/\" >/dev/null\n APP_HOME=\"`pwd -P`\"\n-cd \"$SAVED\" >&-\n+cd \"$SAVED\" >/dev/null\n \n CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar\n \n@@ -114,6 +109,7 @@ fi\n if $cygwin ; then\n APP_HOME=`cygpath --path --mixed \"$APP_HOME\"`\n CLASSPATH=`cygpath --path --mixed \"$CLASSPATH\"`\n+ JAVACMD=`cygpath --unix \"$JAVACMD\"`\n \n # We build the pattern for arguments to be converted via cygpath\n ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`\ndiff --git a/gradlew.bat b/gradlew.bat\nindex 8a0b282aa6..5f192121eb 100644\n--- a/gradlew.bat\n+++ b/gradlew.bat\n@@ -46,7 +46,7 @@ echo location of your Java installation.\n goto fail\n \n :init\n-@rem Get command-line arguments, handling Windowz variants\n+@rem Get command-line arguments, handling Windows variants\n \n if not \"%OS%\" == \"Windows_NT\" goto win9xME_args\n if \"%@eval[2+2]\" == \"4\" goto 4NT_args\ndiff --git a/src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java b/src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java\nindex 31a14646a0..53f48b2e2f 100644\n--- a/src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java\n+++ b/src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java\n@@ -27,7 +27,6 @@ public void format(String testName, MockitoLogger logger) {\n }\n \n StubbingHint hint = new StubbingHint(testName);\n- //TODO 544 it would be nice to make the String look good if x goes multiple digits (padding)\n int x = 1;\n for (Map.Entry> m : mismatches.entrySet()) {\n hint.appendLine(x++, \". Unused... \", m.getKey().getLocation());\ndiff --git a/src/main/java/org/mockito/internal/junit/UnusedStubbings.java b/src/main/java/org/mockito/internal/junit/UnusedStubbings.java\nindex 1f415ca776..baaf0516ec 100644\n--- a/src/main/java/org/mockito/internal/junit/UnusedStubbings.java\n+++ b/src/main/java/org/mockito/internal/junit/UnusedStubbings.java\n@@ -21,7 +21,6 @@ void format(String testName, MockitoLogger logger) {\n return;\n }\n \n- //TODO 544 it would be nice to make the String look good if x goes multiple digits (padding)\n StubbingHint hint = new StubbingHint(testName);\n int x = 1;\n for (Stubbing candidate : unused) {\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-20T17:03:35","string":"2016-08-20T17:03:35"},"issue_created_at":{"kind":"timestamp","value":"2016-08-17T04:17:43Z","string":"2016-08-17T04:17:43Z"},"issue_by_user":{"kind":"string","value":"mockitoguy"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":486,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/552_589"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/552"},"pr_id":{"kind":"string","value":"mockito/mockito/589"},"linking_methods":{"kind":"list like","value":["keyword_pr_to_issue","timestamp(timedelta=1.0, similarity=0.9458023989729777)"],"string":"[\n \"keyword_pr_to_issue\",\n \"timestamp(timedelta=1.0, similarity=0.9458023989729777)\"\n]"},"base_commit":{"kind":"string","value":"229790dc71e8ef2257c4a74cc7b13d6e6c3dd01f"},"merge_commit":{"kind":"string","value":"8ee3284cf86e8fecd810f564557cd05131c16b62"},"hints_text":{"kind":"list like","value":["Is this as simple as turning back on this line? https://github.com/mockito/mockito/blob/b0393eafeeb81b6c75e40a82b81672543777ca9a/gradle/javadoc.gradle#L55\n","Probably but I need to check before. The file may have been removed. And the javadoc tool is _picky_ especially in old version of the JDK.\n","Actually we should revert this commit 3a057b3eff2be528a1fed41852a990cff87a72c1, when JDK7 was the only option on travis\n","It seems the javadoc tool of openjdk6 generates a different HTML than Sun JDK 6. Thus the stylesheet is not working properly.\n\n
issue 577 .\n */\n @Deprecated\n static MockitoDebugger debug() {\ndiff --git a/src/main/java/org/mockito/internal/creation/util/SearchingClassLoader.java b/src/main/java/org/mockito/internal/creation/util/SearchingClassLoader.java\ndeleted file mode 100644\nindex 645acb4a97..0000000000\n--- a/src/main/java/org/mockito/internal/creation/util/SearchingClassLoader.java\n+++ /dev/null\n@@ -1,79 +0,0 @@\n-/*\n- * Copyright (c) 2007 Mockito contributors\n- * This program is made available under the terms of the MIT License.\n- */\n-package org.mockito.internal.creation.util;\n-\n-import static java.lang.Thread.*;\n-\n-import java.util.ArrayList;\n-import java.util.List;\n-\n-/**\n- * Inspired on jMock (thanks jMock guys!!!)\n- */\n-public class SearchingClassLoader extends ClassLoader {\n-\n- //TODO SF potentially not needed\n-\n- private final ClassLoader nextToSearch;\n- \n- public SearchingClassLoader(ClassLoader parent, ClassLoader nextToSearch) {\n- super(parent);\n- this.nextToSearch = nextToSearch;\n- }\n- \n- public static ClassLoader combineLoadersOf(Class... classes) {\n- return combineLoadersOf(classes[0], classes);\n- }\n- \n- private static ClassLoader combineLoadersOf(Class first, Class... others) {\n- List loaders = new ArrayList();\n- \n- addIfNewElement(loaders, first.getClassLoader());\n- for (Class c : others) {\n- addIfNewElement(loaders, c.getClassLoader());\n- }\n- \n- // To support Eclipse Plug-in tests.\n- // In an Eclipse plug-in, we will not be on the system class loader\n- // but in the class loader of the plug-in.\n- //\n- // Note: I've been unable to reproduce the error in the test suite.\n- addIfNewElement(loaders, SearchingClassLoader.class.getClassLoader());\n- \n- // To support the Maven Surefire plugin.\n- // Note: I've been unable to reproduce the error in the test suite.\n- addIfNewElement(loaders, currentThread().getContextClassLoader());\n-\n- //Had to comment that out because it didn't work with in-container Spring tests\n- //addIfNewElement(loaders, ClassLoader.getSystemClassLoader());\n- \n- return combine(loaders);\n- }\n- \n- private static ClassLoader combine(List parentLoaders) {\n- ClassLoader loader = parentLoaders.get(parentLoaders.size()-1);\n- \n- for (int i = parentLoaders.size()-2; i >= 0; i--) {\n- loader = new SearchingClassLoader(parentLoaders.get(i), loader);\n- }\n- \n- return loader;\n- }\n- \n- private static void addIfNewElement(List loaders, ClassLoader c) {\n- if (c != null && !loaders.contains(c)) {\n- loaders.add(c);\n- }\n- }\n- \n- @Override\n- protected Class findClass(String name) throws ClassNotFoundException {\n- if (nextToSearch != null) {\n- return nextToSearch.loadClass(name);\n- } else {\n- return super.findClass(name); // will throw ClassNotFoundException\n- }\n- }\n-}\n\\ No newline at end of file\n"},"test_patch":{"kind":"null"},"split_random":{"kind":"string","value":"train"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-24T16:48:01","string":"2016-08-24T16:48:01"},"issue_created_at":{"kind":"timestamp","value":"2016-08-24T13:31:29Z","string":"2016-08-24T13:31:29Z"},"issue_by_user":{"kind":"string","value":"bric3"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":488,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/598_599"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/598"},"pr_id":{"kind":"string","value":"mockito/mockito/599"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=1302.0, similarity=0.873212348443918)","keyword_pr_to_issue"],"string":"[\n \"timestamp(timedelta=1302.0, similarity=0.873212348443918)\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"434579ef4b68311fc58bae28d6dfcae52a26350a"},"merge_commit":{"kind":"string","value":"6da1e65a4ea014b1594efc90ab0841b254efee2a"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":["@szczepiq you could use [`stripIndent`](http://mrhaki.blogspot.com/2010/06/groovy-goodness-strip-leading-spaces.html) for better readability here\n","check [out](https://git-scm.com/docs/git-check-mailmap) out git's `.mailmap`, might help in this case\n","Thanks for hint and review!!!\n\nI didn't know about this command. I've tried it but it does not give me github user id. However, it does seem interesting and it solves the problem of misspelled names / emails. Wanna help, PR! :)\n","I'll give it a shot next time. Thanks for the tip!!!\n\nI'm so used to used to just multi-line string that my brain does not even register that it is hard to read ;)\n"],"string":"[\n \"@szczepiq you could use [`stripIndent`](http://mrhaki.blogspot.com/2010/06/groovy-goodness-strip-leading-spaces.html) for better readability here\\n\",\n \"check [out](https://git-scm.com/docs/git-check-mailmap) out git's `.mailmap`, might help in this case\\n\",\n \"Thanks for hint and review!!!\\n\\nI didn't know about this command. I've tried it but it does not give me github user id. However, it does seem interesting and it solves the problem of misspelled names / emails. Wanna help, PR! :)\\n\",\n \"I'll give it a shot next time. Thanks for the tip!!!\\n\\nI'm so used to used to just multi-line string that my brain does not even register that it is hard to read ;)\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-08-25T16:37:30Z","string":"2016-08-25T16:37:30Z"},"labeled_as":{"kind":"list like","value":["continuous integration"],"string":"[\n \"continuous integration\"\n]"},"problem_title":{"kind":"string","value":"Generated release notes contain unsorted and duplicate committers"},"problem_statement":{"kind":"string","value":"Generated release notes contain unsorted and duplicate committers\n"},"gold_files":{"kind":"list like","value":["buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Commit.java","buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Contribution.java","buildSrc/src/main/groovy/org/mockito/release/notes/vcs/DefaultContributionSet.java","buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitCommit.java","buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitContributionsProvider.java"],"string":"[\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Commit.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Contribution.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/DefaultContributionSet.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitCommit.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitContributionsProvider.java\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Commit.java","buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Contribution.java","buildSrc/src/main/groovy/org/mockito/release/notes/vcs/DefaultContributionSet.java","buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitCommit.java","buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitContributionsProvider.java"],"string":"[\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Commit.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Contribution.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/DefaultContributionSet.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitCommit.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitContributionsProvider.java\"\n]"},"test_files":{"kind":"list like","value":["buildSrc/src/test/groovy/org/mockito/release/notes/vcs/ContributionTest.groovy","buildSrc/src/test/groovy/org/mockito/release/notes/vcs/DefaultContributionSetTest.groovy","buildSrc/src/test/groovy/org/mockito/release/notes/vcs/GitContributionsProviderTest.groovy"],"string":"[\n \"buildSrc/src/test/groovy/org/mockito/release/notes/vcs/ContributionTest.groovy\",\n \"buildSrc/src/test/groovy/org/mockito/release/notes/vcs/DefaultContributionSetTest.groovy\",\n \"buildSrc/src/test/groovy/org/mockito/release/notes/vcs/GitContributionsProviderTest.groovy\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Commit.java b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Commit.java\nindex ebe7913890..c6d9218bee 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Commit.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Commit.java\n@@ -7,12 +7,12 @@ public interface Commit {\n /**\n * Author identifier. For git it would be 'email'\n */\n- String getAuthorId();\n+ String getAuthorEmail();\n \n /**\n * Author display name. For git it would be 'author'\n */\n- String getAuthor();\n+ String getAuthorName();\n \n /**\n * Commit message\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Contribution.java b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Contribution.java\nindex b26290659b..5f83408445 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Contribution.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/Contribution.java\n@@ -7,28 +7,31 @@\n class Contribution implements Comparable {\n \n //email identifies the contributor, author alias not necessarily\n- final String authorId;\n- final String author;\n+ final String authorEmail;\n+ final String authorName;\n final List commits = new LinkedList();\n \n Contribution(Commit commit) {\n- authorId = commit.getAuthorId();\n- author = commit.getAuthor();\n+ authorEmail = commit.getAuthorEmail();\n+ authorName = commit.getAuthorName();\n commits.add(commit);\n }\n \n Contribution add(Commit commit) {\n- assert authorId.equals(commit.getAuthorId());\n commits.add(commit);\n return this;\n }\n \n public String toText() {\n- return commits.size() + \": \" + author;\n+ return commits.size() + \": \" + authorName;\n }\n \n public int compareTo(Contribution other) {\n- return Integer.valueOf(other.getCommits().size()).compareTo(commits.size());\n+ int byCommitCount = Integer.valueOf(other.getCommits().size()).compareTo(commits.size());\n+ if (byCommitCount != 0) {\n+ return byCommitCount;\n+ }\n+ return this.authorName.toUpperCase().compareTo(other.authorName.toUpperCase());\n }\n \n public Collection getCommits() {\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/DefaultContributionSet.java b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/DefaultContributionSet.java\nindex 65d27c33c0..d0c31fd452 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/DefaultContributionSet.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/DefaultContributionSet.java\n@@ -5,7 +5,9 @@\n import java.util.*;\n \n class DefaultContributionSet implements ContributionSet {\n- private final Map contributions = new HashMap();\n+\n+ private final List contributions = new LinkedList();\n+\n private final Collection commits = new LinkedList();\n private final Predicate ignoreCommit;\n private final Set tickets = new LinkedHashSet();\n@@ -20,12 +22,29 @@ void add(Commit commit) {\n }\n commits.add(commit);\n tickets.addAll(commit.getTickets());\n- Contribution c = contributions.get(commit.getAuthorId());\n- if (c == null) {\n- contributions.put(commit.getAuthorId(), new Contribution(commit));\n+\n+ Contribution existing = findContribution(commit, contributions);\n+ if (existing != null) {\n+ existing.add(commit);\n } else {\n- c.add(commit);\n+ contributions.add(new Contribution(commit));\n+ }\n+ }\n+\n+ private static Contribution findContribution(Commit commit, Iterable contributions) {\n+ for (Contribution c : contributions) {\n+ //From Git Log we don't know the GitHub user ID, only the email and name.\n+ //Sometimes contributors have different email addresses while the same name\n+ //This leads to awkward looking release notes, where same author is shown multiple times\n+ //We consider the contribution to be the same if any of: email or name is the same\n+ //\n+ //This approach comes with a caveat. What if the user have same author name, different email and indeed it is a different user?\n+ // This scenario is not handled well but it is unlikely and we consider it a trade-off\n+ if (c.authorEmail.equals(commit.getAuthorEmail()) || c.authorName.equals(commit.getAuthorName())) {\n+ return c;\n+ }\n }\n+ return null;\n }\n \n public Collection getAllCommits() {\n@@ -40,23 +59,11 @@ public String toText() {\n StringBuilder sb = new StringBuilder(\"* Authors: \").append(contributions.size())\n .append(\"\\n* Commits: \").append(commits.size());\n \n- for (Map.Entry entry : sortByValue(contributions)) {\n- Contribution c = entry.getValue();\n+ Collections.sort(contributions);\n+ for (Contribution c : contributions) {\n sb.append(\"\\n * \").append(c.toText());\n }\n \n return sb.toString();\n }\n-\n- public static > List> sortByValue(Map map) {\n- List> entries = new ArrayList>(map.entrySet());\n- Collections.sort(entries, new ByValue());\n- return entries;\n- }\n-\n- private static class ByValue> implements Comparator> {\n- public int compare(Map.Entry o1, Map.Entry o2) {\n- return o1.getValue().compareTo(o2.getValue());\n- }\n- }\n }\n\\ No newline at end of file\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitCommit.java b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitCommit.java\nindex 5c4f4973c2..f1dfc91669 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitCommit.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitCommit.java\n@@ -17,11 +17,11 @@ public GitCommit(String email, String author, String message) {\n this.tickets = TicketParser.parseTickets(message);\n }\n \n- public String getAuthorId() {\n+ public String getAuthorEmail() {\n return email;\n }\n \n- public String getAuthor() {\n+ public String getAuthorName() {\n return author;\n }\n \ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitContributionsProvider.java b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitContributionsProvider.java\nindex 93d5d78901..8e5ba8f050 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitContributionsProvider.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/vcs/GitContributionsProvider.java\n@@ -32,6 +32,7 @@ public ContributionSet getContributionsBetween(String fromRev, String toRev) {\n String email = entryParts[0].trim();\n String author = entryParts[1].trim();\n String message = entryParts[2].trim();\n+ LOG.info(\"Loaded commit - email: {}, author: {}, message (trimmed): {}\", email, author, message.replaceAll(\"\\n.*\", \"\"));\n contributions.add(new GitCommit(email, author, message));\n }\n }\n"},"test_patch":{"kind":"string","value":"diff --git a/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/ContributionTest.groovy b/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/ContributionTest.groovy\nindex 37d0bd0931..152f1ede5f 100644\n--- a/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/ContributionTest.groovy\n+++ b/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/ContributionTest.groovy\n@@ -8,8 +8,8 @@ class ContributionTest extends Specification {\n def c = new Contribution(new GitCommit(\"a@b\", \"lad\", \"m1\"))\n \n expect:\n- c.author == \"lad\"\n- c.authorId == \"a@b\"\n+ c.authorName == \"lad\"\n+ c.authorEmail == \"a@b\"\n c.toText() == \"1: lad\"\n \n when: c.add(new GitCommit(\"a@b\", \"lad\", \"m2\"))\n@@ -32,6 +32,16 @@ class ContributionTest extends Specification {\n set as List == [c3, c2, c1]\n }\n \n+ def \"sorted by commits and uppercase name\"() {\n+ def d = new Contribution(new GitCommit(\"d\", \"d\", \"\")).add(new GitCommit(\"d\", \"d\", \"\"))\n+ def c = new Contribution(new GitCommit(\"c\", \"c\", \"\"))\n+ def b = new Contribution(new GitCommit(\"B\", \"B\", \"\"))\n+ def a = new Contribution(new GitCommit(\"a\", \"a\", \"\"))\n+\n+ expect:\n+ new TreeSet([d, c, b, a]) as List == [d, a, b, c]\n+ }\n+\n def \"has String representation\"() {\n def c = new GitCommit(\"john.doe@gmail.com\", \"John Doe\", \"some message\")\n expect:\ndiff --git a/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/DefaultContributionSetTest.groovy b/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/DefaultContributionSetTest.groovy\nindex bac80a590a..26d73c5220 100644\n--- a/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/DefaultContributionSetTest.groovy\n+++ b/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/DefaultContributionSetTest.groovy\n@@ -49,6 +49,35 @@ class DefaultContributionSetTest extends Specification {\n then:\n c.size() == 1\n c[0].message == \"good one\"\n- c[0].author == \"A\"\n+ c[0].authorName == \"A\"\n+ }\n+\n+ def \"contributions by same author with different email\"() {\n+ contributions.add(new GitCommit(\"john@x\", \"john\", \"\"))\n+ contributions.add(new GitCommit(\"john@x\", \"john\", \"\"))\n+ contributions.add(new GitCommit(\"john@y\", \"john\", \"\")) //same person, different email\n+ contributions.add(new GitCommit(\"x@y\", \"x\", \"\")) //different person\n+\n+ expect:\n+ contributions.toText() == \"\"\"* Authors: 2\n+* Commits: 4\n+ * 3: john\n+ * 1: x\"\"\"\n+ }\n+\n+ def \"contributions sorted by name if number of commits the same\"() {\n+ contributions.add(new GitCommit(\"d@d\", \"d\", \"\"))\n+ contributions.add(new GitCommit(\"d@d\", \"d\", \"\"))\n+ contributions.add(new GitCommit(\"c@c\", \"c\", \"\"))\n+ contributions.add(new GitCommit(\"B@B\", \"B\", \"\"))\n+ contributions.add(new GitCommit(\"a@a\", \"a\", \"\"))\n+\n+ expect:\n+ contributions.toText() == \"\"\"* Authors: 4\n+* Commits: 5\n+ * 2: d\n+ * 1: a\n+ * 1: B\n+ * 1: c\"\"\"\n }\n }\ndiff --git a/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/GitContributionsProviderTest.groovy b/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/GitContributionsProviderTest.groovy\nindex b074506aea..8027e9344b 100644\n--- a/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/GitContributionsProviderTest.groovy\n+++ b/buildSrc/src/test/groovy/org/mockito/release/notes/vcs/GitContributionsProviderTest.groovy\n@@ -30,8 +30,8 @@ john@doe@@info@@John R. Doe@@info@@dummy commit\n \n and:\n def commits = c.allCommits as List\n- commits[0].author == \"Szczepan Faber\"\n- commits[0].authorId == \"szczepiq@gmail.com\"\n+ commits[0].authorName == \"Szczepan Faber\"\n+ commits[0].authorEmail == \"szczepiq@gmail.com\"\n commits[0].message == \"Tidy-up in buildSrc\\nnext line\"\n }\n \n"},"split_random":{"kind":"string","value":"val"},"split_time":{"kind":"string","value":"train"},"issue_start_time":{"kind":"timestamp","value":"2016-08-25T12:13:33","string":"2016-08-25T12:13:33"},"issue_created_at":{"kind":"timestamp","value":"2016-08-25T16:33:03Z","string":"2016-08-25T16:33:03Z"},"issue_by_user":{"kind":"string","value":"mockitoguy"},"split_repo":{"kind":"string","value":"train"}}},{"rowIdx":489,"cells":{"instance_id":{"kind":"string","value":"mockito/mockito/603_604"},"repo":{"kind":"string","value":"mockito/mockito"},"issue_id":{"kind":"string","value":"mockito/mockito/603"},"pr_id":{"kind":"string","value":"mockito/mockito/604"},"linking_methods":{"kind":"list like","value":["timestamp(timedelta=0.0, similarity=1.0000000000000002)","keyword_pr_to_issue"],"string":"[\n \"timestamp(timedelta=0.0, similarity=1.0000000000000002)\",\n \"keyword_pr_to_issue\"\n]"},"base_commit":{"kind":"string","value":"d32a754abd9bb457cd3146d480a42b76e3fcb179"},"merge_commit":{"kind":"string","value":"b669b4fa790171149b8383cc8f9c55cec32de934"},"hints_text":{"kind":"list like","value":[],"string":"[]"},"resolved_comments":{"kind":"list like","value":["I'd rename this to `Incompatible changes with v1.x`\n","Good idea. Thanks!\n"],"string":"[\n \"I'd rename this to `Incompatible changes with v1.x`\\n\",\n \"Good idea. Thanks!\\n\"\n]"},"created_at":{"kind":"timestamp","value":"2016-08-27T14:56:22Z","string":"2016-08-27T14:56:22Z"},"labeled_as":{"kind":"list like","value":["continuous integration"],"string":"[\n \"continuous integration\"\n]"},"problem_title":{"kind":"string","value":"Release notes group improvements by labels"},"problem_statement":{"kind":"string","value":"For clearer release notes overlook we should group improvements by labels. \n\nThis was originally contributed by @szpak, then lost during the early days of continuous integration, now it's back and it will rock!!!\n"},"gold_files":{"kind":"list like","value":["buildSrc/src/main/groovy/org/mockito/release/gradle/notes/ReleaseNotesExtension.groovy","buildSrc/src/main/groovy/org/mockito/release/notes/GitNotesBuilder.java","buildSrc/src/main/groovy/org/mockito/release/notes/NotesBuilder.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/DefaultImprovements.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubImprovementsProvider.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcher.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/Improvement.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/ImprovementsProvider.java","gradle/release.gradle"],"string":"[\n \"buildSrc/src/main/groovy/org/mockito/release/gradle/notes/ReleaseNotesExtension.groovy\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/GitNotesBuilder.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/NotesBuilder.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/DefaultImprovements.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubImprovementsProvider.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcher.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/Improvement.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/ImprovementsProvider.java\",\n \"gradle/release.gradle\"\n]"},"gold_files_postpatch":{"kind":"list like","value":["buildSrc/src/main/groovy/org/mockito/release/gradle/notes/ReleaseNotesExtension.groovy","buildSrc/src/main/groovy/org/mockito/release/notes/GitNotesBuilder.java","buildSrc/src/main/groovy/org/mockito/release/notes/NotesBuilder.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/DefaultImprovements.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubImprovementsProvider.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcher.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/Improvement.java","buildSrc/src/main/groovy/org/mockito/release/notes/improvements/ImprovementsProvider.java","buildSrc/src/main/groovy/org/mockito/release/util/MultiMap.java","gradle/release.gradle"],"string":"[\n \"buildSrc/src/main/groovy/org/mockito/release/gradle/notes/ReleaseNotesExtension.groovy\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/GitNotesBuilder.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/NotesBuilder.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/DefaultImprovements.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubImprovementsProvider.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcher.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/Improvement.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/notes/improvements/ImprovementsProvider.java\",\n \"buildSrc/src/main/groovy/org/mockito/release/util/MultiMap.java\",\n \"gradle/release.gradle\"\n]"},"test_files":{"kind":"list like","value":["buildSrc/src/test/groovy/org/mockito/release/notes/improvements/DefaultImprovementsTest.groovy","buildSrc/src/test/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcherTest.groovy","buildSrc/src/test/groovy/org/mockito/release/util/MultiMapTest.groovy"],"string":"[\n \"buildSrc/src/test/groovy/org/mockito/release/notes/improvements/DefaultImprovementsTest.groovy\",\n \"buildSrc/src/test/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcherTest.groovy\",\n \"buildSrc/src/test/groovy/org/mockito/release/util/MultiMapTest.groovy\"\n]"},"gold_patch":{"kind":"string","value":"diff --git a/buildSrc/src/main/groovy/org/mockito/release/gradle/notes/ReleaseNotesExtension.groovy b/buildSrc/src/main/groovy/org/mockito/release/gradle/notes/ReleaseNotesExtension.groovy\nindex 305609be99..05a6c47aaf 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/gradle/notes/ReleaseNotesExtension.groovy\n+++ b/buildSrc/src/main/groovy/org/mockito/release/gradle/notes/ReleaseNotesExtension.groovy\n@@ -17,6 +17,9 @@ class ReleaseNotesExtension {\n private final File workDir;\n private final String version;\n \n+ //TODO SF document the behavior\n+ Map labels = new LinkedHashMap()\n+\n ReleaseNotesExtension(File workDir, String version) {\n this.workDir = workDir\n this.version = version\n@@ -49,7 +52,7 @@ class ReleaseNotesExtension {\n def prev = \"v\" + getPreviousVersion()\n def current = \"HEAD\"\n LOG.lifecycle(\"Building notes for revisions: {} -> {}\", prev, current)\n- def newContent = builder.buildNotes(version, prev, current)\n+ def newContent = builder.buildNotes(version, prev, current, labels)\n newContent\n }\n \ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/GitNotesBuilder.java b/buildSrc/src/main/groovy/org/mockito/release/notes/GitNotesBuilder.java\nindex 071e550e35..352c603cab 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/GitNotesBuilder.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/GitNotesBuilder.java\n@@ -2,8 +2,8 @@\n \n import org.mockito.release.exec.Exec;\n import org.mockito.release.notes.improvements.ImprovementSet;\n-import org.mockito.release.notes.improvements.ImprovementsProvider;\n import org.mockito.release.notes.improvements.Improvements;\n+import org.mockito.release.notes.improvements.ImprovementsProvider;\n import org.mockito.release.notes.vcs.ContributionSet;\n import org.mockito.release.notes.vcs.ContributionsProvider;\n import org.mockito.release.notes.vcs.Vcs;\n@@ -12,6 +12,7 @@\n \n import java.io.File;\n import java.util.Date;\n+import java.util.Map;\n \n class GitNotesBuilder implements NotesBuilder {\n \n@@ -29,14 +30,14 @@ class GitNotesBuilder implements NotesBuilder {\n this.authTokenEnvVar = authTokenEnvVar;\n }\n \n- public String buildNotes(String version, String fromRevision, String toRevision) {\n+ public String buildNotes(String version, String fromRevision, String toRevision, Map labels) {\n LOG.info(\"Getting release notes between {} and {}\", fromRevision, toRevision);\n \n ContributionsProvider contributionsProvider = Vcs.getGitProvider(Exec.getProcessRunner(workDir));\n ContributionSet contributions = contributionsProvider.getContributionsBetween(fromRevision, toRevision);\n \n ImprovementsProvider improvementsProvider = Improvements.getGitHubProvider(authTokenEnvVar);\n- ImprovementSet improvements = improvementsProvider.getImprovements(contributions);\n+ ImprovementSet improvements = improvementsProvider.getImprovements(contributions, labels);\n \n return new NotesPrinter().printNotes(version, new Date(), contributions, improvements);\n }\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/NotesBuilder.java b/buildSrc/src/main/groovy/org/mockito/release/notes/NotesBuilder.java\nindex 7c3cee6c4d..10da616846 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/NotesBuilder.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/NotesBuilder.java\n@@ -1,5 +1,7 @@\n package org.mockito.release.notes;\n \n+import java.util.Map;\n+\n /**\n * Builds the release notes text\n */\n@@ -11,6 +13,8 @@ public interface NotesBuilder {\n * @param version the version of the release we're building the notes\n * @param fromRevision valid git revision (can be tag name or HEAD)\n * @param toRevision valid git revision (can be tag name or HEAD)\n+ * @param labels GitHub labels to caption mapping\n+ * TODO SF the labels better, currently they are coupled way too much with more generic interfaces, vcs agnostic\n */\n- String buildNotes(String version, String fromRevision, String toRevision);\n+ String buildNotes(String version, String fromRevision, String toRevision, Map labels);\n }\n\\ No newline at end of file\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/DefaultImprovements.java b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/DefaultImprovements.java\nindex bf7d55520a..dc605aeb68 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/DefaultImprovements.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/DefaultImprovements.java\n@@ -1,29 +1,73 @@\n package org.mockito.release.notes.improvements;\n \n-import java.util.LinkedList;\n-import java.util.List;\n+import org.mockito.release.util.MultiMap;\n \n+import java.util.*;\n+\n+//TODO SF split the formatting from the data structure\n class DefaultImprovements implements ImprovementSet {\n \n- private final List improvements = new LinkedList();\n+ final List improvements = new LinkedList();\n+ private final Map labels;\n+\n+ public DefaultImprovements(Map labels) {\n+ this.labels = labels;\n+ }\n \n public String toText() {\n if (improvements.isEmpty()) {\n- //TODO SF we should break the build if there are no notable improvements yet the binaries have changed\n return \"* No notable improvements. See the commits for detailed changes.\";\n }\n StringBuilder sb = new StringBuilder(\"* Improvements: \").append(improvements.size());\n- for (Improvement i : improvements) {\n- sb.append(\"\\n * \").append(i.toText());\n+ MultiMap byLabel = new MultiMap();\n+ Set remainingImprovements = new LinkedHashSet(improvements);\n+\n+ //Step 1, find improvements that match input labels\n+ //Iterate label first because the input labels determine the order\n+ for (String label : labels.keySet()) {\n+ for (Improvement i : improvements) {\n+ if (i.labels.contains(label) && remainingImprovements.contains(i)) {\n+ remainingImprovements.remove(i);\n+ byLabel.put(label, i);\n+ }\n+ }\n+ }\n+\n+ //Step 2, print out the improvements that match input labels\n+ for (String label : byLabel.keySet()) {\n+ String labelCaption = labels.get(label);\n+ Collection labelImprovements = byLabel.get(label);\n+ sb.append(\"\\n * \").append(labelCaption).append(\": \").append(labelImprovements.size());\n+ for (Improvement i : labelImprovements) {\n+ sb.append(\"\\n * \").append(i.toText());\n+ }\n+ }\n+\n+ //Step 3, print out remaining changes\n+ if (!remainingImprovements.isEmpty()) {\n+ String indent;\n+ //We want clean view depending if there are labelled improvements or not\n+ if (byLabel.size() > 0) {\n+ indent = \" \";\n+ sb.append(\"\\n * Remaining changes: \").append(remainingImprovements.size());\n+ } else {\n+ indent = \"\";\n+ }\n+\n+ for (Improvement i : remainingImprovements) {\n+ sb.append(\"\\n\").append(indent).append(\" * \").append(i.toText());\n+ }\n }\n return sb.toString();\n }\n \n- public void add(Improvement improvement) {\n+ public DefaultImprovements add(Improvement improvement) {\n improvements.add(improvement);\n+ return this;\n }\n \n- public void addAll(List improvements) {\n+ public DefaultImprovements addAll(List improvements) {\n this.improvements.addAll(improvements);\n+ return this;\n }\n }\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubImprovementsProvider.java b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubImprovementsProvider.java\nindex c81e2c70ff..8258f6964a 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubImprovementsProvider.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubImprovementsProvider.java\n@@ -4,6 +4,8 @@\n import org.slf4j.Logger;\n import org.slf4j.LoggerFactory;\n \n+import java.util.Map;\n+\n class GitHubImprovementsProvider implements ImprovementsProvider {\n \n private static final Logger LOGGER = LoggerFactory.getLogger(GitHubImprovementsProvider.class);\n@@ -13,9 +15,9 @@ public GitHubImprovementsProvider(String authToken) {\n this.authToken = authToken;\n }\n \n- public ImprovementSet getImprovements(ContributionSet contributions) {\n+ public ImprovementSet getImprovements(ContributionSet contributions, Map labels) {\n LOGGER.info(\"Parsing {} commits with {} tickets\", contributions.getAllCommits().size(), contributions.getAllTickets().size());\n- DefaultImprovements out = new DefaultImprovements();\n+ DefaultImprovements out = new DefaultImprovements(labels);\n new GitHubTicketFetcher().fetchTickets(authToken, contributions.getAllTickets(), out);\n return out;\n }\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcher.java b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcher.java\nindex f3e3396f92..fcce09f99a 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcher.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcher.java\n@@ -1,22 +1,18 @@\n package org.mockito.release.notes.improvements;\n \n-import java.io.IOException;\n-import java.io.InputStream;\n-import java.net.URL;\n-import java.net.URLConnection;\n-import java.util.ArrayList;\n-import java.util.Collection;\n-import java.util.Collections;\n-import java.util.HashSet;\n-import java.util.List;\n-import java.util.PriorityQueue;\n-import java.util.Queue;\n+import org.json.simple.JSONArray;\n import org.json.simple.JSONObject;\n import org.json.simple.JSONValue;\n import org.mockito.release.notes.util.IOUtil;\n import org.slf4j.Logger;\n import org.slf4j.LoggerFactory;\n \n+import java.io.IOException;\n+import java.io.InputStream;\n+import java.net.URL;\n+import java.net.URLConnection;\n+import java.util.*;\n+\n class GitHubTicketFetcher {\n \n private static final Logger LOG = LoggerFactory.getLogger(GitHubTicketFetcher.class);\n@@ -70,6 +66,7 @@ private Queue queuedTicketNumbers(Collection ticketIds) {\n return longs;\n }\n \n+ //TODO SF we should be able to unit test the code that parsers JSONObjects\n private List wantedImprovements(Collection tickets, List issues) {\n if(tickets.isEmpty()) {\n return Collections.emptyList();\n@@ -81,7 +78,8 @@ private List wantedImprovements(Collection tickets, List()));\n+ Collection labels = extractLabels(issue);\n+ pagedImprovements.add(new Improvement(id, title, issueUrl, labels));\n \n if (tickets.isEmpty()) {\n return pagedImprovements;\n@@ -91,6 +89,15 @@ private List wantedImprovements(Collection tickets, List extractLabels(JSONObject issue) {\n+ Set out = new HashSet();\n+ JSONArray labels = (JSONArray) issue.get(\"labels\");\n+ for (Object o : labels.toArray()) {\n+ JSONObject label = (JSONObject) o;\n+ out.add((String) label.get(\"name\"));\n+ }\n+ return out;\n+ }\n \n private static class GitHubIssues {\n public static final String RELATIVE_LINK_NOT_FOUND = \"none\";\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/Improvement.java b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/Improvement.java\nindex 4df57c3ad2..b5d7329cb5 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/Improvement.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/Improvement.java\n@@ -4,10 +4,10 @@\n \n class Improvement {\n \n- private final long id;\n+ private final long id; //TODO SF String\n private final String title;\n private final String url;\n- private final Collection labels;\n+ final Collection labels;\n \n public Improvement(long id, String title, String url, Collection labels) {\n this.id = id;\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/ImprovementsProvider.java b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/ImprovementsProvider.java\nindex ca459628a1..f6e0c73529 100644\n--- a/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/ImprovementsProvider.java\n+++ b/buildSrc/src/main/groovy/org/mockito/release/notes/improvements/ImprovementsProvider.java\n@@ -2,7 +2,9 @@\n \n import org.mockito.release.notes.vcs.ContributionSet;\n \n+import java.util.Map;\n+\n public interface ImprovementsProvider {\n \n- ImprovementSet getImprovements(ContributionSet contributions);\n+ ImprovementSet getImprovements(ContributionSet contributions, Map labels);\n }\ndiff --git a/buildSrc/src/main/groovy/org/mockito/release/util/MultiMap.java b/buildSrc/src/main/groovy/org/mockito/release/util/MultiMap.java\nnew file mode 100644\nindex 0000000000..59b54e3169\n--- /dev/null\n+++ b/buildSrc/src/main/groovy/org/mockito/release/util/MultiMap.java\n@@ -0,0 +1,35 @@\n+package org.mockito.release.util;\n+\n+import java.util.*;\n+\n+/**\n+ * Basic multi-map that contains multiple values per key\n+ */\n+public class MultiMap {\n+\n+ private final Map> data = new LinkedHashMap>();\n+\n+ /**\n+ * If the key does not exist, null is returned\n+ */\n+ public Collection get(K key) {\n+ return data.get(key);\n+ }\n+\n+ public void put(K key, V value) {\n+ Collection elements = get(key);\n+ if (elements == null) {\n+ elements = new LinkedHashSet();\n+ }\n+ elements.add(value);\n+ data.put(key, elements);\n+ }\n+\n+ public Set keySet() {\n+ return data.keySet();\n+ }\n+\n+ public int size() {\n+ return data.size();\n+ }\n+}\ndiff --git a/gradle/release.gradle b/gradle/release.gradle\nindex 5b0c5e9701..c2913179f0 100644\n--- a/gradle/release.gradle\n+++ b/gradle/release.gradle\n@@ -25,7 +25,19 @@ apply plugin: 'release-notes'\n apply plugin: 'release'\n \n notes {\n- notesFile = project.file(\"doc/release-notes/official.md\")\n+ notesFile = file(\"doc/release-notes/official.md\")\n+ //label captions, in order of importance - this is the order they will appear in the release notes\n+ labels = [\n+ '1.* incompatible': 'Incompatible changes with previous major version (v1.x)',\n+ 'java-9': \"Java 9 support\",\n+ 'java-8': \"Java 8 support\",\n+ 'new feature': \"New features\",\n+ 'BDD': 'Behavior-Driven Development support',\n+ 'bug': \"Bugfixes\",\n+ 'enhancement': \"Enhancements\",\n+ 'android': \"Android support\",\n+ 'docs': 'Documentation'\n+ ]\n }\n \n def dryRun = project.hasProperty('dryRun')\n"},"test_patch":{"kind":"string","value":"diff --git a/buildSrc/src/test/groovy/org/mockito/release/notes/improvements/DefaultImprovementsTest.groovy b/buildSrc/src/test/groovy/org/mockito/release/notes/improvements/DefaultImprovementsTest.groovy\nindex 5557bb3610..410a96cfe0 100644\n--- a/buildSrc/src/test/groovy/org/mockito/release/notes/improvements/DefaultImprovementsTest.groovy\n+++ b/buildSrc/src/test/groovy/org/mockito/release/notes/improvements/DefaultImprovementsTest.groovy\n@@ -1,28 +1,69 @@\n package org.mockito.release.notes.improvements\n \n import spock.lang.Specification\n-import spock.lang.Subject\n \n class DefaultImprovementsTest extends Specification {\n \n- @Subject improvements = new DefaultImprovements()\n-\n def \"empty improvements\"() {\n expect:\n- improvements.toText() == \"* No notable improvements. See the commits for detailed changes.\"\n+ new DefaultImprovements([:]).toText() == \"* No notable improvements. See the commits for detailed changes.\"\n }\n \n- def \"with improvements\"() {\n- improvements.add(new Improvement(100, \"Fix bug x\", \"http://issues/100\", [\"bug\"]))\n- improvements.add(new Improvement(122, \"Javadoc update\", \"http://url/122\", []))\n- improvements.add(new Improvement(125, \"Some enh\", \"http://issues/125\", [\"enhancement\", \"custom\"]))\n- improvements.add(new Improvement(126, \"Some other enh\", \"http://issues/126\", [\"enhancement\"]))\n+ def \"set of improvements in order\"() {\n+ def is = new DefaultImprovements([bug: \"Bugfixes\", enhancement: \"Enhancements\"])\n+ .add(new Improvement(100, \"Fix bug x\", \"http://issues/100\", [\"bug\"]))\n+ .add(new Improvement(122, \"Javadoc update\", \"http://url/122\", []))\n+ .add(new Improvement(125, \"Some enh\", \"http://issues/125\", [\"java-8\", \"enhancement\", \"bug\"]))\n+ .add(new Improvement(126, \"Some other enh\", \"http://issues/126\", [\"enhancement\"]))\n+ .add(new Improvement(130, \"Refactoring\", \"http://issues/130\", [\"java-8\", \"refactoring\"]))\n \n expect:\n- improvements.toText() == \"\"\"* Improvements: 4\n- * Fix bug x [(#100)](http://issues/100)\n- * Javadoc update [(#122)](http://url/122)\n- * Some enh [(#125)](http://issues/125)\n- * Some other enh [(#126)](http://issues/126)\"\"\"\n+ is.toText() == \"\"\"* Improvements: 5\n+ * Bugfixes: 2\n+ * Fix bug x [(#100)](http://issues/100)\n+ * Some enh [(#125)](http://issues/125)\n+ * Enhancements: 1\n+ * Some other enh [(#126)](http://issues/126)\n+ * Remaining changes: 2\n+ * Javadoc update [(#122)](http://url/122)\n+ * Refactoring [(#130)](http://issues/130)\"\"\"\n+ }\n+\n+ def \"no matching labels\"() {\n+ given:\n+ def is = new DefaultImprovements([bug: \"Bugfixes\"])\n+ .add(new Improvement(10, \"Issue 10\", \"10\", []))\n+\n+ expect: \"the formatting is simplified\"\n+ is.toText() == \"\"\"* Improvements: 1\n+ * Issue 10 [(#10)](10)\"\"\"\n+ }\n+\n+ def \"no duplicated improvements\"() {\n+ given:\n+ def is = new DefaultImprovements([bug: \"Bugfixes\", refactoring: \"Refactorings\"])\n+ .add(new Improvement(10, \"Issue 10\", \"10\", [\"bug\", \"refactoring\"]))\n+ .add(new Improvement(11, \"Issue 11\", \"11\", [\"refactoring\", \"bug\"]))\n+\n+ expect: \"no duplication even though labels are overused\"\n+ is.toText() == \"\"\"* Improvements: 2\n+ * Bugfixes: 2\n+ * Issue 10 [(#10)](10)\n+ * Issue 11 [(#11)](11)\"\"\"\n+ }\n+\n+ def \"the order of labels is determined\"() {\n+ given:\n+ //input label captions determine the order of labels:\n+ def labels = [p0: \"Priority 0\", p1: \"Priority 1\"]\n+ def imp1 = new Improvement(10, \"Issue 10\", \"10\", [\"p0\"])\n+ def imp2 = new Improvement(11, \"Issue 11\", \"11\", [\"p1\"])\n+\n+ when:\n+ def improvements = new DefaultImprovements(labels).addAll([imp1, imp2]).toText()\n+ def reordered = new DefaultImprovements(labels).addAll([imp2, imp1]).toText()\n+\n+ then: \"The order of labels is determined\"\n+ improvements == reordered\n }\n }\ndiff --git a/buildSrc/src/test/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcherTest.groovy b/buildSrc/src/test/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcherTest.groovy\nindex 9021379993..3a41b136bb 100644\n--- a/buildSrc/src/test/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcherTest.groovy\n+++ b/buildSrc/src/test/groovy/org/mockito/release/notes/improvements/GitHubTicketFetcherTest.groovy\n@@ -10,12 +10,15 @@ class GitHubTicketFetcherTest extends Specification {\n \n @Subject fetcher = new GitHubTicketFetcher()\n \n- //TODO SF tidy up this and the test subject\n+ //This is an integration test\n+ //It's not ideal but it gives us a good smoke test\n+ //So far it is not problematic to maintain :)\n def \"fetches improvements from GitHub\"() {\n- def impr = new DefaultImprovements()\n+ def impr = new DefaultImprovements([:])\n def readOnlyToken = \"a0a4c0f41c200f7c653323014d6a72a127764e17\"\n when: fetcher.fetchTickets(readOnlyToken, ['109', '108', '99999', '112'], impr)\n then:\n+ impr.improvements.get(0).labels == [\"enhancement\"] as Set\n impr.toText() == \"\"\"* Improvements: 2\n * Allow instances of other classes in AdditionalAnswers.delegatesTo [(#112)](https://github.com/mockito/mockito/issues/112)\n * Clarify Spy vs Mock CALLS_REAL_METHODS [(#108)](https://github.com/mockito/mockito/issues/108)\"\"\"\ndiff --git a/buildSrc/src/test/groovy/org/mockito/release/util/MultiMapTest.groovy b/buildSrc/src/test/groovy/org/mockito/release/util/MultiMapTest.groovy\nnew file mode 100644\nindex 0000000000..5a7b03fe48\n--- /dev/null\n+++ b/buildSrc/src/test/groovy/org/mockito/release/util/MultiMapTest.groovy\n@@ -0,0 +1,30 @@\n+package org.mockito.release.util\n+\n+import spock.lang.Specification\n+\n+class MultiMapTest extends Specification {\n+\n+ def \"empty multi map\"() {\n+ def map = new MultiMap