fixed var and method names to follow python conventions

4 files changed, 35 insertions, 40 deletions

diff --git a/tests/test_generator.py b/tests/test_generator.py
index a6981b9..ae54247 100644
--- a/tests/test_generator.py
+++ b/tests/test_generator.py
@@ -45,7 +45,8 @@ def test_parse_document():
 
 
 def test_parse_document_list():
-    src = [inputPath / 'com.pelagicore.ivi.tuner.qdl', inputPath / 'com.pelagicore.ivi.climate.qdl']
+    src = [inputPath / 'com.pelagicore.ivi.tuner.qdl',
+           inputPath / 'com.pelagicore.ivi.climate.qdl']
     system = FileSystem.parse(src)
     assert system.lookup('com.pelagicore.ivi.tuner')
     assert system.lookup('com.pelagicore.ivi.climate')
@@ -60,7 +61,6 @@ def test_parse_document_mixed():
 
 
 def test_destination_prefix():
-
     system = FileSystem.parse(inputPath)
     out = Path('tests/out')
     out.rmtree_p()
@@ -72,5 +72,4 @@ def test_destination_prefix():
         generator.write(dst_template, 'module.txt', ctx)
         path = generator.apply(dst_template, ctx)
         assert Path(path).exists()
-
-    # out.rmtree_p()
+    out.rmtree_p()
diff --git a/tests/test_lookup.py b/tests/test_lookup.py
index d775dea..28115dd 100644
--- a/tests/test_lookup.py
+++ b/tests/test_lookup.py
@@ -1,9 +1,9 @@
-from qface.idl.domain import System
-from qface.generator import FileSystem
 import logging
 import logging.config
 from pathlib import Path
 
+from qface.generator import FileSystem
+
 # logging.config.fileConfig('logging.ini')
 logging.basicConfig()
 
@@ -13,13 +13,13 @@ inputPath = Path('tests/in')
 log.debug('input path folder: {0}'.format(inputPath.absolute()))
 
 
-def loadTuner():
+def load_tuner():
     path = inputPath / 'com.pelagicore.ivi.tuner.qdl'
     return FileSystem.parse_document(path)
 
 
 def test_lookup():
-    system = loadTuner()
+    system = load_tuner()
     # lookup module
     module = system.lookup('com.pelagicore.ivi.tuner')
     assert module is module.lookup('com.pelagicore.ivi.tuner')
@@ -34,4 +34,3 @@ def test_lookup():
     # lookup enum
     enum = system.lookup('com.pelagicore.ivi.tuner.Waveband')
     assert enum is module.lookup('Waveband')
-
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 7d05f6d..657fab8 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -1,9 +1,9 @@
-from qface.idl.domain import System
-from qface.generator import FileSystem
 import logging
 import logging.config
 from pathlib import Path
 
+from qface.generator import FileSystem
+
 # logging.config.fileConfig('logging.ini')
 logging.basicConfig()
 
@@ -13,12 +13,12 @@ inputPath = Path('tests/in')
 log.debug('input path folder: {0}'.format(inputPath.absolute()))
 
 
-def loadTuner():
+def load_tuner():
     path = inputPath / 'com.pelagicore.ivi.tuner.qdl'
     return FileSystem.parse_document(path)
 
 
-def loadTest():
+def load_test():
     path = inputPath / 'com.pelagicore.test.qdl'
     return FileSystem.parse_document(path)
 
@@ -26,17 +26,18 @@ def loadTest():
 def test_parse():
     log.debug('test parse')
     system = FileSystem.parse(inputPath)
+    assert system
 
 
 def test_module():
-    system = loadTuner()
+    system = load_tuner()
     assert len(system.modules) == 1
     module = system.lookup('com.pelagicore.ivi.tuner')
     assert module in system.modules
 
 
 def test_interface():
-    system = loadTuner()
+    system = load_tuner()
     module = system.lookup('com.pelagicore.ivi.tuner')
     interface = system.lookup('com.pelagicore.ivi.tuner.Tuner')
     assert interface in module.interfaces
@@ -44,7 +45,7 @@ def test_interface():
 
 
 def test_property():
-    system = loadTuner()
+    system = load_tuner()
     interface = system.lookup('com.pelagicore.ivi.tuner.Tuner')
     module = system.lookup('com.pelagicore.ivi.tuner')
     property = interface._propertyMap['currentStation']
@@ -56,7 +57,7 @@ def test_property():
 
 
 def test_struct():
-    system = loadTuner()
+    system = load_tuner()
     module = system.lookup('com.pelagicore.ivi.tuner')
     symbol = system.lookup('com.pelagicore.ivi.tuner.Station')
     assert symbol.name == 'Station'
@@ -66,7 +67,7 @@ def test_struct():
 
 
 def test_enum():
-    system = loadTuner()
+    system = load_tuner()
     definition = system.lookup('com.pelagicore.ivi.tuner.Waveband')
     module = system.lookup('com.pelagicore.ivi.tuner')
     symbol = system.lookup('com.pelagicore.ivi.tuner.Waveband')
@@ -79,15 +80,16 @@ def test_enum():
 
 
 def test_enum_counter():
-    system = loadTest()
+    system = load_test()
     enum = system.lookup('com.pelagicore.test.State')
     assert enum
     # import ipdb; ipdb.set_trace()
     assert enum._memberMap['Null'].value is 0
     assert enum._memberMap['Failure'].value is 3
 
+
 def test_flag_counter():
-    system = loadTest()
+    system = load_test()
     flag = system.lookup('com.pelagicore.test.Phase')
     assert flag
     # import ipdb; ipdb.set_trace()
@@ -95,14 +97,15 @@ def test_flag_counter():
     assert flag._memberMap['PhaseTwo'].value is 2
     assert flag._memberMap['PhaseThree'].value is 4
 
+
 def test_flag():
-    system = loadTuner()
+    system = load_tuner()
     symbol = system.lookup('com.pelagicore.ivi.tuner.Features')
     assert symbol.is_flag
 
 
 def test_list():
-    system = loadTuner()
+    system = load_tuner()
     interface = system.lookup('com.pelagicore.ivi.tuner.Tuner')
     property = interface._propertyMap['primitiveList']
     assert property.type.name == 'list'
@@ -118,7 +121,7 @@ def test_list():
 
 
 def test_model():
-    system = loadTuner()
+    system = load_tuner()
     interface = system.lookup('com.pelagicore.ivi.tuner.Tuner')
     property = interface._propertyMap['primitiveModel']
     assert property.type.name == 'model'
@@ -131,7 +134,3 @@ def test_model():
     assert property.type.is_model is True
     assert property.type.nested.is_complex
     assert property.type.nested.name == 'Station'
-
-
-
-
diff --git a/tests/test_validation.py b/tests/test_validation.py
index 98fa949..aedb921 100644
--- a/tests/test_validation.py
+++ b/tests/test_validation.py
@@ -1,9 +1,9 @@
-from qface.idl.domain import System
-from qface.generator import FileSystem
 import logging
 import logging.config
 from pathlib import Path
 
+from qface.generator import FileSystem
+
 # logging.config.fileConfig('logging.ini')
 logging.basicConfig()
 
@@ -13,13 +13,13 @@ inputPath = Path('tests/in')
 log.debug('input path folder: {0}'.format(inputPath.absolute()))
 
 
-def loadOne():
+def load_one():
     path = inputPath / 'com.pelagicore.one.qdl'
     return FileSystem.parse_document(path)
 
 
 def test_resolve():
-    system = loadOne()
+    system = load_one()
     module = system.lookup('com.pelagicore.one')
     assert module
     service = module.lookup('OneService')
@@ -41,7 +41,7 @@ def test_resolve():
 
 
 def test_resolve_nested():
-    system = loadOne()
+    system = load_one()
     module = system.lookup('com.pelagicore.one')
     assert module
     struct = module.lookup('com.pelagicore.one.StringStruct')
@@ -53,12 +53,10 @@ def test_resolve_nested():
 
     service = module.lookup('com.pelagicore.one.OneService')
     assert service
-    listProperty = service._propertyMap['messageList']
-    assert listProperty
-    assert listProperty.type.nested.reference is struct
-
-    modelProperty = service._propertyMap['messageModel']
-    assert modelProperty
-    assert modelProperty.type.nested.reference is struct
-
+    list_property = service._propertyMap['messageList']
+    assert list_property
+    assert list_property.type.nested.reference is struct
 
+    model_property = service._propertyMap['messageModel']
+    assert model_property
+    assert model_property.type.nested.reference is struct