Skip to content

Commit edcc660

Browse files
committed
Unit test data migration complete. Closes #601
Look for master update of SCIRunTestData in a few minutes.
1 parent aabe3e3 commit edcc660

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2626
DEALINGS IN THE SOFTWARE.
2727
*/
28-
28+
2929
#include <gtest/gtest.h>
3030

3131
#include <Core/Algorithms/Legacy/Fields/FieldData/CalculateGradientsAlgo.h>
@@ -75,35 +75,35 @@ namespace
7575
vmesh->add_elem(vdata);
7676
return singleTetField_;
7777
}
78-
78+
7979
/*** TRI SURFs ***/
8080
FieldHandle CreateTriSurfScalarOnNode()
8181
{
82-
return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tri_surf/data_defined_on_node/scalar/tri_scalar_on_node.fld");
82+
return loadFieldFromFile(TestResources::rootDir() / "Fields/tri_surf/data_defined_on_node/scalar/tri_scalar_on_node.fld");
8383
}
8484
FieldHandle CreateTriSurfVectorOnNode()
8585
{
86-
return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tri_surf/data_defined_on_node/vector/tri_vector_on_node.fld");
86+
return loadFieldFromFile(TestResources::rootDir() / "Fields/tri_surf/data_defined_on_node/vector/tri_vector_on_node.fld");
8787
}
8888

8989
/*** TET MESHs ***/
9090
FieldHandle CreateTetMeshVectorOnNode()
9191
{
92-
return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tet_mesh/data_defined_on_node/vector/tet_vector_on_node.fld");
92+
return loadFieldFromFile(TestResources::rootDir() / "Fields/tet_mesh/data_defined_on_node/vector/tet_vector_on_node.fld");
9393
}
9494
FieldHandle CreateTetMeshScalarOnNode()
9595
{
96-
return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tet_mesh/data_defined_on_node/scalar/tet_scalar_on_node.fld");
96+
return loadFieldFromFile(TestResources::rootDir() / "Fields/tet_mesh/data_defined_on_node/scalar/tet_scalar_on_node.fld");
9797
}
9898
FieldHandle CreateTetMeshTensorOnNode()
9999
{
100-
return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tet_mesh/data_defined_on_node/tensor/tet_tensor_on_node.fld");
100+
return loadFieldFromFile(TestResources::rootDir() / "Fields/tet_mesh/data_defined_on_node/tensor/tet_tensor_on_node.fld");
101101
}
102-
102+
103103
/*** CLOUD POINT ***/
104104
FieldHandle CreatePointClodeScalar()
105105
{
106-
return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/point_cloud/scalar/pts_scalar.fld");
106+
return loadFieldFromFile(TestResources::rootDir() / "Fields/point_cloud/scalar/pts_scalar.fld");
107107
}
108108
}
109109

@@ -169,6 +169,3 @@ TEST(CalculateGradientsAlgoTests, NoFieldDataInput)
169169
CalculateGradientsAlgo algo;
170170
EXPECT_THROW(algo.run(in, out), AlgorithmInputException);
171171
}
172-
173-
174-

0 commit comments

Comments
 (0)