java-defects4j-mockito-19-namebasedcandidatefilter

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before…lines 1–16 unchanged (16 lines)
17
public NameBasedCandidateFilter(MockCandidateFilter next) {
this.next = next;
}
21
public OngoingInjecter filterCandidate(Collection<Object> mocks,
	Field field, Object fieldInstance) {
List<Object> mockNameMatches = new ArrayList<Object>();
if (mocks.size() > 1) {
	for (Object mock : mocks) {
		if (field.getName().equals(mockUtil.getMockName(mock).toString())) {
			mockNameMatches.add(mock);
		}
	}
	return next.filterCandidate(mockNameMatches, field,
			fieldInstance);
	/*
	 * In this case we have to check whether we have conflicting naming
	 * fields. E.g. 2 fields of the same type, but we have to make sure
	 * we match on the correct name.
	 * 
	 * Therefore we have to go through all other fields and make sure
	 * whenever we find a field that does match its name with the mock
	 * name, we should take that field instead.
	 */
}
return next.filterCandidate(mocks, field, fieldInstance);
}
45}
46

After…lines 1–16 unchanged (16 lines)
17
public NameBasedCandidateFilter(MockCandidateFilter next) {
this.next = next;
}
21
public OngoingInjecter filterCandidate(Collection<Object> mocks,
	Field field, List<Field> fields, Object fieldInstance) {
List<Object> mockNameMatches = new ArrayList<Object>();
if (mocks.size() > 1) {
	for (Object mock : mocks) {
		if (field.getName().equals(mockUtil.getMockName(mock).toString())) {
			mockNameMatches.add(mock);
		}
	}
	return next.filterCandidate(mockNameMatches, field, fields,
			fieldInstance);
	/*
	 * In this case we have to check whether we have conflicting naming
	 * fields. E.g. 2 fields of the same type, but we have to make sure
	 * we match on the correct name.
	 * 
	 * Therefore we have to go through all other fields and make sure
	 * whenever we find a field that does match its name with the mock
	 * name, we should take that field instead.
	 */
} else if (mocks.size() == 1) {
	String mockName = mockUtil.getMockName(mocks.iterator().next())
			.toString();
45
	for (Field otherField : fields) {
		if (!otherField.equals(field)
				&& otherField.getType().equals(field.getType())
				&& otherField.getName().equals(mockName)) {
50
			return new OngoingInjecter() {
				public Object thenInject() {
					return null;
				}
			};
		}
	}
}
return next.filterCandidate(mocks, field, fields, fieldInstance);
}
61}
62

Before…lines 1–16 unchanged (16 lines)
17
public NameBasedCandidateFilter(MockCandidateFilter next) {
this.next = next;
}
21
public OngoingInjecter filterCandidate(Collection<Object> mocks,
	Field field, Object fieldInstance) {
List<Object> mockNameMatches = new ArrayList<Object>();
if (mocks.size() > 1) {
	for (Object mock : mocks) {
		if (field.getName().equals(mockUtil.getMockName(mock).toString())) {
			mockNameMatches.add(mock);
		}
	}
	return next.filterCandidate(mockNameMatches, field,
			fieldInstance);
	/*
	 * In this case we have to check whether we have conflicting naming
	 * fields. E.g. 2 fields of the same type, but we have to make sure
	 * we match on the correct name.
	 * 
	 * Therefore we have to go through all other fields and make sure
	 * whenever we find a field that does match its name with the mock
	 * name, we should take that field instead.
	 */
}
return next.filterCandidate(mocks, field, fieldInstance);
}
45}
46

After…lines 1–16 unchanged (16 lines)
17
public NameBasedCandidateFilter(MockCandidateFilter next) {
this.next = next;
}
21
public OngoingInjecter filterCandidate(Collection<Object> mocks,
	Field field, List<Field> fields, Object fieldInstance) {
List<Object> mockNameMatches = new ArrayList<Object>();
if (mocks.size() > 1) {
	for (Object mock : mocks) {
		if (field.getName().equals(mockUtil.getMockName(mock).toString())) {
			mockNameMatches.add(mock);
		}
	}
	return next.filterCandidate(mockNameMatches, field, fields,
			fieldInstance);
	/*
	 * In this case we have to check whether we have conflicting naming
	 * fields. E.g. 2 fields of the same type, but we have to make sure
	 * we match on the correct name.
	 * 
	 * Therefore we have to go through all other fields and make sure
	 * whenever we find a field that does match its name with the mock
	 * name, we should take that field instead.
	 */
} else if (mocks.size() == 1) {
	String mockName = mockUtil.getMockName(mocks.iterator().next())
			.toString();
45
	for (Field otherField : fields) {
		if (!otherField.equals(field)
				&& otherField.getType().equals(field.getType())
				&& otherField.getName().equals(mockName)) {
50
			return new OngoingInjecter() {
				public Object thenInject() {
					return null;
				}
			};
		}
	}
}
return next.filterCandidate(mocks, field, fields, fieldInstance);
}
61}
62

Before…lines 1–16 unchanged (16 lines)
17
public NameBasedCandidateFilter(MockCandidateFilter next) {
this.next = next;
}
21
public OngoingInjecter filterCandidate(Collection<Object> mocks,
	Field field, Object fieldInstance) {
List<Object> mockNameMatches = new ArrayList<Object>();
if (mocks.size() > 1) {
	for (Object mock : mocks) {
		if (field.getName().equals(mockUtil.getMockName(mock).toString())) {
			mockNameMatches.add(mock);
		}
	}
	return next.filterCandidate(mockNameMatches, field,
			fieldInstance);
	/*
	 * In this case we have to check whether we have conflicting naming
	 * fields. E.g. 2 fields of the same type, but we have to make sure
	 * we match on the correct name.
	 * 
	 * Therefore we have to go through all other fields and make sure
	 * whenever we find a field that does match its name with the mock
	 * name, we should take that field instead.
	 */
}
return next.filterCandidate(mocks, field, fieldInstance);
}
45}
46

After…lines 1–16 unchanged (16 lines)
17
public NameBasedCandidateFilter(MockCandidateFilter next) {
this.next = next;
}
21
public OngoingInjecter filterCandidate(Collection<Object> mocks,
	Field field, List<Field> fields, Object fieldInstance) {
List<Object> mockNameMatches = new ArrayList<Object>();
if (mocks.size() > 1) {
	for (Object mock : mocks) {
		if (field.getName().equals(mockUtil.getMockName(mock).toString())) {
			mockNameMatches.add(mock);
		}
	}
	return next.filterCandidate(mockNameMatches, field, fields,
			fieldInstance);
	/*
	 * In this case we have to check whether we have conflicting naming
	 * fields. E.g. 2 fields of the same type, but we have to make sure
	 * we match on the correct name.
	 * 
	 * Therefore we have to go through all other fields and make sure
	 * whenever we find a field that does match its name with the mock
	 * name, we should take that field instead.
	 */
} else if (mocks.size() == 1) {
	String mockName = mockUtil.getMockName(mocks.iterator().next())
			.toString();
45
	for (Field otherField : fields) {
		if (!otherField.equals(field)
				&& otherField.getType().equals(field.getType())
				&& otherField.getName().equals(mockName)) {
50
			return new OngoingInjecter() {
				public Object thenInject() {
					return null;
				}
			};
		}
	}
}
return next.filterCandidate(mocks, field, fields, fieldInstance);
}
61}
62

Before

program

package_declaration

package "package"

scoped_identifier

identifier "org"

. "."

identifier "mockito"

. "."

identifier "internal"

. "."

identifier "configuration"

. "."

identifier "injection"

. "."

identifier "filter"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "org"

. "."

identifier "mockito"

. "."

identifier "internal"

. "."

identifier "util"

. "."

identifier "MockUtil"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "java"

. "."

identifier "lang"

. "."

identifier "reflect"

. "."

identifier "Field"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "java"

. "."

identifier "util"

. "."

identifier "ArrayList"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "java"

. "."

identifier "util"

. "."

identifier "Collection"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "java"

. "."

identifier "util"

. "."

identifier "List"

; ";"

class_declaration

modifiers

public "public"

class "class"

identifier "NameBasedCandidateFilter"

super_interfaces

implements "implements"

type_list

type_identifier "MockCandidateFilter"

class_body

{ "{"

field_declaration

modifiers

private "private"

final "final"

type_identifier "MockCandidateFilter"

variable_declarator

identifier "next"

; ";"

field_declaration

modifiers

private "private"

final "final"

type_identifier "MockUtil"

variable_declarator

identifier "mockUtil"

= "="

object_creation_expression

new "new"

type_identifier "MockUtil"

argument_list

( "("

) ")"

; ";"

constructor_declaration (+22 nodes collapsed)

method_declaration

modifiers

public "public"

type_identifier "OngoingInjecter"

identifier "filterCandidate"

formal_parameters

( "("

formal_parameter

generic_type

type_identifier "Collection"

type_arguments

< "<"

type_identifier "Object"

> ">"

identifier "mocks"

, ","

formal_parameter

type_identifier "Field"

identifier "field"

, ","

formal_parameter

type_identifier "Object"

identifier "fieldInstance"

) ")"

block

{ "{"

local_variable_declaration (+22 nodes collapsed)

if_statement

if "if"

parenthesized_expression

( "("

binary_expression

method_invocation

identifier "mocks"

. "."

identifier "size"

argument_list

( "("

) ")"

> ">"

decimal_integer_literal "1"

) ")"

block

{ "{"

enhanced_for_statement (+56 nodes collapsed)

return_statement

return "return"

method_invocation

identifier "next"

. "."

identifier "filterCandidate"

argument_list

( "("

identifier "mockNameMatches"

, ","

identifier "field"

, ","

identifier "fieldInstance"

) ")"

; ";"

block_comment "/*\n\t\t\t * In this case we have to check whether we have confl"...

} "}"

return_statement

return "return"

method_invocation

identifier "next"

. "."

identifier "filterCandidate"

argument_list

( "("

identifier "mocks"

, ","

identifier "field"

, ","

identifier "fieldInstance"

) ")"

; ";"

} "}"

After

program

package_declaration

package "package"

scoped_identifier

identifier "org"

. "."

identifier "mockito"

. "."

identifier "internal"

. "."

identifier "configuration"

. "."

identifier "injection"

. "."

identifier "filter"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "org"

. "."

identifier "mockito"

. "."

identifier "internal"

. "."

identifier "util"

. "."

identifier "MockUtil"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "java"

. "."

identifier "lang"

. "."

identifier "reflect"

. "."

identifier "Field"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "java"

. "."

identifier "util"

. "."

identifier "ArrayList"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "java"

. "."

identifier "util"

. "."

identifier "Collection"

; ";"

import_declaration

import "import"

scoped_identifier

identifier "java"

. "."

identifier "util"

. "."

identifier "List"

; ";"

class_declaration

modifiers

public "public"

class "class"

identifier "NameBasedCandidateFilter"

super_interfaces

implements "implements"

type_list

type_identifier "MockCandidateFilter"

class_body

{ "{"

field_declaration

modifiers

private "private"

final "final"

type_identifier "MockCandidateFilter"

variable_declarator

identifier "next"

; ";"

field_declaration

modifiers

private "private"

final "final"

type_identifier "MockUtil"

variable_declarator

identifier "mockUtil"

= "="

object_creation_expression

new "new"

type_identifier "MockUtil"

argument_list

( "("

) ")"

; ";"

constructor_declaration (+22 nodes collapsed)

method_declaration

modifiers

public "public"

type_identifier "OngoingInjecter"

identifier "filterCandidate"

formal_parameters

( "("

formal_parameter

generic_type

type_identifier "Collection"

type_arguments

< "<"

type_identifier "Object"

> ">"

identifier "mocks"

, ","

formal_parameter

type_identifier "Field"

identifier "field"

, ","

formal_parameter

generic_type

type_identifier "List"

type_arguments

< "<"

type_identifier "Field"

> ">"

identifier "fields"

, ","

formal_parameter

type_identifier "Object"

identifier "fieldInstance"

) ")"

block

{ "{"

local_variable_declaration (+22 nodes collapsed)

if_statement

if "if"

parenthesized_expression

( "("

binary_expression

method_invocation

identifier "mocks"

. "."

identifier "size"

argument_list

( "("

) ")"

> ">"

decimal_integer_literal "1"

) ")"

block

{ "{"

enhanced_for_statement (+56 nodes collapsed)

return_statement

return "return"

method_invocation

identifier "next"

. "."

identifier "filterCandidate"

argument_list

( "("

identifier "mockNameMatches"

, ","

identifier "field"

, ","

identifier "fields"

, ","

identifier "fieldInstance"

) ")"

; ";"

block_comment "/*\n\t\t\t * In this case we have to check whether we have confl"...

} "}"

else "else"

if_statement

if "if"

parenthesized_expression

( "("

binary_expression

method_invocation

identifier "mocks"

. "."

identifier "size"

argument_list

( "("

) ")"

== "=="

decimal_integer_literal "1"

) ")"

block

{ "{"

local_variable_declaration

type_identifier "String"

variable_declarator

identifier "mockName"

= "="

method_invocation

identifier "mockUtil"

. "."

identifier "getMockName"

argument_list

( "("

method_invocation

identifier "mocks"

. "."

identifier "iterator"

argument_list

( "("

) ")"

. "."

identifier "next"

argument_list

( "("

) ")"

. "."

identifier "toString"

argument_list

( "("

) ")"

; ";"

enhanced_for_statement

for "for"

( "("

type_identifier "Field"

identifier "otherField"

: ":"

identifier "fields"

) ")"

block

{ "{"

if_statement

if "if"

parenthesized_expression

( "("

binary_expression

unary_expression

! "!"

method_invocation

identifier "otherField"

. "."

identifier "equals"

argument_list

( "("

identifier "field"

) ")"

&& "&&"

method_invocation

identifier "otherField"

. "."

identifier "getType"

argument_list

( "("

) ")"

. "."

identifier "equals"

argument_list

( "("

method_invocation

identifier "field"

. "."

identifier "getType"

argument_list

( "("

) ")"

&& "&&"

method_invocation

identifier "otherField"

. "."

identifier "getName"

argument_list

( "("

) ")"

. "."

identifier "equals"

argument_list

( "("

identifier "mockName"

) ")"

block

{ "{"

return_statement

return "return"

object_creation_expression

new "new"

type_identifier "OngoingInjecter"

argument_list

( "("

) ")"

class_body

{ "{"

method_declaration

modifiers

public "public"

type_identifier "Object"

identifier "thenInject"

formal_parameters

( "("

) ")"

block

{ "{"

return_statement

return "return"

null_literal "null"

; ";"

} "}"

; ";"

} "}"

return_statement

return "return"

method_invocation

identifier "next"

. "."

identifier "filterCandidate"

argument_list

( "("

identifier "mocks"

, ","

identifier "field"

, ","

identifier "fields"

, ","

identifier "fieldInstance"

) ")"

; ";"

} "}"