Spockified some tests and improved coverage report

Author: SQiShER

pom.xml

@@ -427,6 +427,16 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
                 <version>2.6</version>
+                <configuration>
+                    <instrumentation>
+                        <excludes>
+                            <exclude>**/*IT.class</exclude>
+                            <exclude>**/*AT.class</exclude>
+                            <exclude>**/*Example.class</exclude>
+                        </excludes>
+                    </instrumentation>
+                    <check/>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/integration-test/java/de/danielbechler/diff/issues/issue15/CircularReferenceDetectionBasedOnEqualsTest.java renamed to src/integration-test/java/de/danielbechler/diff/issues/issue15/CircularReferenceDetectionBasedOnEqualsIT.java

@@ -29,7 +29,7 @@
 /**
  * @author Daniel Bechler
  */
-public class CircularReferenceDetectionBasedOnEqualsTest
+public class CircularReferenceDetectionBasedOnEqualsIT
 {
 	private ObjectDiffer objectDiffer;
 

src/integration-test/java/de/danielbechler/diff/issues/issue15/CircularReferenceDetectionBasedOnIdentityTest.java renamed to src/integration-test/java/de/danielbechler/diff/issues/issue15/CircularReferenceDetectionBasedOnIdentityIT.java

@@ -29,7 +29,7 @@
 /**
  * @author Daniel Bechler
  */
-public class CircularReferenceDetectionBasedOnIdentityTest
+public class CircularReferenceDetectionBasedOnIdentityIT
 {
 	private ObjectDiffer objectDiffer;
 

src/integration-test/java/de/danielbechler/diff/issues/issue3/IgnoreTest.groovy renamed to src/integration-test/java/de/danielbechler/diff/issues/issue3/IgnoreByPropertyNameIT.groovy

@@ -17,15 +17,13 @@
 package de.danielbechler.diff.issues.issue3
 
 import de.danielbechler.diff.ObjectDifferBuilder
-import spock.lang.Ignore
 import spock.lang.Specification
 
 /**
  * Created by dbechler.
  */
-class IgnoreTest extends Specification {
+class IgnoreByPropertyNameIT extends Specification {
 
-	@Ignore
 	def "ignoring by property name"() {
 		given:
 		  def base = new FooContainer("foo-base", "bar-base", "test-base")

src/main/java/de/danielbechler/diff/introspection/BeanPropertyAccessor.java

@@ -64,46 +64,6 @@ private static Method makeAccessible(final Method method)
 		return method;
 	}
 
-	private static boolean tryToReplaceCollectionContent(final Collection<Object> target,
-														 final Collection<Object> value)
-	{
-		if (target == null)
-		{
-			return false;
-		}
-		try
-		{
-			target.clear();
-			target.addAll(value);
-			return true;
-		}
-		catch (final Exception unmodifiable)
-		{
-			logger.debug("Failed to replace content of existing Collection", unmodifiable);
-			return false;
-		}
-	}
-
-	private static boolean tryToReplaceMapContent(final Map<Object, Object> target,
-												  final Map<Object, Object> value)
-	{
-		if (target == null)
-		{
-			return false;
-		}
-		try
-		{
-			target.clear();
-			target.putAll(value);
-			return true;
-		}
-		catch (final Exception unmodifiable)
-		{
-			logger.debug("Failed to replace content of existing Map", unmodifiable);
-			return false;
-		}
-	}
-
 	public final Set<String> getCategories()
 	{
 		return categories;
@@ -124,6 +84,58 @@ public void setExcluded(final boolean excluded)
 		this.excluded = excluded;
 	}
 
+	public String getPropertyName()
+	{
+		return this.propertyName;
+	}
+
+	/**
+	 * @return The annotations of the getter used to access this property.
+	 */
+	public Set<Annotation> getReadMethodAnnotations()
+	{
+		return new LinkedHashSet<Annotation>(Arrays.asList(readMethod.getAnnotations()));
+	}
+
+	public <T extends Annotation> T getReadMethodAnnotation(final Class<T> annotationClass)
+	{
+		final Set<? extends Annotation> annotations = getReadMethodAnnotations();
+		assert (annotations != null) : "Something is wrong here. " +
+				"The contract of getReadAnnotations() guarantees a non-null return value.";
+		for (final Annotation annotation : annotations)
+		{
+			if (annotationClass.isAssignableFrom(annotation.annotationType()))
+			{
+				return annotationClass.cast(annotation);
+			}
+		}
+		return null;
+	}
+
+	public BeanPropertyElementSelector getElementSelector()
+	{
+		return new BeanPropertyElementSelector(this.propertyName);
+	}
+
+	public Object get(final Object target)
+	{
+		if (target == null)
+		{
+			return null;
+		}
+		try
+		{
+			return readMethod.invoke(target);
+		}
+		catch (final Exception e)
+		{
+			final BeanPropertyReadException ex = new BeanPropertyReadException(e);
+			ex.setPropertyName(propertyName);
+			ex.setTargetType(target.getClass());
+			throw ex;
+		}
+	}
+
 	public void set(final Object target, final Object value)
 	{
 		if (target == null)
@@ -142,24 +154,14 @@ else if (writeMethod == null)
 		}
 	}
 
-	private void logFailedSet(final Object value)
+	public void unset(final Object target)
 	{
-		logger.info("Couldn't set new value '{}' for property '{}'", value, propertyName);
+		set(target, null);
 	}
 
-	private void invokeWriteMethod(final Object target, final Object value)
+	private void logFailedSet(final Object value)
 	{
-		try
-		{
-			writeMethod.invoke(target, value);
-		}
-		catch (final Exception e)
-		{
-			final BeanPropertyWriteException ex = new BeanPropertyWriteException(e, value);
-			ex.setPropertyName(propertyName);
-			ex.setTargetType(getType());
-			throw ex;
-		}
+		logger.info("Couldn't set new value '{}' for property '{}'", value, propertyName);
 	}
 
 	private void tryToReplaceContentOfCollectionTypes(final Object target, final Object value)
@@ -181,66 +183,64 @@ private void tryToReplaceContentOfCollectionTypes(final Object target, final Obj
 		logFailedSet(value);
 	}
 
-	public Object get(final Object target)
+	private void invokeWriteMethod(final Object target, final Object value)
 	{
-		if (target == null)
-		{
-			return null;
-		}
 		try
 		{
-			return readMethod.invoke(target);
+			writeMethod.invoke(target, value);
 		}
 		catch (final Exception e)
 		{
-			final BeanPropertyReadException ex = new BeanPropertyReadException(e);
+			final BeanPropertyWriteException ex = new BeanPropertyWriteException(e, value);
 			ex.setPropertyName(propertyName);
-			ex.setTargetType(target.getClass());
+			ex.setTargetType(getType());
 			throw ex;
 		}
 	}
 
-	public void unset(final Object target)
-	{
-		set(target, null);
-	}
-
-	public Class<?> getType()
-	{
-		return this.type;
-	}
-
-	public String getPropertyName()
-	{
-		return this.propertyName;
-	}
-
-	public BeanPropertyElementSelector getElementSelector()
+	private static boolean tryToReplaceCollectionContent(final Collection<Object> target,
+														 final Collection<Object> value)
 	{
-		return new BeanPropertyElementSelector(this.propertyName);
+		if (target == null)
+		{
+			return false;
+		}
+		try
+		{
+			target.clear();
+			target.addAll(value);
+			return true;
+		}
+		catch (final Exception unmodifiable)
+		{
+			logger.debug("Failed to replace content of existing Collection", unmodifiable);
+			return false;
+		}
 	}
 
-	/**
-	 * @return The annotations of the getter used to access this property.
-	 */
-	public Set<Annotation> getReadMethodAnnotations()
+	private static boolean tryToReplaceMapContent(final Map<Object, Object> target,
+												  final Map<Object, Object> value)
 	{
-		return new LinkedHashSet<Annotation>(Arrays.asList(readMethod.getAnnotations()));
+		if (target == null)
+		{
+			return false;
+		}
+		try
+		{
+			target.clear();
+			target.putAll(value);
+			return true;
+		}
+		catch (final Exception unmodifiable)
+		{
+			logger.debug("Failed to replace content of existing Map", unmodifiable);
+			return false;
+		}
 	}
 
-	public <T extends Annotation> T getReadMethodAnnotation(final Class<T> annotationClass)
+	public Class<?> getType()
 	{
-		final Set<? extends Annotation> annotations = getReadMethodAnnotations();
-		assert (annotations != null) : "Something is wrong here. " +
-				"The contract of getReadAnnotations() guarantees a non-null return value.";
-		for (final Annotation annotation : annotations)
-		{
-			if (annotationClass.isAssignableFrom(annotation.annotationType()))
-			{
-				return annotationClass.cast(annotation);
-			}
-		}
-		return null;
+		return this.type;
 	}
 
 	@Override

src/main/java/de/danielbechler/diff/introspection/BeanPropertyException.java

@@ -19,6 +19,7 @@
 /**
  * @author Daniel Bechler
  */
+@SuppressWarnings("UnusedDeclaration")
 public class BeanPropertyException extends RuntimeException
 {
 	private static final long serialVersionUID = 1L;

src/main/java/de/danielbechler/diff/introspection/DefaultPropertyAccessExceptionHandler.java

@@ -20,6 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("UnusedDeclaration")
 public class DefaultPropertyAccessExceptionHandler implements BeanPropertyAccessExceptionHandler
 {
 	private static final Logger logger = LoggerFactory.getLogger(DefaultPropertyAccessExceptionHandler.class);

src/test/java/de/danielbechler/diff/access/InstancesSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,13 +76,13 @@ class InstancesSpec extends Specification {
 
 	def "getType() returns most specific shared type for non-primitive objects (except for Map and Collection)"() {
 		given:
-		  def instances = Instances.of(accessor, working, base);
+		  def instances = Instances.of(beanPropertyAccessor, working, base);
 
 		expect:
 		  instances.getType() == resultType
 
 		where:
-		  accessor              | working                                    | base                                     | resultType
+		  beanPropertyAccessor  | working                                    | base                                     | resultType
 		  RootAccessor.instance | BigInteger.ONE                             | BigDecimal.ONE                           | Number
 		  RootAccessor.instance | new LineNumberReader(new StringReader("")) | new BufferedReader(new StringReader("")) | BufferedReader
 		  RootAccessor.instance | new StringReader("")                       | new BufferedReader(new StringReader("")) | Reader

src/test/java/de/danielbechler/diff/introspection/BeanPropertyAccessorBuilder.java

@@ -21,7 +21,7 @@
 /**
  * @author Daniel Bechler
  */
-public final class BeanPropertyAccessorBuilder
+final class BeanPropertyAccessorBuilder
 {
 	private BeanPropertyAccessorBuilder()
 	{
@@ -85,7 +85,7 @@ public BeanPropertyAccessor build()
 				}
 				return new BeanPropertyAccessor(propertyName, readMethod, writeMethod);
 			}
-			catch (NoSuchMethodException e)
+			catch (final NoSuchMethodException e)
 			{
 				throw new RuntimeException(e);
 			}