Merge pull request #137 from derjust/MoreUnitTesting

Improving Unit test coverage

Author: derjust

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java

@@ -77,17 +77,21 @@ protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {
 		boolean hasHashKey = false;
 		boolean hasRangeKey = false;
 		for (Method method : type.getType().getMethods()) {
-			if (method.isAnnotationPresent(DynamoDBHashKey.class))
+			if (method.isAnnotationPresent(DynamoDBHashKey.class)) {
 				hasHashKey = true;
-			if (method.isAnnotationPresent(DynamoDBRangeKey.class))
+			}
+			if (method.isAnnotationPresent(DynamoDBRangeKey.class)) {
 				hasRangeKey = true;
+			}
 
 		}
 		for (Field field : type.getType().getFields()) {
-			if (field.isAnnotationPresent(DynamoDBHashKey.class))
+			if (field.isAnnotationPresent(DynamoDBHashKey.class)) {
 				hasHashKey = true;
-			if (field.isAnnotationPresent(DynamoDBRangeKey.class))
+			}
+			if (field.isAnnotationPresent(DynamoDBRangeKey.class)) {
 				hasRangeKey = true;
+			}
 
 		}
 		return type.getType().isAnnotationPresent(DynamoDBTable.class) || (hasHashKey && hasRangeKey);

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java

@@ -63,6 +63,10 @@ public AbstractDynamoDBEventListener() {
 		this.domainClass = typeArgument == null ? Object.class : typeArgument;
 	}
 
+	protected Class<?> getDomainClass() {
+		return this.domainClass;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 *

src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java

@@ -87,6 +87,5 @@ public void setDynamoDBMapperConfig(DynamoDBMapperConfig dynamoDBMapperConfig) {
 	public void setDynamoDBOperations(DynamoDBOperations dynamoDBOperations) {
 		this.dynamoDBOperations = dynamoDBOperations;
 		setMappingContext(new DynamoDBMappingContext());
-
 	}
 }

src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java

@@ -162,14 +162,11 @@ public boolean existsById(ID id) {
 		return findById(id).isPresent();
 	}
 
-	public void assertScanEnabled(boolean scanEnabled, String methodName) {
+	void assertScanEnabled(boolean scanEnabled, String methodName) {
 		Assert.isTrue(
 				scanEnabled,
-				"Scanning for unpaginated "
-						+ methodName
-						+ "() queries is not enabled.  "
-						+ "To enable, re-implement the "
-						+ methodName
+				"Scanning for unpaginated " + methodName + "() queries is not enabled.  "
+						+ "To enable, re-implement the " + methodName
 						+ "() method in your repository interface and annotate with @EnableScan, or "
 						+ "enable scanning for all repository methods by annotating your repository interface with @EnableScan");
 	}

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

@@ -21,14 +21,14 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBScanExpression;
-import com.amazonaws.services.dynamodbv2.document.DynamoDB;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -42,6 +42,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -119,7 +120,8 @@ public void testBatchSave_CallsCorrectDynamoDBMapperMethod()
 	{
 			List<User> users = new ArrayList<>();
 			dynamoDBTemplate.batchSave(users);
-			verify(dynamoDBMapper).batchSave(any(List.class));
+
+			verify(dynamoDBMapper).batchSave(eq(users));
 	}
 
 	@Test

src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java

@@ -20,6 +20,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -50,8 +51,27 @@ static class DynamoDBMappingContextTestFieldEntity {
 
 		private String someProperty;
 	}
+
 	@DynamoDBTable(tableName = "b")
 	static class DynamoDBMappingContextTestMethodEntity {
+
+		@DynamoDBHashKey
+		public String getHashKey() {
+			return null;
+		}
+
+		@DynamoDBRangeKey
+		public String getRangeKey() {
+			return null;
+		}
+
+		public String getSomeProperty() {
+			return null;
+		}
+	}
+
+	@DynamoDBTable(tableName = "c")
+	static class DynamoDBMappingContextTestIdEntity {
 		@Id
 		private DynamoDBHashAndRangeKey hashRangeKey;
 
@@ -69,17 +89,24 @@ public void setUp() {
 	}
 
 	@Test
-	public void detectsIdProperty() {
+	public void detectsPropertyAnnotation() {
 
 		DynamoDBPersistentEntityImpl<?> entity = underTest.getPersistentEntity(DynamoDBMappingContextTestFieldEntity.class);
 		assertThat(entity.getIdProperty(), is(notNullValue()));
 	}
 
 	@Test
-	public void detectdIdMethods() {
+	@Ignore
+	public void detectdMethodsAnnotation() {
 		DynamoDBPersistentEntityImpl<?> entity = underTest.getPersistentEntity(DynamoDBMappingContextTestMethodEntity.class);
 		assertThat(entity.getIdProperty(), is(notNullValue()));
 
 	}
 
+	@Test
+	public void detectdMethodsId() {
+		DynamoDBPersistentEntityImpl<?> entity = underTest.getPersistentEntity(DynamoDBMappingContextTestIdEntity.class);
+		assertThat(entity.getIdProperty(), is(notNullValue()));
+
+	}
 }

src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java

@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -42,6 +43,9 @@ public class AbstractDynamoDBEventListenerTest {
     @Mock
     private PaginatedScanList<User> sampleScanList;
 
+    @Mock
+    private DynamoDBMappingEvent<User> brokenEvent;
+
     private AbstractDynamoDBEventListener<User> underTest;
 
     @Before
@@ -55,9 +59,34 @@ public void setUp() {
         when(sampleScanList.stream()).thenReturn(queryList.stream());
     }
 
+    @Test(expected =  AssertionError.class)
+    public void testNullArgument() {
+        // This is impossible but let's be sure that it is covered
+        when(brokenEvent.getSource()).thenReturn(null);
+
+        underTest.onApplicationEvent(brokenEvent);
+    }
+
+    @Test(expected = AssertionError.class)
+    public void testUnknownEvent() {
+        // Simulate an unknown event
+        when(brokenEvent.getSource()).thenReturn(new User());
+
+        underTest.onApplicationEvent(brokenEvent);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testRawType() {
+        underTest = Mockito.spy(new AbstractDynamoDBEventListener() {
+        });
+
+        assertSame(Object.class, underTest.getDomainClass());
+    }
+
     @Test
     public void testAfterDelete() {
-        underTest.onApplicationEvent(new AfterDeleteEvent<User>(sampleEntity));
+        underTest.onApplicationEvent(new AfterDeleteEvent<>(sampleEntity));
 
         verify(underTest).onAfterDelete(sampleEntity);
         verify(underTest, never()).onAfterLoad(any());

src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java

@@ -0,0 +1,94 @@
+/**
+ * Copyright © 2013 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.socialsignin.spring.data.dynamodb.repository.support;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.socialsignin.spring.data.dynamodb.core.DynamoDBOperations;
+import org.socialsignin.spring.data.dynamodb.domain.sample.User;
+import org.socialsignin.spring.data.dynamodb.domain.sample.UserRepository;
+import org.springframework.context.ApplicationContext;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.Repository;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DynamoDBRepositoryFactoryBeanTest {
+
+    @Mock
+    private ApplicationContext applicationContext;
+    @Mock
+    private DynamoDBOperations dynamoDBOperations;
+    @Mock
+    private DynamoDBMapperConfig dynamoDBMapperConfig;
+    @Mock
+    private AmazonDynamoDB amazonDynamoDB;
+
+    private DynamoDBRepositoryFactoryBean underTest;
+
+    public interface UserRepository extends Repository<User, String> {
+
+    }
+
+    @Before
+    public void setUp() {
+        underTest = spy(new DynamoDBRepositoryFactoryBean(UserRepository.class));
+        underTest.setApplicationContext(applicationContext);
+        underTest.setDynamoDBMapperConfig(dynamoDBMapperConfig);
+    }
+
+    @Test
+    public void testDynamoDBOperations() {
+        try {
+            underTest.getPersistentEntity();
+            fail();
+        } catch (NullPointerException /*IllegalStateException*/ ise) {
+            assertTrue(true);
+        }
+
+        underTest.setDynamoDBOperations(dynamoDBOperations);
+        underTest.afterPropertiesSet();
+
+        assertNotNull(underTest.getPersistentEntity());
+    }
+
+    @Test
+    public void testAmazonDynamoDB() {
+        try {
+            underTest.getPersistentEntity();
+            fail();
+        } catch (NullPointerException /*IllegalStateException*/ ise) {
+            assertTrue(true);
+        }
+
+        underTest.setAmazonDynamoDB(amazonDynamoDB);
+        underTest.afterPropertiesSet();
+
+        assertNotNull(underTest.getPersistentEntity());
+    }
+    
+}