Updating tests for module behavior

diff --git a/test/test6701/Doc_TUI_Exemple_01.py b/test/test6701/Doc_TUI_Exemple_01.py
index 13edd6f3d2ec0d62422463f87d24a219d85be6f6..4eb2b34fcde44b2b577684196ec309ff8a078982 100644 (file)
--- a/test/test6701/Doc_TUI_Exemple_01.py
+++ b/test/test6701/Doc_TUI_Exemple_01.py
@@ -27,7 +27,7 @@ from utExtend import assertAlmostEqualArrays
 def test1():
     """Test"""
     from numpy import array, matrix
-    import adaoBuilder
+    from adao import adaoBuilder
     case = adaoBuilder.New()
     case.set( 'AlgorithmParameters', Algorithm='3DVAR' )
     case.set( 'Background',          Vector=[0, 1, 2] )

diff --git a/test/test6702/Doc_TUI_Exemple_02.py b/test/test6702/Doc_TUI_Exemple_02.py
index 7691cbc97d57989b4c8414d9c5ec9f489383850b..98e01dd5b48df14aa6d9d3b77c8e3ad282e428c0 100644 (file)
--- a/test/test6702/Doc_TUI_Exemple_02.py
+++ b/test/test6702/Doc_TUI_Exemple_02.py
@@ -27,7 +27,7 @@ from utExtend import assertAlmostEqualArrays
 def test1():
     """Test"""
     from numpy import array, matrix
-    import adaoBuilder
+    from adao import adaoBuilder
     case = adaoBuilder.New()
     case.set( 'AlgorithmParameters', Algorithm='3DVAR' )
     case.set( 'Background',          Vector=[0, 1, 2] )
@@ -43,7 +43,7 @@ def test1():
 def test2():
     """Test"""
     from numpy import array, matrix
-    import adaoBuilder
+    from adao import adaoBuilder
     case = adaoBuilder.New()
     case.set( 'AlgorithmParameters', Algorithm='3DVAR' )
     case.set( 'Background',          Vector=[0, 1, 2] )

diff --git a/test/test6703/Doc_TUI_Exemple_03.py b/test/test6703/Doc_TUI_Exemple_03.py
index fa855526703706d569d6fca67008e60e1f619ecb..dde6135b8dc59adf83a6ca4ad9f692c6e32ececf 100644 (file)
--- a/test/test6703/Doc_TUI_Exemple_03.py
+++ b/test/test6703/Doc_TUI_Exemple_03.py
@@ -50,7 +50,7 @@ observations = simulation((2, 3, 4))
 def test1():
     "Test"
     import numpy
-    import adaoBuilder
+    from adao import adaoBuilder
     #
     # Mise en forme des entrees
     # -------------------------

diff --git a/test/test6711/Doc_TUI_Exemple_01_Savings.py b/test/test6711/Doc_TUI_Exemple_01_Savings.py
index fa80ce0622a256539a553402390bb315f143bd61..0bb224b9ea41152766b7913e01659b1b61434649 100644 (file)
--- a/test/test6711/Doc_TUI_Exemple_01_Savings.py
+++ b/test/test6711/Doc_TUI_Exemple_01_Savings.py
@@ -28,7 +28,7 @@ from utExtend import assertAlmostEqualArrays
 def test1():
     """Test"""
     from numpy import array, matrix
-    import adaoBuilder
+    from adao import adaoBuilder
     case = adaoBuilder.New()
     case.set( 'AlgorithmParameters', Algorithm='3DVAR' )
     case.set( 'Background',          Vector=[0, 1, 2] )

diff --git a/test/test6901/Verification_des_Assimilation_Algorithms.py b/test/test6901/Verification_des_Assimilation_Algorithms.py
index bf6ded860f06a59026af53e959b672d1ab001887..c5891d02c133b220420e8c039d241fa07fb298d1 100644 (file)
--- a/test/test6901/Verification_des_Assimilation_Algorithms.py
+++ b/test/test6901/Verification_des_Assimilation_Algorithms.py
@@ -22,7 +22,8 @@
 "Verification de la disponibilite de l'ensemble des algorithmes"
 
 # ==============================================================================
-import adaoBuilder, numpy, sys
+import numpy, sys
+from adao import adaoBuilder
 def test1():
     """Verification de la disponibilite de l'ensemble des algorithmes\n(Utilisation d'un operateur matriciel)"""
     print(test1.__doc__)

diff --git a/test/test6902/Verification_des_Checking_Algorithms.py b/test/test6902/Verification_des_Checking_Algorithms.py
index 1ae5252bcee3bbf874763f5b270ef8b9f767137b..18178c382c9598100fca4b7dce2c4bbd5ec0f761 100644 (file)
--- a/test/test6902/Verification_des_Checking_Algorithms.py
+++ b/test/test6902/Verification_des_Checking_Algorithms.py
@@ -20,7 +20,7 @@
 #
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 
-import adaoBuilder
+from adao import adaoBuilder
 
 # ==============================================================================
 def test1():