mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-06 21:00:22 +00:00
more flexible serialization and active mq fix
This commit is contained in:
parent
49b5e3b527
commit
99982a3c5e
@ -298,8 +298,8 @@
|
|||||||
<property name="test.includes" value="**/org/sleuthkit/autopsy/integrationtesting/TestRunner.class"/>
|
<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.
|
<!-- 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
|
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) -->
|
under timeout() or in the harness README. Current value is 4 hours (4 * 60 * 60 * 1000) -->
|
||||||
<property name="test.timeout" value="3600000"/>
|
<property name="test.timeout" value="14400000"/>
|
||||||
<antcall target="projectized-common.test-qa-functional" />
|
<antcall target="projectized-common.test-qa-functional" />
|
||||||
</sequential>
|
</sequential>
|
||||||
</target>
|
</target>
|
||||||
|
@ -313,9 +313,9 @@ public class IntegrationTestService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// retrieve values
|
// retrieve values
|
||||||
String username = connectionInfo.getUserName();
|
|
||||||
String host = connectionInfo.getHostName();
|
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();
|
int port = connectionInfo.getPort() == null ? DEFAULT_ACTIVEMQ_PORT : connectionInfo.getPort();
|
||||||
|
|
||||||
// ensure all necessary values are present.
|
// ensure all necessary values are present.
|
||||||
|
@ -19,11 +19,13 @@
|
|||||||
package org.sleuthkit.autopsy.integrationtesting.config;
|
package org.sleuthkit.autopsy.integrationtesting.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration information for a postgres connection.
|
* Configuration information for a postgres connection.
|
||||||
*/
|
*/
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class ConnectionConfig {
|
public class ConnectionConfig {
|
||||||
private final String hostName;
|
private final String hostName;
|
||||||
private final Integer port;
|
private final Integer port;
|
||||||
|
@ -19,11 +19,13 @@
|
|||||||
package org.sleuthkit.autopsy.integrationtesting.config;
|
package org.sleuthkit.autopsy.integrationtesting.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines integration testing environment settings.
|
* Defines integration testing environment settings.
|
||||||
*/
|
*/
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class EnvConfig {
|
public class EnvConfig {
|
||||||
|
|
||||||
private final String rootCaseOutputPath;
|
private final String rootCaseOutputPath;
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
package org.sleuthkit.autopsy.integrationtesting.config;
|
package org.sleuthkit.autopsy.integrationtesting.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -27,6 +28,7 @@ import java.util.List;
|
|||||||
* Configuration for running Integration Tests including things like ingest
|
* Configuration for running Integration Tests including things like ingest
|
||||||
* parameters, datasource locations, cases to create, tests to run, etc.
|
* parameters, datasource locations, cases to create, tests to run, etc.
|
||||||
*/
|
*/
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class IntegrationTestConfig {
|
public class IntegrationTestConfig {
|
||||||
|
|
||||||
private final List<TestSuiteConfig> testSuites;
|
private final List<TestSuiteConfig> testSuites;
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.sleuthkit.autopsy.integrationtesting.config;
|
package org.sleuthkit.autopsy.integrationtesting.config;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.core.JsonParser;
|
import com.fasterxml.jackson.core.JsonParser;
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.databind.DeserializationContext;
|
import com.fasterxml.jackson.databind.DeserializationContext;
|
||||||
@ -39,6 +40,7 @@ import java.util.Map;
|
|||||||
/**
|
/**
|
||||||
* A resource that potentially has parameters as well.
|
* A resource that potentially has parameters as well.
|
||||||
*/
|
*/
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
@JsonDeserialize(using = ParameterizedResourceConfig.ParameterizedResourceConfigDeserializer.class)
|
@JsonDeserialize(using = ParameterizedResourceConfig.ParameterizedResourceConfigDeserializer.class)
|
||||||
public class ParameterizedResourceConfig {
|
public class ParameterizedResourceConfig {
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
package org.sleuthkit.autopsy.integrationtesting.config;
|
package org.sleuthkit.autopsy.integrationtesting.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -26,6 +27,7 @@ import java.util.List;
|
|||||||
/**
|
/**
|
||||||
* Configuration per test suite.
|
* Configuration per test suite.
|
||||||
*/
|
*/
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class TestSuiteConfig {
|
public class TestSuiteConfig {
|
||||||
|
|
||||||
private final String name;
|
private final String name;
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
package org.sleuthkit.autopsy.integrationtesting.config;
|
package org.sleuthkit.autopsy.integrationtesting.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@ -33,6 +34,7 @@ import org.apache.commons.collections4.MapUtils;
|
|||||||
/**
|
/**
|
||||||
* Configuration for which integration test suites to run.
|
* Configuration for which integration test suites to run.
|
||||||
*/
|
*/
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class TestingConfig {
|
public class TestingConfig {
|
||||||
|
|
||||||
private final Map<String, ParameterizedResourceConfig> excludeAllExcept;
|
private final Map<String, ParameterizedResourceConfig> excludeAllExcept;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user