More paths

Author: dcwhite

src/Core/Algorithms/DataIO/Tests/ReadMatrixTests.cc

@@ -183,7 +183,7 @@ TEST(ReadMatrixAlgorithmTest, DISABLED_TestLargeSparseFromRealASCIIMatFile)
 TEST(ReadMatrixAlgorithmTest, UnknownFileFormatThrows)
 {
   ReadMatrixAlgorithm algo;
-  auto notAMatrixFile = TestResources::rootDir() / "scirun5demo.srn";
+  auto notAMatrixFile = TestResources::rootDir() / "Other" / "scirun5demo.srn";
   if (boost::filesystem::exists(notAMatrixFile))
   {
     EXPECT_THROW(algo.run(notAMatrixFile.string()), Core::Algorithms::AlgorithmInputException);

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

@@ -25,7 +25,7 @@
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
 */
- 
+
 #include <gtest/gtest.h>
 #include <Core/Algorithms/Legacy/Fields/FieldData/CalculateVectorMagnitudesAlgo.h>
 #include <Core/Datatypes/Legacy/Field/VField.h>
@@ -74,37 +74,37 @@ namespace {
     vmesh->add_elem(vdata);
     return singleTetField_;
   }
-  
+
   /*** TRI SURFs ***/
   FieldHandle CreateTriSurfVectorOnNode()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tri_surf/data_defined_on_node/vector/tri_vector_on_node.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/tri_surf/data_defined_on_node/vector/tri_vector_on_node.fld");
   }
   FieldHandle CreateTriSurfVectorOnNodeSCIRun4Output()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/CalculatedVectorMagnitudesForTriSurfVectorOnNodeFromSCIRun4.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/CalculatedVectorMagnitudesForTriSurfVectorOnNodeFromSCIRun4.fld");
   }
   FieldHandle CreateTriSurfScalarOnNode()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tri_surf/data_defined_on_node/scalar/tri_scalar_on_node.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/tri_surf/data_defined_on_node/scalar/tri_scalar_on_node.fld");
   }
 
   /*** TET MESHs ***/
   FieldHandle CreateTetMeshVectorOnNode()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tet_mesh/data_defined_on_node/vector/tet_vector_on_node.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/tet_mesh/data_defined_on_node/vector/tet_vector_on_node.fld");
   }
   FieldHandle CreateTetMeshVectorOnNodeSCIRun4Output()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/CalculatedVectorMagnitudesForTetMeshVectorOnNodeFromSCIRun4.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/CalculatedVectorMagnitudesForTetMeshVectorOnNodeFromSCIRun4.fld");
   }
   FieldHandle CreateTetMeshScalarOnNode()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tet_mesh/data_defined_on_node/scalar/tet_scalar_on_node.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/tet_mesh/data_defined_on_node/scalar/tet_scalar_on_node.fld");
   }
   FieldHandle CreateTetMeshTensorOnNode()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tet_mesh/data_defined_on_node/tensor/tet_tensor_on_node.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/tet_mesh/data_defined_on_node/tensor/tet_tensor_on_node.fld");
   }
 }
 
@@ -114,17 +114,17 @@ TEST(CalculateVectorMagnitudesAlgoTests, CompareTriSurfVectorOnNodeToSCIRun4)
   FieldHandle out;
   CalculateVectorMagnitudesAlgo algo;
   algo.run(in, out);
-  
+
   FieldHandle SCIRUN4out = CreateTriSurfVectorOnNodeSCIRun4Output();
   VField* expected_vals = SCIRUN4out->vfield(); // what is to be expected
   VField* outputed_vals = out->vfield(); // the output
   double* expected_mag = reinterpret_cast<double*>(expected_vals->get_values_pointer());
   double* outputed_mag = reinterpret_cast<double*>(outputed_vals->get_values_pointer());
-  
+
   // getting the number of things to compare
   VMesh*  imesh  = in->vmesh();
   VField::size_type num_elems = imesh->num_elems();
-  
+
   for (VMesh::Elem::index_type idx = 0; idx < num_elems; idx++)
     EXPECT_EQ(expected_mag[idx],outputed_mag[idx]);
 }
@@ -142,18 +142,18 @@ TEST(CalculateVectorMagnitudesAlgoTests, TetMeshVectorOnNodeAsInput)
   FieldHandle in = CreateTetMeshVectorOnNode();
   FieldHandle out;
   CalculateVectorMagnitudesAlgo algo;
-  algo.run(in, out); 
-  
+  algo.run(in, out);
+
   FieldHandle SCIRUN4out = CreateTetMeshVectorOnNodeSCIRun4Output();
   VField* expected_vals = SCIRUN4out->vfield(); // what is to be expected
   VField* outputed_vals = out->vfield(); // the output
   double* expected_mag = reinterpret_cast<double*>(expected_vals->get_values_pointer());
   double* outputed_mag = reinterpret_cast<double*>(outputed_vals->get_values_pointer());
-  
+
   // getting the number of things to compare
   VMesh*  imesh  = in->vmesh();
   VField::size_type num_elems = imesh->num_elems();
-  
+
   // comparing every value
   for (VMesh::Elem::index_type idx = 0; idx < num_elems; idx++)
     EXPECT_EQ(expected_mag[idx],outputed_mag[idx]);

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

@@ -25,7 +25,7 @@
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
 */
- 
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -45,7 +45,7 @@ using namespace SCIRun::Core::Algorithms::Fields;
 using namespace SCIRun::TestUtils;
 using ::testing::NotNull;
 using ::testing::TestWithParam;
-using ::testing::Values; 
+using ::testing::Values;
 
 class GetDomainBoundaryTests : public ::testing::Test
 {
@@ -58,14 +58,14 @@ class GetDomainBoundaryTests : public ::testing::Test
   void runTest(bool includeOuterBoundary, bool useRange, int domainValue,
     int expectedBoundaryNodes, int expectedBoundaryElements)
   {
-    FieldHandle latVol = loadFieldFromFile(TestResources::rootDir() / "latVolWithNormData.fld");
+    FieldHandle latVol = loadFieldFromFile(TestResources::rootDir() / "Fields" / "latVolWithNormData.fld");
     ASSERT_TRUE(latVol->vmesh()->is_latvolmesh());
 
     GetDomainBoundaryAlgo algo;
 
     // How to set parameters on an algorithm (that come from the GUI)
     algo.set(Parameters::AddOuterBoundary, includeOuterBoundary);
-    
+
     /// @todo: this logic matches the wacky module behavior
 
     algo.set(Parameters::UseRange, useRange);
@@ -160,20 +160,20 @@ class GetDomainBoundaryTestsParameterized : public ::testing::TestWithParam < ::
   SparseRowMatrixHandle unused_;
   GetDomainBoundaryAlgo algo_;
   FieldHandle latVol_;
-  GetDomainBoundaryTestsParameterized() 
+  GetDomainBoundaryTestsParameterized()
   {
-    latVol_ = loadFieldFromFile(TestResources::rootDir() / "latVolWithNormData.fld");
+    latVol_ = loadFieldFromFile(TestResources::rootDir() / "Fields" / "latVolWithNormData.fld");
     SCIRun::Core::Logging::Log::get().setVerbose(true);
-  } 
+  }
 
 protected:
   virtual void SetUp()
   {
     ASSERT_TRUE(latVol_->vmesh()->is_latvolmesh());
-    
+
     // How to set parameters on an algorithm (that come from the GUI)
     algo_.set(Parameters::AddOuterBoundary, ::std::tr1::get<0>(GetParam()));
-    
+
     /// @todo: this logic matches the wacky module behavior
     algo_.set(Parameters::UseRange, ::std::tr1::get<1>(GetParam()));
     if (!::std::tr1::get<1>(GetParam()))///useRange)
@@ -185,7 +185,7 @@ class GetDomainBoundaryTestsParameterized : public ::testing::TestWithParam < ::
     }
 	//algo_.set(Parameters::InnerBoundaryOnly, ::std::tr1::get<3>(GetParam()));
 	//algo_.set(Parameters::NoInnerBoundary, ::std::tr1::get<4>(GetParam()));
-	//algo_.set(Parameters::DisconnectBoundaries, ::std::tr1::get<5>(GetParam())); 
+	//algo_.set(Parameters::DisconnectBoundaries, ::std::tr1::get<5>(GetParam()));
     //ASSERT_TRUE(algo_.runImpl(latVol, unused, boundary));
   }
   virtual void TearDown()
@@ -194,7 +194,7 @@ class GetDomainBoundaryTestsParameterized : public ::testing::TestWithParam < ::
 
 TEST_P(GetDomainBoundaryTestsParameterized, LatVolBoundry_Parameterized)
 {
-    //EXPECT_EQ(0, boundary->vmesh()->num_nodes()); 
+    //EXPECT_EQ(0, boundary->vmesh()->num_nodes());
   boundary_.reset();
   ASSERT_TRUE(algo_.runImpl(latVol_, unused_, boundary_));
   ASSERT_THAT(boundary_, NotNull());
@@ -206,9 +206,9 @@ TEST_P(GetDomainBoundaryTestsParameterized, LatVolBoundry_Parameterized)
 INSTANTIATE_TEST_CASE_P(
   LatVolBoundry_Parameterized,
   GetDomainBoundaryTestsParameterized,
-  Combine(Bool(), Bool(), Values(1,4), Values(1,4), Values(1,4)) 
+  Combine(Bool(), Bool(), Values(1,4), Values(1,4), Values(1,4))
   );
 #else
 TEST(DummyTest, CombineIsNotSupportedOnThisPlatform){}
 
-#endif 
+#endif