Path adjustments

Author: dcwhite

src/Core/Algorithms/FiniteElements/Tests/BuildFEMatrixTests.cc

@@ -25,7 +25,7 @@
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
 */
- 
+
 #include <Testing/Utils/SCIRunUnitTests.h>
 #include <Core/Datatypes/Legacy/Field/VField.h>
 #include <Core/Datatypes/Legacy/Field/FieldInformation.h>
@@ -47,19 +47,19 @@ using ::testing::NotNull;
 
 namespace FEInputData
 {
-  boost::filesystem::path feMeshRoot() 
+  boost::filesystem::path feMeshRoot()
   {
-    return TestResources::rootDir() / "buildFE" / "inputFields";
+    return TestResources::rootDir() / "Fields" / "buildFE" / "inputFields";
   }
 
   FieldHandle loadTestMesh(const std::string& file)
   {
     return loadFieldFromFile(feMeshRoot() / file);
   }
-   
-  boost::filesystem::path expectedOutputRoot() 
+
+  boost::filesystem::path expectedOutputRoot()
   {
-    return TestResources::rootDir() / "buildFE" / "v4Output";
+    return TestResources::rootDir() / "Matrices" / "buildFE" / "v4Output";
   }
 
   SparseRowMatrixHandle expectedOutput(const std::string& file)
@@ -100,7 +100,7 @@ TEST(BuildFEMatrixAlgorithmTests, TestMeshSize1e1)
 
   EXPECT_EQ(7, output->nrows());
   EXPECT_EQ(7, output->ncols());
-    
+
   EXPECT_DOUBLE_EQ(0.5855738571534416, output->coeff(0,0));
   EXPECT_DOUBLE_EQ(0.3117198873128934, output->coeff(output->nrows() - 1, output->ncols() - 1));
 
@@ -197,4 +197,4 @@ TEST(BuildFEMatrixAlgorithmTests, TestMeshSize1e6)
   EXPECT_DOUBLE_EQ(0.066666666666666666, output->coeff(output->nrows() - 1, output->ncols() - 1));
 
   EXPECT_TRUE(compare_with_tolerance(*expectedOutput("1e6.mat"), *output));
-}
+}

src/Core/Algorithms/FiniteElements/Tests/BuildTDCSMatrixTests.cc

@@ -25,7 +25,7 @@
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
 */
- 
+
 #include <Testing/Utils/SCIRunUnitTests.h>
 #include <Core/Datatypes/Legacy/Field/VField.h>
 #include <Core/Datatypes/Legacy/Field/FieldInformation.h>
@@ -52,44 +52,44 @@ namespace TDCSInputData
       (0,0,0)
       (0,2,0));
   }
-  
+
   FieldHandle mesh()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "mesh_scirun5.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields" / "mesh_scirun5.fld");
   }
-  
+
   DenseMatrixHandle ElectrodeElements()
   {
     /// @todo: MORITZ insert values as above.
     return MAKE_DENSE_MATRIX_HANDLE(
       (1,0)
       (0,1));
   }
-  
+
   DenseMatrixHandle ElectrodeElementType()
   {
     /// @todo: MORITZ insert values as above.
     return MAKE_DENSE_MATRIX_HANDLE(
       (1,0)
       (0,1));
   }
-  
+
   DenseMatrixHandle ElectrodeElementDefinition()
   {
     /// @todo: MORITZ insert values as above.
     return MAKE_DENSE_MATRIX_HANDLE(
       (1,0)
       (0,1));
   }
-  
+
   DenseMatrixHandle contactimpedance()
   {
     /// @todo: MORITZ insert values as above.
     return MAKE_DENSE_MATRIX_HANDLE(
       (1,0)
       (0,1));
   }
-  
+
   SparseRowMatrixHandle expectedOutput()
   {
     /// @todo: MORITZ insert values as above.
@@ -143,5 +143,5 @@ TEST(BuildTDCSMatrixAlgorithmTests, ThrowsForNullElectrodeElements)
 // etc for checks lines 567-575
 // cover as many error cases with tests as you can, there are a lot in TDCSMatrixBuilder::singlethread() but there may be reasonable conceptual groupings to simplify the test code (may also lead to simplifying/refactoring the algorithm code
 
-/// @todo next: 
-//TEST(BuildTDCSMatrixAlgorithmTests, SuccessfulRunTest)  //here's where you pass in the real matrices/fields above and compare the output to an expected matrix.
+/// @todo next:
+//TEST(BuildTDCSMatrixAlgorithmTests, SuccessfulRunTest)  //here's where you pass in the real matrices/fields above and compare the output to an expected matrix.