diff --git a/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt b/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt index d5c0fbff8e4ddc5373cc05a68296bb9324dc3039..753d0016ad7cb2d0075de2a9055961ad5f97378b 100644 --- a/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt +++ b/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt @@ -174,6 +174,6 @@ otb_add_test(NAME owTuDocExampleStructureNew COMMAND otbApplicationEngineTestDri ) otb_add_test(NAME owTvApplicationMemoryConnectTest COMMAND otbApplicationEngineTestDriver otbApplicationMemoryConnectTest - ${CMAKE_BINARY_DIR}/lib/otb/applications + $<TARGET_FILE_DIR:otbapp_Smoothing> ${INPUTDATA}/poupees.tif ${TEMP}/owTvApplicationMemoryConnectTestOutput.tif) diff --git a/Modules/Wrappers/SWIG/test/python/Bug736.py b/Modules/Wrappers/SWIG/test/python/Bug736.py index bc2058bd5271226932bdf0d04ff92bbb0d8d43c8..a32a5ff0b9a08bfcf1e8a554dccaac1e9ef7d107 100644 --- a/Modules/Wrappers/SWIG/test/python/Bug736.py +++ b/Modules/Wrappers/SWIG/test/python/Bug736.py @@ -10,8 +10,8 @@ def test(otbApplication, argv): RadiometricIndices.SetParameterStringList("list", ["Vegetation:NDVI","Vegetation:RVI","Vegetation:IPVI"]) - print RadiometricIndices.GetParameterStringList("list") + print( RadiometricIndices.GetParameterStringList("list") ) - print RadiometricIndices.GetParameterValue("list") + print( RadiometricIndices.GetParameterValue("list") ) RadiometricIndices.ExecuteAndWriteOutput() diff --git a/Modules/Wrappers/SWIG/test/python/Bug804.py b/Modules/Wrappers/SWIG/test/python/Bug804.py index 1fecc1bdfb477864f1cc4934c7a0103121e926f2..9c04a6853473acf5abc1a6f05e3475acb9313ff7 100644 --- a/Modules/Wrappers/SWIG/test/python/Bug804.py +++ b/Modules/Wrappers/SWIG/test/python/Bug804.py @@ -1,4 +1,4 @@ def test(otb, argv): app = otb.Registry.CreateApplication('TrainImagesClassifier') app.SetParameterFloat('classifier.libsvm.opt',True) - print app.GetParameterValue('classifier.libsvm.opt') + print( app.GetParameterValue('classifier.libsvm.opt') ) diff --git a/Modules/Wrappers/SWIG/test/python/Bug823.py b/Modules/Wrappers/SWIG/test/python/Bug823.py index 948217c3985d67a9916bda3f38c51ba9acf3b4f6..9c97558bcea8bb07a4149cb3da3af9061a13bbc7 100644 --- a/Modules/Wrappers/SWIG/test/python/Bug823.py +++ b/Modules/Wrappers/SWIG/test/python/Bug823.py @@ -4,7 +4,7 @@ def test(otb, argv): try: app.GetParameterInt('szx') except RuntimeError, e: - print "Exception message : " + e.args[0] + print( "Exception message : " + e.args[0] ) if e.args[0].startswith("boost::bad_any_cast"): exit(1) diff --git a/Modules/Wrappers/SWIG/test/python/CMakeLists.txt b/Modules/Wrappers/SWIG/test/python/CMakeLists.txt index a75b4bd601ef1ca2d2e1e1fcbffc31a78d34ce48..bc43f7b510ef01c24baf6cf9452f0fe4f60f08b0 100644 --- a/Modules/Wrappers/SWIG/test/python/CMakeLists.txt +++ b/Modules/Wrappers/SWIG/test/python/CMakeLists.txt @@ -5,9 +5,9 @@ set(TEST_DRIVER otbTestDriver if(WIN32) # on windows, loading the module _otbApplication requires the otbossimplugins*.dll - # which is in the 'bin' folder + # which is in the 'bin/<CMAKE_BUILD_TYPE>' folder set(TEST_DRIVER ${TEST_DRIVER} - --add-before-env PATH ${OTB_BINARY_DIR}/bin) + --add-before-env PATH $<TARGET_FILE_DIR:OTBCommon>) endif(WIN32) add_test( NAME pyTvSmoothing diff --git a/Modules/Wrappers/SWIG/test/python/PythonNewStyleParametersTest.py b/Modules/Wrappers/SWIG/test/python/PythonNewStyleParametersTest.py index aa22f2d303a5114dd71148792b062b15ab2b1e72..18a155b7c8a7bd44ab0fe667751037083a8f0a44 100644 --- a/Modules/Wrappers/SWIG/test/python/PythonNewStyleParametersTest.py +++ b/Modules/Wrappers/SWIG/test/python/PythonNewStyleParametersTest.py @@ -14,9 +14,9 @@ def test(otb, argv): app = otb.Registry.CreateApplication('OrthoRectification') # test GetParameterTypeAsString() method in python. - print app.GetParameterTypeAsString(otb.ParameterType_InputImage) - print app.GetParameterTypeAsString(otb.ParameterType_String) - print app.GetParameterTypeAsString(otb.ParameterType_Empty) + print( app.GetParameterTypeAsString(otb.ParameterType_InputImage) ) + print( app.GetParameterTypeAsString(otb.ParameterType_String) ) + print( app.GetParameterTypeAsString(otb.ParameterType_Empty) ) # one test for each parameter type (string, float, int, ...) diff --git a/Modules/Wrappers/SWIG/test/python/PythonSmoothingTest.py b/Modules/Wrappers/SWIG/test/python/PythonSmoothingTest.py index 900ff7827a78a667c8ab43b0352985cb799bffd7..b8567ce5da2fee984bea3d7ca8d2ee1418f4ef98 100644 --- a/Modules/Wrappers/SWIG/test/python/PythonSmoothingTest.py +++ b/Modules/Wrappers/SWIG/test/python/PythonSmoothingTest.py @@ -5,17 +5,17 @@ # def test(otb, argv): - print "Available applications : " + str(otb.Registry.GetAvailableApplications()) + print( "Available applications : " + str(otb.Registry.GetAvailableApplications()) ) app = otb.Registry.CreateApplication("Smoothing") - print app.GetParametersKeys() + print( app.GetParametersKeys() ) app.SetParameterString("in", argv[1]) - for type in ['mean', 'gaussian', 'anidif']: - print 'Testing ' + type - app.SetParameterString("type", type) - app.SetParameterString("out", argv[2] + type + ".tif") + for type_ in ['mean', 'gaussian', 'anidif']: + print( 'Testing ' + type_ ) + app.SetParameterString("type", type_) + app.SetParameterString("out", argv[2] + type_ + ".tif") app.ExecuteAndWriteOutput() - print dir(app) + print( dir(app) )