Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2774-CentralRepoDetailsGUI

Core/src/org/sleuthkit/autopsy/centralrepository/actions/EamCaseEditDetailsDialog.java

@@ -85,10 +85,6 @@ public class EamCaseEditDetailsDialog extends JDialog {
     private void customizeComponents() {
         setTextBoxListeners();
         setTextAreaListeners();
-        
-        // The organization functions of central repo are not being included in the current release.
-        this.pnOrganization.setVisible(false);
-
     }
 
     private void setTextBoxListeners() {

Core/src/org/sleuthkit/autopsy/imagewriter/ImageWriter.java

@@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 import org.netbeans.api.progress.ProgressHandle;
+import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -130,6 +131,10 @@ class ImageWriter implements PropertyChangeListener{
         }
     }
     
+    @Messages({
+        "# {0} - data source name", 
+        "ImageWriter.progressBar.message=Finishing acquisition of {0}"
+    })
     private void startFinishImage(String dataSourceName){
       
         synchronized(currentTasksLock){
@@ -166,7 +171,7 @@ class ImageWriter implements PropertyChangeListener{
 
             if(doUI){
                 periodicTasksExecutor = new ScheduledThreadPoolExecutor(1, new ThreadFactoryBuilder().setNameFormat("image-writer-progress-update-%d").build()); //NON-NLS
-                progressHandle = ProgressHandle.createHandle("Image writer - " + dataSourceName);
+                progressHandle = ProgressHandle.createHandle(Bundle.ImageWriter_progressBar_message(dataSourceName));
                 progressHandle.start(100);
                 progressUpdateTask = periodicTasksExecutor.scheduleAtFixedRate(
                         new ProgressUpdateTask(progressHandle, imageHandle), 0, 250, TimeUnit.MILLISECONDS);

Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java

@@ -36,6 +36,7 @@ import java.util.logging.Logger;
 import javax.imageio.ImageIO;
 import javax.swing.JDialog;
 import javax.swing.text.JTextComponent;
+import javax.swing.tree.TreePath;
 import org.netbeans.jellytools.MainWindowOperator;
 import org.netbeans.jellytools.NbDialogOperator;
 import org.netbeans.jellytools.WizardOperator;
@@ -53,6 +54,8 @@ import org.netbeans.jemmy.operators.JTabbedPaneOperator;
 import org.netbeans.jemmy.operators.JTableOperator;
 import org.netbeans.jemmy.operators.JTextFieldOperator;
 import org.netbeans.jemmy.operators.JToggleButtonOperator;
+import org.netbeans.jemmy.operators.JTreeOperator;
+import org.netbeans.jemmy.operators.JTreeOperator.NoSuchPathException;
 import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.core.UserPreferencesException;
 import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo;
@@ -290,6 +293,16 @@ public class AutopsyTestCases {
 
     }
 
+    public void testExpandDataSourcesTree() {
+        logger.info("Data Sources Node");
+        MainWindowOperator mwo = MainWindowOperator.getDefault();
+        JTreeOperator jto = new JTreeOperator(mwo, "Data Sources");
+        String [] nodeNames = {"Data Sources"};
+        TreePath tp = jto.findPath(nodeNames);
+        expandNodes(jto, tp);
+        screenshot("Data Sources Tree");
+    }
+
     public void testGenerateReportToolbar() {
         logger.info("Generate Report Toolbars");
         MainWindowOperator mwo = MainWindowOperator.getDefault();
@@ -380,4 +393,15 @@ public class AutopsyTestCases {
             logger.log(Level.SEVERE, "Error saving messaging service connection info", ex); //NON-NLS
         }
     }
+    
+    private void expandNodes (JTreeOperator jto, TreePath tp) {
+        try {
+            jto.expandPath(tp);
+            for (TreePath t : jto.getChildPaths(tp)) {
+                expandNodes(jto, t);
+            }
+        } catch (NoSuchPathException ne) {
+            logger.log(Level.SEVERE, "Error expanding tree path", ne);
+        }
+    }
 }

Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java

@@ -69,6 +69,7 @@ public class RegressionTest extends TestCase {
                     "testConfigureSearch",
                     "testAddSourceWizard1",
                     "testIngest",
+                    "testExpandDataSourcesTree", //After do ingest, before generate report, we expand Data Sources node
                     "testGenerateReportToolbar",
                     "testGenerateReportButton");
         }
@@ -83,6 +84,7 @@ public class RegressionTest extends TestCase {
                     "testConfigureSearch",
                     "testAddSourceWizard1",
                     "testIngest",
+                    "testExpandDataSourcesTree", 
                     "testGenerateReportToolbar",
                     "testGenerateReportButton");
         }
@@ -147,6 +149,9 @@ public class RegressionTest extends TestCase {
         autopsyTests.testIngest();
     }
 
+    public void testExpandDataSourcesTree() {
+        autopsyTests.testExpandDataSourcesTree();
+    }
     public void testGenerateReportToolbar() {
         autopsyTests.testGenerateReportToolbar();
     }