Merge branch 'SCIInstitute/master'

Author: allywarner

.travis.yml

@@ -32,7 +32,12 @@ install:
 # TODO: could move script to separate file
 # Not running unit tests at the moment, so turn off testing, which will
 # hopefully make OS X builds a bit faster
-script: cd bin && cmake -DBUILD_TESTING:BOOL=OFF -DDOWNLOAD_TOOLKITS:BOOL=OFF ../src && make -j8
+script:
+  cd bin
+  && cmake -DDOWNLOAD_TOOLKITS:BOOL=OFF -DRUN_BASIC_REGRESSION_TESTS:BOOL=OFF ../src
+  && make -j8
+  && make SCIRunTestData_external
+#  && make test
 
 notifications:
   slack: sciinstitute:lZnpQQXNd4Io5iGDPQDpJmI1

src/CMakeLists.txt

@@ -313,6 +313,7 @@ MARK_AS_ADVANCED(DOWNLOAD_TOOLKITS)
 IF(DOWNLOAD_TOOLKITS)
   INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMake/ToolkitsConfig.cmake)
   EXTERNAL_TOOLKIT(BrainStimulator)
+  EXTERNAL_TOOLKIT(FwdInvToolkit)
 ENDIF()
 
 ########################################################################
@@ -729,6 +730,8 @@ SET_PROPERTY(TARGET Core_Application         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Application_Preferences         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Application_Session         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Utils         PROPERTY FOLDER "Core")
+SET_PROPERTY(TARGET Core_ICom         PROPERTY FOLDER "Core")
+SET_PROPERTY(TARGET Core_Services         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Math         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Matlab         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Parser         PROPERTY FOLDER "Core")

src/Core/Algorithms/Field/Tests/BuildMatrixOfSurfaceNormalsTests.cc

@@ -43,7 +43,7 @@ using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Core; 
 using namespace SCIRun::TestUtils;
 
-TEST(BuildMatrixOfSurfaceNormalsTests, InOutNoCrash)
+TEST(BuildMatrixOfSurfaceNormalsTests, DISABLED_InOutNoCrash)
 {
   //BuildMatrixOfSurfaceNormalsAlgo algo;
 	//FieldHandle surfMesh = loadFieldFromFile(TestResources::rootDir() / "simple_cube_trisurf.fld");
@@ -52,6 +52,6 @@ TEST(BuildMatrixOfSurfaceNormalsTests, InOutNoCrash)
 	//Datatypes::DenseMatrixHandle output_matrix; 
 	//algo.runImpl(surfMesh, output_matrix); 
 
-	EXPECT_EQ(1,1); 
+	FAIL() << "TODO"; 
 
 }

src/Core/Algorithms/Field/Tests/GetFieldDataAlgoTests.cc

@@ -40,6 +40,21 @@ last change: 04/10/2014
 
 using namespace SCIRun::Core::Geometry;
 using namespace SCIRun::Core::Algorithms::Fields;
+using namespace SCIRun::Core::Algorithms;
+
+TEST(GetFieldDataTest, NullInputThrowsException)
+{
+  GetFieldDataAlgo algo;
+  FieldHandle nullField;
+
+  ASSERT_THROW(algo.run(nullField), AlgorithmInputException);
+}
+
+TEST(GetFieldDataTest, DISABLED_FieldNoDataThrowsException)
+{
+  // TODO: test field with type set to nodata (should throw AlgorithmInputException)
+  FAIL() << "TODO";
+}
 
 TEST(GetFieldDataTest, TriSurfOnNodeScalar)
 {
@@ -104,7 +119,7 @@ TEST(GetFieldDataTest, TetMeshOnNodeVector)
   EXPECT_MATRIX_EQ_TOLERANCE(*result, *expected_result, 1e-16);
 }
 
-TEST(GetFieldDataTest, TetMeshOnNodeTensor)
+TEST(GetFieldDataTest, DISABLED_TetMeshOnNodeTensor)
 {
   /*  Does not work since SCIRun5 ReadField cannot load in that files
 
@@ -115,10 +130,11 @@ TEST(GetFieldDataTest, TetMeshOnNodeTensor)
 
   EXPECT_MATRIX_EQ_TOLERANCE(*result, *expected_result, 1e-16);
   */
+  FAIL() << "TODO";
 }
 
 
-TEST(GetFieldDataTest, TetMeshOnElemScalar)
+TEST(GetFieldDataTest, DISABLED_TetMeshOnElemScalar)
 {
   GetFieldDataAlgo algo;
 
@@ -138,7 +154,7 @@ TEST(GetFieldDataTest, TetMeshOnElemVector)
   EXPECT_MATRIX_EQ_TOLERANCE(*result, *expected_result, 1e-16);
 }
 
-TEST(GetFieldDataTest, TetMeshOnElemTensor)
+TEST(GetFieldDataTest, DISABLED_TetMeshOnElemTensor)
 {
   /*
   GetFieldDataAlgo algo; 
@@ -154,6 +170,7 @@ TEST(GetFieldDataTest, TetMeshOnElemTensor)
 
   EXPECT_MATRIX_EQ_TOLERANCE(*result, *expected_result, 1e-16);
   */ 
+  FAIL() << "TODO";
 }
 
 
@@ -177,7 +194,7 @@ TEST(GetFieldDataTest, PointCloudOnNodeVector)
   EXPECT_MATRIX_EQ_TOLERANCE(*result, *expected_result, 1e-16);
 }
 
-TEST(GetFieldDataTest, PointCloudOnNodeTensor)
+TEST(GetFieldDataTest, DISABLED_PointCloudOnNodeTensor)
 {
   /*
   GetFieldDataAlgo algo;
@@ -187,6 +204,7 @@ TEST(GetFieldDataTest, PointCloudOnNodeTensor)
 
   EXPECT_MATRIX_EQ_TOLERANCE(*result, *expected_result, 1e-16);
   */
+  FAIL() << "TODO";
 }