Merge pull request #2804 from zhhl/2653-multiUserJunit

2653: first Java regression test code for multi-user case. The settin…
This commit is contained in:
Richard Cordovano 2017-05-31 10:11:24 -04:00 committed by GitHub
commit d8eda63cf6
3 changed files with 51 additions and 2 deletions

View File

@ -68,6 +68,15 @@
<sysproperty key="known_bad_path" value="${known_bad_path}"/> <sysproperty key="known_bad_path" value="${known_bad_path}"/>
<sysproperty key="nsrl_path" value="${nsrl_path}"/> <sysproperty key="nsrl_path" value="${nsrl_path}"/>
<sysproperty key="keyword_path" value="${keyword_path}"/> <sysproperty key="keyword_path" value="${keyword_path}"/>
<sysproperty key="dbHost" value="${dbHost}"/>
<sysproperty key="dbPort" value="${dbPort}"/>
<sysproperty key="dbUserName" value="${dbUserName}"/>
<sysproperty key="dbPassword" value="${dbPassword}"/>
<sysproperty key="solrHost" value="${solrHost}"/>
<sysproperty key="solrPort" value="${solrPort}"/>
<sysproperty key="messageServiceHost" value="${messageServiceHost}"/>
<sysproperty key="messageServicePort" value="${messageServicePort}"/>
<sysproperty key="isMultiUser" value="${isMultiUser}"/>
<!--needed to have tests NOT to steal focus when running, works in latest apple jdk update only.--> <!--needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
<sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/> <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
<formatter type="brief" usefile="false"/> <formatter type="brief" usefile="false"/>

View File

@ -53,7 +53,12 @@ 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.sleuthkit.autopsy.core.UserPreferences;
import org.sleuthkit.autopsy.core.UserPreferencesException;
import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo;
import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestManager;
import org.sleuthkit.datamodel.CaseDbConnectionInfo;
import org.sleuthkit.datamodel.TskData;
public class AutopsyTestCases { public class AutopsyTestCases {
@ -78,8 +83,13 @@ public class AutopsyTestCases {
} }
} }
public AutopsyTestCases() { public AutopsyTestCases(boolean isMultiUser) {
start = 0; start = 0;
if (isMultiUser) {
setMultiUserPerferences();
} else {
UserPreferences.setIsMultiUserModeEnabled(false);
}
} }
public void testNewCaseWizardOpen(String title) { public void testNewCaseWizardOpen(String title) {
@ -340,4 +350,34 @@ public class AutopsyTestCases {
timeouts.setTimeout(name, value); timeouts.setTimeout(name, value);
return timeouts; return timeouts;
} }
private void setMultiUserPerferences() {
UserPreferences.setIsMultiUserModeEnabled(true);
//PostgreSQL database settings
CaseDbConnectionInfo connectionInfo = new CaseDbConnectionInfo(
System.getProperty("dbHost"),
System.getProperty("dbPort"),
System.getProperty("dbUserName"),
System.getProperty("dbPassword"),
TskData.DbType.POSTGRESQL);
try {
UserPreferences.setDatabaseConnectionInfo(connectionInfo);
} catch (UserPreferencesException ex) {
logger.log(Level.SEVERE, "Error saving case database connection info", ex); //NON-NLS
}
//Solr Index settings
UserPreferences.setIndexingServerHost(System.getProperty("solrHost"));
UserPreferences.setIndexingServerPort(Integer.parseInt(System.getProperty("solrPort")));
//ActiveMQ Message Service Setting, username and password field are empty
MessageServiceConnectionInfo msgServiceInfo = new MessageServiceConnectionInfo(
System.getProperty("messageServiceHost"),
Integer.parseInt(System.getProperty("messageServicePort")),
"",
"");
try {
UserPreferences.setMessageServiceConnectionInfo(msgServiceInfo);
} catch (UserPreferencesException ex) {
logger.log(Level.SEVERE, "Error saving messaging service connection info", ex); //NON-NLS
}
}
} }

View File

@ -41,7 +41,7 @@ import org.netbeans.junit.NbModuleSuite;
public class RegressionTest extends TestCase { public class RegressionTest extends TestCase {
private static final Logger logger = Logger.getLogger(RegressionTest.class.getName()); private static final Logger logger = Logger.getLogger(RegressionTest.class.getName());
private static final AutopsyTestCases autopsyTests = new AutopsyTestCases(); private static AutopsyTestCases autopsyTests = new AutopsyTestCases(Boolean.parseBoolean(System.getProperty("isMultiUser")));
/** /**
* Constructor required by JUnit * Constructor required by JUnit