From ac59c3e9165f77e8efd0487f2f8cc51eae452c29 Mon Sep 17 00:00:00 2001
From: Brian Sweeney <bsweeney@ciphertechsolutions.com>
Date: Mon, 14 May 2018 09:12:14 -0600
Subject: [PATCH] rename a super type

---
 ...hTest.java => AbstractIntraCaseCommonFilesSearchTest.java} | 4 ++--
 .../commonfilessearch/IngestedWithHashAndFileType.java        | 2 +-
 .../autopsy/commonfilessearch/IngestedWithNoFileTypes.java    | 4 ++--
 .../sleuthkit/autopsy/commonfilessearch/UningestedCases.java  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/{IntraCaseCommonFilesSearchTest.java => AbstractIntraCaseCommonFilesSearchTest.java} (97%)

diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseCommonFilesSearchTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/AbstractIntraCaseCommonFilesSearchTest.java
similarity index 97%
rename from Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseCommonFilesSearchTest.java
rename to Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/AbstractIntraCaseCommonFilesSearchTest.java
index 865d886ef3..c4565b74cb 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseCommonFilesSearchTest.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/AbstractIntraCaseCommonFilesSearchTest.java
@@ -68,7 +68,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * set 4 
  *  - file.dat (empty file)
  */
-public abstract class IntraCaseCommonFilesSearchTest extends NbTestCase {
+public abstract class AbstractIntraCaseCommonFilesSearchTest extends NbTestCase {
 
     private static final String CASE_NAME = "IntraCaseCommonFilesSearchTest";
     static final Path CASE_DIRECTORY_PATH = Paths.get(System.getProperty("java.io.tmpdir"), CASE_NAME);
@@ -90,7 +90,7 @@ public abstract class IntraCaseCommonFilesSearchTest extends NbTestCase {
 
     protected DataSourceLoader dataSourceLoader;
 
-    public IntraCaseCommonFilesSearchTest(String name) {
+    public AbstractIntraCaseCommonFilesSearchTest(String name) {
         super(name);
     }
 
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithHashAndFileType.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithHashAndFileType.java
index f6ff9b3608..d4fc9f634d 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithHashAndFileType.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithHashAndFileType.java
@@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 /**
  * Add set 1, set 2, set 3, and set 4 to case and ingest with hash algorithm. 
  */
-public class IngestedWithHashAndFileType extends IntraCaseCommonFilesSearchTest {
+public class IngestedWithHashAndFileType extends AbstractIntraCaseCommonFilesSearchTest {
 
     public static Test suite() {
         NbModuleSuite.Configuration conf = NbModuleSuite.createConfiguration(IngestedWithHashAndFileType.class).
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithNoFileTypes.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithNoFileTypes.java
index 4a3c10b10b..a9c7ca707a 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithNoFileTypes.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithNoFileTypes.java
@@ -49,7 +49,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Add images set 1, set 2, set 3, and set 4 to case. Do not run mime type
  * module.
  */
-public class IngestedWithNoFileTypes extends IntraCaseCommonFilesSearchTest {
+public class IngestedWithNoFileTypes extends AbstractIntraCaseCommonFilesSearchTest {
 
     public static Test suite() {
         NbModuleSuite.Configuration conf = NbModuleSuite.createConfiguration(IngestedWithNoFileTypes.class).
@@ -101,7 +101,7 @@ public class IngestedWithNoFileTypes extends IntraCaseCommonFilesSearchTest {
 
             List<AbstractFile> files = getFiles(objectIdToDataSource.keySet());
 
-            assertTrue(files.size() == 0);
+            assertTrue(files.isEmpty());
 
         } catch (NoCurrentCaseException | TskCoreException | SQLException ex) {
             Exceptions.printStackTrace(ex);
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/UningestedCases.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/UningestedCases.java
index 1d88bc2464..17ed02cd61 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/UningestedCases.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/UningestedCases.java
@@ -42,7 +42,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Add images set 1, set 2, set 3, and set 4 to case. Do not ingest.
  *
  */
-public class UningestedCases extends IntraCaseCommonFilesSearchTest {
+public class UningestedCases extends AbstractIntraCaseCommonFilesSearchTest {
 
     public static Test suite() {
         NbModuleSuite.Configuration conf = NbModuleSuite.createConfiguration(UningestedCases.class).