diff options
| author | koljonen <koljonen@outlook.com> | 2016-06-18 21:21:17 +0200 |
|---|---|---|
| committer | koljonen <koljonen@outlook.com> | 2016-06-18 21:21:17 +0200 |
| commit | 42cf384ede0d6114311c3145082a8aa529e26c03 (patch) | |
| tree | bd7a9576f86b1172a39ac7744a5e41bb14442a62 /tests | |
| parent | c3c18bcebe125dffd6c4773f2ce0f910362b4fac (diff) | |
In completion tests, get datatypes from metadata instead of manually listing them
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/metadata.py | 4 | ||||
| -rw-r--r-- | tests/test_smart_completion_multiple_schemata.py | 5 | ||||
| -rw-r--r-- | tests/test_smart_completion_public_schema_only.py | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/tests/metadata.py b/tests/metadata.py index b547e58f..7e9115e9 100644 --- a/tests/metadata.py +++ b/tests/metadata.py @@ -36,6 +36,10 @@ class MetaData(object): def keywords(self, pos=0): return [keyword(kw, pos) for kw in self.completer.keywords] + def datatypes(self, schema='public', pos=0): + return [datatype(escape(x), pos) + for x in self.metadata.get('datatypes', {}).get(schema, [])] + def schemas(self, pos=0): schemas = set(sch for schs in self.metadata.values() for sch in schs) return [schema(escape(s), pos=pos) for s in schemas] diff --git a/tests/test_smart_completion_multiple_schemata.py b/tests/test_smart_completion_multiple_schemata.py index 415fd0e3..f7000bfa 100644 --- a/tests/test_smart_completion_multiple_schemata.py +++ b/tests/test_smart_completion_multiple_schemata.py @@ -5,7 +5,6 @@ from metadata import (MetaData, alias, name_join, fk_join, join, table, function, column, - datatype, wildcard_expansion) from prompt_toolkit.document import Document from pgcli.packages.function_metadata import FunctionMetadata, ForeignKey @@ -357,9 +356,7 @@ def test_schema_qualified_type_name(text, completer, complete_event): pos = len(text) result = completer.get_completions( Document(text=text, cursor_position=pos), complete_event) - assert set(result) == set([ - datatype('typ3'), - datatype('typ4'), + assert set(result) == set(testdata.datatypes('custom') + [ table('users'), table('"Users"'), table('products'), diff --git a/tests/test_smart_completion_public_schema_only.py b/tests/test_smart_completion_public_schema_only.py index e1729240..57f138dd 100644 --- a/tests/test_smart_completion_public_schema_only.py +++ b/tests/test_smart_completion_public_schema_only.py @@ -5,7 +5,6 @@ from metadata import (MetaData, alias, name_join, fk_join, join, keyword, view, function, column, - datatype, wildcard_expansion) from prompt_toolkit.document import Document from pgcli.packages.function_metadata import FunctionMetadata, ForeignKey @@ -582,9 +581,7 @@ def test_suggest_datatype(text, completer, complete_event): pos = len(text) result = completer.get_completions( Document(text=text, cursor_position=pos), complete_event) - assert set(result) == set(testdata.schemas() + [ - datatype('custom_type1'), - datatype('custom_type2'), + assert set(result) == set(testdata.schemas() + testdata.datatypes() + [ table('users'), table('"Users"'), table('orders'), |