Reactivate & fix old tests

Author: derjust

src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java

@@ -23,8 +23,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.socialsignin.spring.data.dynamodb.domain.sample.User;
+import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories;
 import org.socialsignin.spring.data.dynamodb.utils.DynamoDBLocalResource;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -35,21 +37,18 @@
  * Integration test that interacts with DynamoDB Local instance.
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {DynamoDBLocalResource.class})
+@ContextConfiguration(classes = {DynamoDBLocalResource.class, DynamoDBTemplateIT.TestAppConfig.class})
 @TestPropertySource(properties = {"spring.data.dynamodb.entity2ddl.auto=create"})
 public class DynamoDBTemplateIT {
 
 	@Autowired
 	private AmazonDynamoDB amazonDynamoDB;
-	private DynamoDBTemplate dynamoDBTemplate;
-	@Autowired
-	private DynamoDBMapper mapper;
 	@Autowired
-	private DynamoDBMapperConfig mapperConfig;
+	private DynamoDBTemplate dynamoDBTemplate;
 
-	@Before
-	public void setUp() {
-		this.dynamoDBTemplate = new DynamoDBTemplate(amazonDynamoDB, mapper, mapperConfig);
+	@Configuration
+	@EnableDynamoDBRepositories(basePackages = "org.socialsignin.spring.data.dynamodb.domain.sample")
+	public static class TestAppConfig {
 	}
 
 	@Test

src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java

@@ -38,6 +38,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
 
@@ -123,10 +125,10 @@ public void testProjection() {
 	}
 
 	@Test
-	public void testEmptyResult() {
+	public void testEmptyResult() throws InterruptedException, ExecutionException {
 
-		Optional<User> actual1 = userRepository.findByNameAndPostCode("does not", "exist");
-		assertFalse(actual1.isPresent());
+		Future<User> actual1 = userRepository.findByNameAndPostCode("does not", "exist");
+		assertNull(actual1.get());
 
 		User actual2 = userRepository.findByNameAndLeaveDate("does not exist", Instant.now());
 		assertNull(actual2);

src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java

@@ -32,10 +32,11 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests JDK8 features of spring-data
@@ -86,15 +87,21 @@ public void testFuture() throws InterruptedException, ExecutionException, Timeou
 		user.setPostCode("postCode");
 		user = userRepository.save(user);
 
-		User actual;
-		// Future<User> result
-		actual = userRepository.findByName("testFuture").get();
-		// assertNotNull(result);
-		// User actual = result.get(1, TimeUnit.MINUTES);
-
-		assertNotNull(actual);
-		assertNotNull(actual.getId());
-		assertEquals("postCode", actual.getPostCode());
+		Consumer<User> validate = (actual) -> {
+			assertNotNull(actual);
+			assertNotNull(actual.getId());
+			assertEquals("postCode", actual.getPostCode());
+		};
+
+		Optional<User> actual1 = userRepository.findByName("testFuture");
+		assertNotNull(actual1);
+		assertTrue(actual1.isPresent());
+		validate.accept(actual1.get());
+
+		Future<User> actual2 = userRepository.findByNameAndPostCode("testFuture", "postCode");
+		assertNotNull(actual1);
+		assertTrue(actual2.isDone());
+		validate.accept(actual2.get());
 	}
 
 	@Test

src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java

@@ -40,7 +40,7 @@ public interface UserRepository extends CrudRepository<User, String> {
 	Optional<User> findByName(String name);
 
 	@EnableScan
-	Future<User> findOneByPostCode(String postCode);
+	Future<User> findByNameAndPostCode(String name, String postCode);
 	@EnableScan
 	User findFirstByPostCode(String postCode);
 
@@ -55,8 +55,6 @@ public interface UserRepository extends CrudRepository<User, String> {
 	@Query(fields = "leaveDate")
 	List<User> findByPostCode(String postCode);
 
-	@EnableScan
-	Optional<User> findByNameAndPostCode(String name, String postcode);
 	@EnableScan
 	User findByNameAndLeaveDate(String name, Instant leaveDate);