diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..90b51996f9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: java +sudo: required +dist: trusty +os: + - linux +env: + global: + - TSK_HOME=$TRAVIS_BUILD_DIR/sleuthkit/sleuthkit +jdk: + - oraclejdk8 +before_install: + - git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit +install: + - sudo apt-get install testdisk + - cd sleuthkit/sleuthkit + - sh install-sleuthkit.sh +script: + - cd $TRAVIS_BUILD_DIR/ + - ant build + - cd Core/ + - xvfb-run ant test + diff --git a/Core/build.xml b/Core/build.xml index c7669a0cd7..3555ff0711 100644 --- a/Core/build.xml +++ b/Core/build.xml @@ -12,7 +12,7 @@ - + @@ -83,6 +83,7 @@ + diff --git a/Core/test/filter_test1.img b/Core/test/filter_test1.img deleted file mode 100755 index 69b6e21b6c..0000000000 Binary files a/Core/test/filter_test1.img and /dev/null differ diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java index 1a98aa7d07..c800fd731f 100644 --- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java +++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java @@ -32,6 +32,7 @@ import org.sleuthkit.autopsy.casemodule.CaseActionException; import org.sleuthkit.autopsy.casemodule.CaseDetails; import junit.framework.Test; import org.apache.commons.io.FileUtils; +import org.netbeans.junit.NbTestCase; import org.openide.util.Exceptions; import org.python.icu.impl.Assert; import org.sleuthkit.autopsy.casemodule.ImageDSProcessor; @@ -47,11 +48,11 @@ import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.TskCoreException; -public class IngestFileFiltersTest extends TestCase { +public class IngestFileFiltersTest extends NbTestCase { private static final Path CASE_DIRECTORY_PATH = Paths.get(System.getProperty("java.io.tmpdir"), "IngestFileFiltersTest"); private static final File CASE_DIR = new File(CASE_DIRECTORY_PATH.toString()); - private static final Path IMAGE_PATH = Paths.get("test/filter_test1.img"); + private final Path IMAGE_PATH = Paths.get(this.getDataDir().toString(),"filter_test1.img"); public static Test suite() { NbModuleSuite.Configuration conf = NbModuleSuite.createConfiguration(IngestFileFiltersTest.class). @@ -60,6 +61,10 @@ public class IngestFileFiltersTest extends TestCase { return conf.suite(); } + public IngestFileFiltersTest(String name) { + super(name); + } + @Override public void setUp() { // Delete the test directory, if it exists @@ -82,7 +87,7 @@ public class IngestFileFiltersTest extends TestCase { } catch (CaseActionException ex) { Exceptions.printStackTrace(ex); Assert.fail(ex); - } + } assertTrue(CASE_DIR.exists()); ImageDSProcessor dataSourceProcessor = new ImageDSProcessor(); try {