Started to use .qface file extension for interface files. The parse method accepts now also a file pattern to find the correct interface files.

10 files changed, 11 insertions, 13 deletions

diff --git a/tests/in/com.pelagicore.ivi.climate.qdl b/tests/in/com.pelagicore.ivi.climate.qface
index 6414bb5..6414bb5 100644
--- a/tests/in/com.pelagicore.ivi.climate.qdl
+++ b/tests/in/com.pelagicore.ivi.climate.qface
diff --git a/tests/in/com.pelagicore.ivi.tuner.qdl b/tests/in/com.pelagicore.ivi.tuner.qface
index 36fab03..36fab03 100644
--- a/tests/in/com.pelagicore.ivi.tuner.qdl
+++ b/tests/in/com.pelagicore.ivi.tuner.qface
diff --git a/tests/in/com.pelagicore.one.qdl b/tests/in/com.pelagicore.one.qface
index 9203d29..9203d29 100644
--- a/tests/in/com.pelagicore.one.qdl
+++ b/tests/in/com.pelagicore.one.qface
diff --git a/tests/in/com.pelagicore.test.qdl b/tests/in/com.pelagicore.test.qface
index 07ecf1f..07ecf1f 100644
--- a/tests/in/com.pelagicore.test.qdl
+++ b/tests/in/com.pelagicore.test.qface
diff --git a/tests/test_climate.py b/tests/test_climate.py
index aa3037b..b7adec6 100644
--- a/tests/test_climate.py
+++ b/tests/test_climate.py
@@ -13,7 +13,7 @@ log.debug('input path folder: {0}'.format(inputPath.absolute()))
 
 
 def load_system():
-    path = inputPath / 'com.pelagicore.ivi.climate.qdl'
+    path = inputPath / 'com.pelagicore.ivi.climate.qface'
     return FileSystem.parse_document(path)
 
 
diff --git a/tests/test_generator.py b/tests/test_generator.py
index ae54247..823c7fa 100644
--- a/tests/test_generator.py
+++ b/tests/test_generator.py
@@ -13,7 +13,7 @@ log.debug('input path folder: {0}'.format(inputPath.abspath()))
 
 
 def loadSystem():
-    path = inputPath / 'com.pelagicore.ivi.tuner.qdl'
+    path = inputPath / 'com.pelagicore.ivi.tuner.qface'
     return FileSystem.parse_document(path)
 
 
@@ -40,20 +40,20 @@ def test_gen_interface():
 
 
 def test_parse_document():
-    system = FileSystem.parse(inputPath / 'com.pelagicore.ivi.tuner.qdl')
+    system = FileSystem.parse(inputPath / 'com.pelagicore.ivi.tuner.qface')
     assert system.lookup('com.pelagicore.ivi.tuner')
 
 
 def test_parse_document_list():
-    src = [inputPath / 'com.pelagicore.ivi.tuner.qdl',
-           inputPath / 'com.pelagicore.ivi.climate.qdl']
+    src = [inputPath / 'com.pelagicore.ivi.tuner.qface',
+           inputPath / 'com.pelagicore.ivi.climate.qface']
     system = FileSystem.parse(src)
     assert system.lookup('com.pelagicore.ivi.tuner')
     assert system.lookup('com.pelagicore.ivi.climate')
 
 
 def test_parse_document_mixed():
-    src = [inputPath, inputPath / 'com.pelagicore.ivi.climate.qdl']
+    src = [inputPath, inputPath / 'com.pelagicore.ivi.climate.qface']
     system = FileSystem.parse(src)
     assert system.lookup('com.pelagicore.ivi.tuner')
     assert system.lookup('com.pelagicore.ivi.climate')
diff --git a/tests/test_lookup.py b/tests/test_lookup.py
index 28115dd..7ff7aa5 100644
--- a/tests/test_lookup.py
+++ b/tests/test_lookup.py
@@ -14,7 +14,7 @@ log.debug('input path folder: {0}'.format(inputPath.absolute()))
 
 
 def load_tuner():
-    path = inputPath / 'com.pelagicore.ivi.tuner.qdl'
+    path = inputPath / 'com.pelagicore.ivi.tuner.qface'
     return FileSystem.parse_document(path)
 
 
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 657fab8..3b36cd1 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -14,12 +14,12 @@ log.debug('input path folder: {0}'.format(inputPath.absolute()))
 
 
 def load_tuner():
-    path = inputPath / 'com.pelagicore.ivi.tuner.qdl'
+    path = inputPath / 'com.pelagicore.ivi.tuner.qface'
     return FileSystem.parse_document(path)
 
 
 def load_test():
-    path = inputPath / 'com.pelagicore.test.qdl'
+    path = inputPath / 'com.pelagicore.test.qface'
     return FileSystem.parse_document(path)
 
 
diff --git a/tests/test_tags.py b/tests/test_tags.py
index 4f5ace3..5ff56a0 100644
--- a/tests/test_tags.py
+++ b/tests/test_tags.py
@@ -1,4 +1,3 @@
-from qface.idl.domain import System
 from qface.generator import FileSystem
 import logging
 import logging.config
@@ -14,7 +13,7 @@ log.debug('input path folder: {0}'.format(inputPath.absolute()))
 
 
 def loadTuner():
-    path = inputPath / 'com.pelagicore.ivi.tuner.qdl'
+    path = inputPath / 'com.pelagicore.ivi.tuner.qface'
     return FileSystem.parse_document(path)
 
 
@@ -38,4 +37,3 @@ def test_tag():
     assert enum is module.lookup('Waveband')
     assert 'default' in enum.tags
     assert enum.attribute('default', 'value') == 'FM'
-
diff --git a/tests/test_validation.py b/tests/test_validation.py
index aedb921..a420783 100644
--- a/tests/test_validation.py
+++ b/tests/test_validation.py
@@ -14,7 +14,7 @@ log.debug('input path folder: {0}'.format(inputPath.absolute()))
 
 
 def load_one():
-    path = inputPath / 'com.pelagicore.one.qdl'
+    path = inputPath / 'com.pelagicore.one.qface'
     return FileSystem.parse_document(path)