MRG: Merged from origin/develop.

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)

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()

Modules/Wrappers/SWIG/test/python/Bug804.py

 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') )

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)
 

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

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, ...)
 

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) )