Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-1172 - Polishing.

Browse Source 
Fixed typo. Changed order of assertions to avoid NullPointerException. Removed unused field. Replaced deprecated anyObject() with any(). Used diamond operator instead of explicit generics. Used Collections.emptyList() instead of Arrays.asList(…).

Original pull request: #216.
This commit is contained in:
Jens Schauder
2017-09-06 17:29:46 +02:00
committed by Oliver Gierke
parent e072a56a27
commit 32c308db3e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
View File

@@ -1241,8 +1241,9 @@ public class UserRepositoryTests {
flushTestUsers();
byte[] result = repository.findBinaryDataByIdNative(firstUser.getId());
assertThat(result.length).isEqualTo(data.length);
assertThat(result).isEqualTo(data);
assertThat(result.length).isEqualTo(data.length);
}
@Test // DATAJPA-456
@@ -1598,7 +1599,7 @@ public class UserRepositoryTests {
flushTestUsers();
List<User> users = repository.findByAttributesIn(new HashSet<String>());
List<User> users = repository.findByAttributesIn(new HashSet<>());
assertThat(users).hasSize(0);
}
@@ -1607,7 +1608,7 @@ public class UserRepositoryTests {
flushTestUsers();
List<User> users = repository.findByAgeIn(Arrays.<Integer> asList());
List<User> users = repository.findByAgeIn(Collections.emptyList());
assertThat(users).hasSize(0);
}
@@ -2038,7 +2039,7 @@ public class UserRepositoryTests {
}
@Test // DATAJPA-905
public void excutesPagedSpecificationSettingAnOrder() {
public void executesPagedSpecificationSettingAnOrder() {
flushTestUsers();

8
src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java
View File

@@ -57,7 +57,6 @@ public class ParameterBinderUnitTests {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) private Query query;
private Method useIndexedParameters;
private Method indexedParametersWithSort;
@Before
public void setUp() throws SecurityException, NoSuchMethodException {
@@ -65,7 +64,6 @@ public class ParameterBinderUnitTests {
valid = SampleRepository.class.getMethod("valid", String.class);
useIndexedParameters = SampleRepository.class.getMethod("useIndexedParameters", String.class);
indexedParametersWithSort = SampleRepository.class.getMethod("indexedParameterWithSort", String.class, Sort.class);
when(query.getParameters().size()).thenReturn(MAX_PARAMETERS);
}
@@ -125,14 +123,14 @@ public class ParameterBinderUnitTests {
Object[] values = { "foo" };
ParameterBinderFactory.createBinder(new JpaParameters(useIndexedParameters)).bind(query, values);
verify(query).setParameter(eq(1), anyObject());
verify(query).setParameter(eq(1), any());
}
@Test
public void usesParameterNameIfAnnotated() throws Exception {
when(query.setParameter(eq("username"), anyObject())).thenReturn(query);
when(query.setParameter(eq("username"), any())).thenReturn(query);
Parameter parameter = mock(Parameter.class);
when(parameter.getName()).thenReturn("username");
@@ -141,7 +139,7 @@ public class ParameterBinderUnitTests {
Object[] values = { "foo" };
ParameterBinderFactory.createBinder(new JpaParameters(valid)).bind(query, values);
verify(query).setParameter(eq("username"), anyObject());
verify(query).setParameter(eq("username"), any());
}
@Test