Merge pull request #3126 from zhhl/3095-dataSourcedTreeExpansion

3095: Expanding Data Sources Node in nightly test
This commit is contained in:
Richard Cordovano 2017-10-03 19:18:59 -04:00 committed by GitHub
commit 5a20c14d4d
2 changed files with 29 additions and 0 deletions

View File

@ -36,6 +36,7 @@ import java.util.logging.Logger;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.swing.JDialog; import javax.swing.JDialog;
import javax.swing.text.JTextComponent; import javax.swing.text.JTextComponent;
import javax.swing.tree.TreePath;
import org.netbeans.jellytools.MainWindowOperator; import org.netbeans.jellytools.MainWindowOperator;
import org.netbeans.jellytools.NbDialogOperator; import org.netbeans.jellytools.NbDialogOperator;
import org.netbeans.jellytools.WizardOperator; 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.JTableOperator;
import org.netbeans.jemmy.operators.JTextFieldOperator; import org.netbeans.jemmy.operators.JTextFieldOperator;
import org.netbeans.jemmy.operators.JToggleButtonOperator; 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.UserPreferences;
import org.sleuthkit.autopsy.core.UserPreferencesException; import org.sleuthkit.autopsy.core.UserPreferencesException;
import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo; 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() { public void testGenerateReportToolbar() {
logger.info("Generate Report Toolbars"); logger.info("Generate Report Toolbars");
MainWindowOperator mwo = MainWindowOperator.getDefault(); MainWindowOperator mwo = MainWindowOperator.getDefault();
@ -380,4 +393,15 @@ public class AutopsyTestCases {
logger.log(Level.SEVERE, "Error saving messaging service connection info", ex); //NON-NLS 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);
}
}
} }

View File

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