From 5bd6a0b7dc552789c80cfd7d7e7ce5169e307289 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Thu, 23 Aug 2018 11:11:51 +0200 Subject: [PATCH] Updating tests for module behavior --- test/test6701/Doc_TUI_Exemple_01.py | 2 +- test/test6702/Doc_TUI_Exemple_02.py | 4 ++-- test/test6703/Doc_TUI_Exemple_03.py | 2 +- test/test6711/Doc_TUI_Exemple_01_Savings.py | 2 +- test/test6901/Verification_des_Assimilation_Algorithms.py | 3 ++- test/test6902/Verification_des_Checking_Algorithms.py | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/test6701/Doc_TUI_Exemple_01.py b/test/test6701/Doc_TUI_Exemple_01.py index 13edd6f..4eb2b34 100644 --- 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 7691cbc..98e01dd 100644 --- 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 fa85552..dde6135 100644 --- 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 fa80ce0..0bb224b 100644 --- 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 bf6ded8..c5891d0 100644 --- 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 1ae5252..18178c3 100644 --- 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(): -- 2.39.2