Merge pull request #2055 from gdicristofaro/6971-dataModelTests

6971 data model tests

bindings/java/build.xml

@@ -121,6 +121,7 @@
 	<target name="compile-test" depends="compile" description="compile the tests">
 		<javac debug="on" srcdir="${test}" destdir="${build}" includeantruntime="false">
 			<classpath refid="libraries"/>
+			<compilerarg value="-Xlint" />
 		</javac>
 	</target>
 

bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java

@@ -655,7 +655,8 @@ public boolean equals(Object obj) {
 			if (notEqual(this.fileTypesFilter, other.getFileTypesFilter())) {
 				return false;
 			}
-			return Objects.equals(this.additionalFilters, other.getSubFilters());
+
+			return Objects.equals(this.additionalFilters, new HashSet<>(other.getSubFilters()));
 		}
 
 	}

bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java

@@ -41,7 +41,18 @@
  * default ant target sets properties for the various folders.
  */
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ CommunicationsManagerTest.class, CaseDbSchemaVersionNumberTest.class,org.sleuthkit.datamodel.TopDownTraversal.class, org.sleuthkit.datamodel.SequentialTraversal.class, org.sleuthkit.datamodel.CrossCompare.class, org.sleuthkit.datamodel.BottomUpTest.class, org.sleuthkit.datamodel.CPPtoJavaCompare.class, org.sleuthkit.datamodel.HashDbTest.class})
+@Suite.SuiteClasses({ 
+	CommunicationsManagerTest.class, 
+	CaseDbSchemaVersionNumberTest.class,
+
+//  Note: these tests have dependencies on images being placed in the input folder: nps-2009-canon2-gen6, ntfs1-gen, and small2	
+//	org.sleuthkit.datamodel.TopDownTraversal.class, 
+//	org.sleuthkit.datamodel.SequentialTraversal.class, 
+//	org.sleuthkit.datamodel.CrossCompare.class, 
+//	org.sleuthkit.datamodel.BottomUpTest.class, 
+//	org.sleuthkit.datamodel.CPPtoJavaCompare.class, 
+//	org.sleuthkit.datamodel.HashDbTest.class
+})
 public class DataModelTestSuite {
 
 	static final String TEST_IMAGE_DIR_NAME = "test" + java.io.File.separator + "Input";

bindings/java/test/org/sleuthkit/datamodel/PublicTagName.java

@@ -7,8 +7,8 @@
  */
 public class PublicTagName extends TagName {
 
-	public PublicTagName(long id, String displayName, String description, HTML_COLOR color, TskData.FileKnown knownStatus) {
-		super(id, displayName, description, color, knownStatus);
+	public PublicTagName(long id, String displayName, String description, HTML_COLOR color, TskData.FileKnown knownStatus, long tagSetId, int rank) {
+		super(id, displayName, description, color, knownStatus, tagSetId, rank);
 	}
 
 	@Override

bindings/java/test/org/sleuthkit/datamodel/timeline/EventTypeFilterTest.java

@@ -51,7 +51,7 @@ public void testGetDisplayName() {
 		EventTypeFilter instance = new EventTypeFilter(TimelineEventType.EMAIL);
 		assertEquals(TimelineEventType.EMAIL.getDisplayName(), instance.getDisplayName());
 		instance = new EventTypeFilter(TimelineEventType.ROOT_EVENT_TYPE);
-		assertEquals("Event Type", instance.getDisplayName());
+		assertEquals("Limit event types to", instance.getDisplayName());
 	}
 
 	/**

bindings/java/test/org/sleuthkit/datamodel/timeline/RootFilterTest.java

@@ -40,13 +40,25 @@ public class RootFilterTest {
 	@Test
 	public void testCopyOf() {
 		System.out.println("copyOf");
-		TimelineFilter instance = getNewRootFilter();
-		assertEquals(instance, instance.copyOf());
+		
+		testCopyOfEqual(new TimelineFilter.TagsFilter());
+		testCopyOfEqual(new TimelineFilter.HashHitsFilter());
+		testCopyOfEqual(new TimelineFilter.TextFilter());
+		testCopyOfEqual(new EventTypeFilter(TimelineEventType.ROOT_EVENT_TYPE));
+		testCopyOfEqual(new TimelineFilter.DataSourcesFilter());
+		testCopyOfEqual(new TimelineFilter.HideKnownFilter());
+		testCopyOfEqual(new TimelineFilter.FileTypesFilter());
+		
+		testCopyOfEqual(getNewRootFilter());
 	}
+	
+	private void testCopyOfEqual(TimelineFilter filter) {
+		assertEquals(filter, filter.copyOf());
+	}
+	
 
 	TimelineFilter.RootFilter getNewRootFilter() {
 		TimelineFilter.TagsFilter tagsFilter = new TimelineFilter.TagsFilter();
-		tagsFilter.addSubFilter(new TimelineFilter.TagNameFilter(new PublicTagName(0, "test tagName", "test tag name description", TagName.HTML_COLOR.NONE, TskData.FileKnown.KNOWN)));
 		TimelineFilter.HashHitsFilter hashHitsFilter = new TimelineFilter.HashHitsFilter();
 		TimelineFilter.TextFilter textFilter = new TimelineFilter.TextFilter();
 		EventTypeFilter eventTypeFilter = new EventTypeFilter(TimelineEventType.ROOT_EVENT_TYPE);

bindings/java/test/org/sleuthkit/datamodel/timeline/TimelineTestSuite.java

@@ -27,7 +27,8 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 	RootFilterTest.class,
-	EventTypeFilterTest.class})
+	EventTypeFilterTest.class
+})
 public class TimelineTestSuite {
 
 }