Changeset 25b14be in flex_extract.git for source/pythontest/TestInput.py

Timestamp:

Sep 23, 2018, 11:40:28 AM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

4971f63

Parents:

5d42acd

Message:

changed whole tree structure of flex_extract to have better overview

File:

• source/pythontest/TestInput.py (moved) (moved from python/pythontest/TestInput.py) (6 diffs)

source/pythontest/TestInput.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
-import unittest
 import os
 import sys
+import pytest
 
 sys.path.append('../python')
-from ControlFile import ControlFile
-import tools
+from classes.ControlFile import ControlFile
+from mods.tools import get_cmdline_arguments
 
 
-class TestInput(unittest.TestCase):
+class TestInput():
     '''
     Test class to test the reading of commandline arguments and
@@ -21 +21 @@
     # 2. check of parameter
 
-    def setUp(self):
-        '''
-        '''
+    def __init__(self):
         # Default values for ArgumentParser
         self.args = {'start_date':None,
@@ -53 +51 @@
         self.c.check_conditions()
 
-        return
 
     def test_args_reading(self):
@@ -60 +57 @@
                     '--step=0/to/11/BY/3', '--area=20./20./0./90.']
 
-        arguments = tools.get_commandline_arguments()
+        arguments = tools.get_cmdline_arguments()
 
         args_exp = {'start_date':'20180101',
@@ -79 +76 @@
                     }
 
-        self.assertDictEqual(vars(arguments), args_exp)
-        return
+        assert vars(arguments) == args_exp
+
 
     def test_args_assignment(self):
@@ -158 +155 @@
 
         #assert cdict == exp_dict
-        self.assertDictEqual(cdict, exp_dict)
+        assert cdict == exp_dict
 
         return
-
-if __name__ == "__main__":
-    unittest.main()