From 32c308db3e2b75a642503ecd8e6df81ecb5ea50e Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@pivotal.io>
Date: Wed, 6 Sep 2017 17:29:46 +0200
Subject: [PATCH] DATAJPA-1172 - Polishing.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 .../data/jpa/repository/UserRepositoryTests.java         | 9 +++++----
 .../jpa/repository/query/ParameterBinderUnitTests.java   | 8 +++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
index f08a6d636..a9b963cae 100644
--- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
@@ -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();
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java
index 94f016e06..5f9aab0d7 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java
@@ -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