Skip to content

Fixing function tests #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
albertmena merged 4 commits into from
Nov 11, 2024
Merged

Fixing function tests #933

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c11d01d
Fix XmippSrc path in tests
DavidHerreros Oct 31, 2024
7a2e80c
removing print
albertmena Nov 11, 2024
ab5fefb
fixing path
albertmena Nov 11, 2024
119253c
Merge branch 'devel' into fix_tests_hunting_day
albertmena Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_ctf_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class CtfTest : public ::testing::Test
virtual void SetUp()
{
//get example images/staks
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
// testBaseName = xmippPath + "/resources/test";
imageName = "image/singleImage.spi";
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_dimred_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class DimRedTest : public ::testing::Test
protected:
virtual void SetUp()
{
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Cannot change directory");
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_euler_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class EulerTest : public ::testing::Test
//init metadatas
virtual void SetUp()
{
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
}

Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_filters_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class FiltersTest : public ::testing::Test
//init metadatas
virtual void SetUp()
{
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");

mulDouble1.resize(3,3);
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_funcs_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class FuncTest : public ::testing::Test
//init metadatas
virtual void SetUp()
{
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
//get example images/staks
source1 = "funcs/singleImage.spi";
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_image_generic_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ImageGenericTest : public ::testing::Test
virtual void SetUp()
{
//get example images/staks
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
// testBaseName = xmippPath + "/resources/test";
imageName = "image/singleImage.spi";
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_image_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ImageTest : public ::testing::Test
virtual void SetUp()
{
//get example images/staks
xmippPath = getXmippPath();
xmippPath = getXmippSrcPath();
if (chdir(((String)(xmippPath + "/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
// testBaseName = xmippPath + "/resources/test";
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_matrix_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class MatrixTest : public ::testing::Test
//init metadatas
virtual void SetUp()
{
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
A.resize(3,3);
A(0,0) =-0.9234482 ;
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_metadata_db_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MetadataTest : public ::testing::Test

virtual void SetUp()
{
if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
//Md1
id = mDsource.addObject();
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_metadata_vec_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class MetadataTest : public ::testing::Test
{
size_t id;

if (chdir(((String)(getXmippPath() + (String)"/resources/test")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Could not change directory");
// Md1
id = mDsource.addObject();
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_radAvgNonCubic_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class RadAvgNonCubicTest : public ::testing::Test
virtual void SetUp()
{
//get example volume
if (chdir(((String)(getXmippPath() + (String)"/resources/test/image")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test/image")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Cannot change directory");
img.read("smallVolume.vol");
}
Expand Down
2 changes: 1 addition & 1 deletion src/xmipp/applications/tests/function_tests/test_wavelets_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class WaveletTests : public ::testing::Test
{
#define len 128
//get example down1_42_Periodogramavg.psd
if (chdir(((String)(getXmippPath() + (String)"/resources/test/filters")).c_str())==-1)
if (chdir(((String)(getXmippSrcPath() + (String)"/resources/test/filters")).c_str())==-1)
REPORT_ERROR(ERR_UNCLASSIFIED,"Cannot change directory");
Image<double> img;
img.read("KLH.tif");
Expand Down
1 change: 0 additions & 1 deletion xmipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ def modeTest(args: argparse.Namespace):
logger("Running all tests--------------------------------------", forceConsoleOutput=True)
runTests(PARAMS[PARAM_TEST_PRO][LONG_VERSION])
elif args.allFuncs:
print(args.allPrograms)
runTests(PARAMS[PARAM_TEST_FUNC][LONG_VERSION])

elif args.testName:
Expand Down
Loading