- Moved integration tests to separate source root

- Implemented Tests for IntrospectionService

Author: SQiShER

src/test/java/de/danielbechler/diff/ObjectDifferIntegrationTests.java renamed to src/integration-test/java/de/danielbechler/diff/ObjectDifferITCase.java

@@ -17,6 +17,7 @@
 package de.danielbechler.diff;
 
 import de.danielbechler.diff.collection.*;
+import de.danielbechler.diff.helper.*;
 import de.danielbechler.diff.map.*;
 import de.danielbechler.diff.mock.*;
 import de.danielbechler.diff.visitor.*;
@@ -26,13 +27,13 @@
 import java.util.ArrayList;
 import java.util.*;
 
-import static de.danielbechler.diff.NodeAssertions.*;
-import static de.danielbechler.diff.TestGroups.*;
+import static de.danielbechler.diff.helper.NodeAssertions.*;
+import static de.danielbechler.diff.helper.TestGroups.*;
 import static java.util.Arrays.*;
 
 /** @author Daniel Bechler */
 @Test(groups = TestGroups.INTEGRATION)
-public class ObjectDifferIntegrationTests
+public class ObjectDifferITCase
 {
 	private ObjectDiffer objectDiffer;
 

src/integration-test/java/de/danielbechler/diff/integration/AdditionIntegrationITCase.java

@@ -20,7 +20,7 @@
 import de.danielbechler.diff.mock.*;
 import org.testng.annotations.*;
 
-import static de.danielbechler.diff.NodeAssertions.*;
+import static de.danielbechler.diff.helper.NodeAssertions.*;
 
 /** @author Daniel Bechler */
 public class AdditionIntegrationITCase

src/integration-test/java/de/danielbechler/diff/integration/DeepDiffingCollectionItemChangeITCase.java

@@ -23,7 +23,7 @@
 
 import java.util.*;
 
-import static de.danielbechler.diff.NodeAssertions.*;
+import static de.danielbechler.diff.helper.NodeAssertions.*;
 
 /** @author Daniel Bechler */
 public class DeepDiffingCollectionItemChangeITCase
@@ -35,7 +35,6 @@ public void test_returns_full_property_graph_of_added_collection_items()
 		final Map<String, ObjectWithString> working = Collections.singletonMap("foo", new ObjectWithString("bar"));
 
 		final ObjectDifferBuilder objectDifferBuilder = ObjectDifferBuilder.startBuilding();
-		objectDifferBuilder.configure().introspection().includeChildrenOfNodeWithState(DiffNode.State.ADDED);
 		final ObjectDiffer differ = objectDifferBuilder.build();
 
 		final DiffNode node = differ.compare(working, base);

src/integration-test/java/de/danielbechler/diff/integration/IgnoreITCase.java

@@ -21,7 +21,7 @@
 import de.danielbechler.diff.visitor.*;
 import org.testng.annotations.*;
 
-import static de.danielbechler.diff.NodeAssertions.*;
+import static de.danielbechler.diff.helper.NodeAssertions.*;
 
 /** @author Daniel Bechler */
 public class IgnoreITCase

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

@@ -17,6 +17,7 @@
 package de.danielbechler.diff.issues.issue15;
 
 import de.danielbechler.diff.*;
+import de.danielbechler.diff.helper.*;
 import de.danielbechler.diff.mock.*;
 import org.testng.annotations.*;
 
@@ -31,7 +32,6 @@ public class CircularReferenceDetectionBasedOnEqualsTest
 	public void setUp() throws Exception
 	{
 		final ObjectDifferBuilder configuration = ObjectDifferBuilder.startBuilding();
-		configuration.configure().introspection().includeChildrenOfNodeWithState(DiffNode.State.ADDED);
 		configuration.configure()
 					 .circularReferenceHandling()
 					 .matchCircularReferencesUsing(EQUALS_METHOD);

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

@@ -17,6 +17,7 @@
 package de.danielbechler.diff.issues.issue15;
 
 import de.danielbechler.diff.*;
+import de.danielbechler.diff.helper.*;
 import de.danielbechler.diff.mock.*;
 import org.testng.annotations.*;
 
@@ -31,7 +32,6 @@ public class CircularReferenceDetectionBasedOnIdentityTest
 	public void setUp() throws Exception
 	{
 		final ObjectDifferBuilder configuration = ObjectDifferBuilder.startBuilding();
-		configuration.configure().introspection().includeChildrenOfNodeWithState(DiffNode.State.ADDED);
 		configuration.configure()
 					 .circularReferenceHandling()
 					 .matchCircularReferencesUsing(EQUALITY_OPERATOR);

src/integration-test/java/de/danielbechler/diff/issues/issue15/CircularReferenceIntegrationTest.java

@@ -22,7 +22,7 @@
 import org.fest.assertions.api.*;
 import org.testng.annotations.*;
 
-import static de.danielbechler.diff.NodeAssertions.*;
+import static de.danielbechler.diff.helper.NodeAssertions.*;
 
 /** @author Daniel Bechler */
 public class CircularReferenceIntegrationTest

src/integration-test/java/de/danielbechler/diff/issues/issue15/GraphITCase.java

@@ -17,11 +17,12 @@
 package de.danielbechler.diff.issues.issue15;
 
 import de.danielbechler.diff.*;
+import de.danielbechler.diff.helper.*;
 import de.danielbechler.diff.visitor.*;
 import org.testng.annotations.*;
 
-import static de.danielbechler.diff.NodeAssertions.assertThat;
 import static de.danielbechler.diff.NodePath.*;
+import static de.danielbechler.diff.helper.NodeAssertions.assertThat;
 import static org.fest.assertions.api.Assertions.assertThat;
 
 /**

src/integration-test/java/de/danielbechler/diff/issues/issue70/PersonDiffITCase.java

@@ -1,6 +1,7 @@
 package de.danielbechler.diff.issues.issue70;
 
 import de.danielbechler.diff.*;
+import de.danielbechler.diff.helper.*;
 import de.danielbechler.diff.visitor.*;
 import org.testng.annotations.*;
 

src/main/java/de/danielbechler/diff/ComparisonConfiguration.java

@@ -3,6 +3,12 @@
 /** @author Daniel Bechler */
 public interface ComparisonConfiguration
 {
+	Of ofNode(NodePath nodePath);
+
+	Of ofType(Class<?> type);
+
+	OfPrimitiveTypes ofPrimitiveTypes();
+
 	public interface Of
 	{
 		ComparisonConfiguration toUse(ComparisonStrategy comparisonStrategy);
@@ -18,10 +24,4 @@ public interface OfPrimitiveTypes
 	{
 		ComparisonConfiguration toTreatDefaultValuesAs(PrimitiveDefaultValueMode primitiveDefaultValueMode);
 	}
-
-	Of ofNode(NodePath nodePath);
-
-	Of ofType(Class<?> type);
-
-	OfPrimitiveTypes ofPrimitiveTypes();
 }