Skip to content

Commit ab8e41c

Browse files
authored
Merge pull request #933 from I2PC/fix_tests_hunting_day
Fixing function tests
2 parents 0812eed + 119253c commit ab8e41c

13 files changed

+13
-14
lines changed

src/xmipp/applications/tests/function_tests/test_cif_main.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class CIFTest : public ::testing::Test
1818
//init metadatas
1919
virtual void SetUp()
2020
{
21-
2221
}
2322
};
2423

src/xmipp/applications/tests/function_tests/test_ctf_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class CtfTest : public ::testing::Test
1616
virtual void SetUp()
1717
{
1818
//get example images/staks
19-
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
19+
if (chdir(((String)(getXmippSrcPath() + (String)"/xmipp/resources/test")).c_str())==-1)
2020
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
2121
// testBaseName = xmippPath + "/resources/test";
2222
imageName = "image/singleImage.spi";

src/xmipp/applications/tests/function_tests/test_dimred_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class DimRedTest : public ::testing::Test
2020
protected:
2121
virtual void SetUp()
2222
{
23-
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
23+
if (chdir(((String)(getXmippSrcPath() + (String)"/xmipp/resources/test")).c_str())==-1)
2424
REPORT_ERROR(ERR_UNCLASSIFIED,"Cannot change directory");
2525
}
2626
};

src/xmipp/applications/tests/function_tests/test_euler_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class EulerTest : public ::testing::Test
1313
//init metadatas
1414
virtual void SetUp()
1515
{
16-
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
16+
if (chdir(((String)(getXmippSrcPath() + (String)"/xmipp/resources/test")).c_str())==-1)
1717
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
1818
}
1919

src/xmipp/applications/tests/function_tests/test_filters_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class FiltersTest : public ::testing::Test
1111
//init metadatas
1212
virtual void SetUp()
1313
{
14-
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
14+
if (chdir(((String)(getXmippSrcPath() + (String)"/xmipp/resources/test")).c_str())==-1)
1515
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
1616

1717
mulDouble1.resize(3,3);

src/xmipp/applications/tests/function_tests/test_funcs_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class FuncTest : public ::testing::Test
1212
//init metadatas
1313
virtual void SetUp()
1414
{
15-
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
15+
if (chdir(((String)(getXmippSrcPath() + (String)"/xmipp/resources/test")).c_str())==-1)
1616
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
1717
//get example images/staks
1818
source1 = "funcs/singleImage.spi";

src/xmipp/applications/tests/function_tests/test_image_generic_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ImageGenericTest : public ::testing::Test
1515
virtual void SetUp()
1616
{
1717
//get example images/staks
18-
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
18+
if (chdir(((String)(getXmippSrcPath() + (String)"/xmipp/resources/test")).c_str())==-1)
1919
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
2020
// testBaseName = xmippPath + "/resources/test";
2121
imageName = "image/singleImage.spi";

src/xmipp/applications/tests/function_tests/test_image_main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class ImageTest : public ::testing::Test
1616
virtual void SetUp()
1717
{
1818
//get example images/staks
19-
xmippPath = getXmippPath();
20-
if (chdir(((String)(xmippPath + "/resources/test")).c_str())==-1)
19+
xmippPath = getXmippSrcPath();
20+
if (chdir(((String)(xmippPath + "/xmipp/resources/test")).c_str())==-1)
2121
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
2222
// testBaseName = xmippPath + "/resources/test";
2323
imageName = "image/singleImage.spi";

src/xmipp/applications/tests/function_tests/test_matrix_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MatrixTest : public ::testing::Test
1111
//init metadatas
1212
virtual void SetUp()
1313
{
14-
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
14+
if (chdir(((String)(getXmippSrcPath() + (String)"/xmipp/resources/test")).c_str())==-1)
1515
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
1616
A.resize(3,3);
1717
A(0,0) =-0.9234482 ;

src/xmipp/applications/tests/function_tests/test_metadata_db_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MetadataTest : public ::testing::Test
2727

2828
virtual void SetUp()
2929
{
30-
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
30+
if (chdir(((String)(getXmippSrcPath() + (String)"/xmipp/resources/test")).c_str())==-1)
3131
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
3232
//Md1
3333
id = mDsource.addObject();

0 commit comments

Comments
 (0)