mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

more flexible serialization and active mq fix

Browse Source
This commit is contained in:
Greg DiCristofaro 2021-01-25 14:36:25 -05:00
parent 49b5e3b527
commit 99982a3c5e
8 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/build.xml
View File

@ -298,8 +298,8 @@
<property name="test.includes" value="**/org/sleuthkit/autopsy/integrationtesting/TestRunner.class"/>
<!-- This overrides the value in common.xml:test-init that sets each test lasting 10 minutes maximum.
More information on the timeout can be found here: http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/org/netbeans/junit/NbTestCase.html
under timeout() or in the harness README. Current value is 1 hour (60 * 60 * 1000) -->
<property name="test.timeout" value="3600000"/>
under timeout() or in the harness README. Current value is 4 hours (4 * 60 * 60 * 1000) -->
<property name="test.timeout" value="14400000"/>
<antcall target="projectized-common.test-qa-functional" />
</sequential>
</target>

4
Core/src/org/sleuthkit/autopsy/integrationtesting/IntegrationTestService.java
View File

@ -313,9 +313,9 @@ public class IntegrationTestService {
}
// retrieve values
String username = connectionInfo.getUserName();
String host = connectionInfo.getHostName();
String password = connectionInfo.getPassword();
String username = connectionInfo.getUserName() == null ? "" : connectionInfo.getUserName();
String password = connectionInfo.getPassword() == null ? "" : connectionInfo.getPassword();
int port = connectionInfo.getPort() == null ? DEFAULT_ACTIVEMQ_PORT : connectionInfo.getPort();
// ensure all necessary values are present.

2
Core/src/org/sleuthkit/autopsy/integrationtesting/config/ConnectionConfig.java
View File

@ -19,11 +19,13 @@
package org.sleuthkit.autopsy.integrationtesting.config;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Configuration information for a postgres connection.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class ConnectionConfig {
private final String hostName;
private final Integer port;

2
Core/src/org/sleuthkit/autopsy/integrationtesting/config/EnvConfig.java
View File

@ -19,11 +19,13 @@
package org.sleuthkit.autopsy.integrationtesting.config;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Defines integration testing environment settings.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class EnvConfig {
private final String rootCaseOutputPath;

2
Core/src/org/sleuthkit/autopsy/integrationtesting/config/IntegrationTestConfig.java
View File

@ -19,6 +19,7 @@
package org.sleuthkit.autopsy.integrationtesting.config;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Collections;
import java.util.List;
@ -27,6 +28,7 @@ import java.util.List;
* Configuration for running Integration Tests including things like ingest
* parameters, datasource locations, cases to create, tests to run, etc.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class IntegrationTestConfig {
private final List<TestSuiteConfig> testSuites;

2
Core/src/org/sleuthkit/autopsy/integrationtesting/config/ParameterizedResourceConfig.java
View File

@ -18,6 +18,7 @@
*/
package org.sleuthkit.autopsy.integrationtesting.config;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
@ -39,6 +40,7 @@ import java.util.Map;
/**
* A resource that potentially has parameters as well.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonDeserialize(using = ParameterizedResourceConfig.ParameterizedResourceConfigDeserializer.class)
public class ParameterizedResourceConfig {

2
Core/src/org/sleuthkit/autopsy/integrationtesting/config/TestSuiteConfig.java
View File

@ -19,6 +19,7 @@
package org.sleuthkit.autopsy.integrationtesting.config;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Collections;
import java.util.List;
@ -26,6 +27,7 @@ import java.util.List;
/**
* Configuration per test suite.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class TestSuiteConfig {
private final String name;

2
Core/src/org/sleuthkit/autopsy/integrationtesting/config/TestingConfig.java
View File

@ -19,6 +19,7 @@
package org.sleuthkit.autopsy.integrationtesting.config;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Collections;
import java.util.HashMap;
@ -33,6 +34,7 @@ import org.apache.commons.collections4.MapUtils;
/**
* Configuration for which integration test suites to run.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class TestingConfig {
private final Map<String, ParameterizedResourceConfig> excludeAllExcept;