Skip to content

Commit cd851f6

Browse files
feat(functions) : fix typos and update tests
1 parent c189111 commit cd851f6

File tree

2 files changed

+38
-26
lines changed

2 files changed

+38
-26
lines changed

src/opengeodeweb_back/geode_functions.py

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,6 @@ def geode_object_output_extensions(geode_object: str):
103103
return geode_object_output_list_creators
104104

105105

106-
def test_gejzbvzr(geode_object: str):
107-
lidjs = []
108-
geode_object_dict = {}
109-
geode_object_dict["geode_object"] = geode_object
110-
geode_object_dict["output_extensions"] = geode_object_output_extensions(
111-
geode_object
112-
)
113-
if "parent" in geode_object_value(geode_object).keys():
114-
parent_key = geode_object_value(geode_object)["parent"]
115-
parent_output_extensions = geode_object_output_extensions(parent_key)
116-
117-
return lidjs
118-
119-
120106
def list_input_extensions(key: str = None):
121107
extensions_list = []
122108
for geode_object, value in geode_objects_dict().items():
@@ -136,11 +122,7 @@ def list_input_extensions(key: str = None):
136122

137123

138124
def has_creator(geode_object: str, extension: str):
139-
geode_object_input_factory = input_factory(geode_object)
140-
for input in geode_object_input_factory:
141-
if input.has_creator(extension):
142-
return True
143-
return False
125+
return input_factory(geode_object).has_creator(extension)
144126

145127

146128
def list_geode_objects(extension: str, key: str = None):
@@ -162,13 +144,30 @@ def list_geode_objects(extension: str, key: str = None):
162144
return geode_objects_list
163145

164146

147+
def geode_objects_output_extensions(geode_object: str):
148+
return_list = []
149+
geode_object_dict = {}
150+
geode_object_dict["geode_object"] = geode_object
151+
geode_object_dict["output_extensions"] = geode_object_output_extensions(
152+
geode_object
153+
)
154+
155+
return_list.append(geode_object_dict)
156+
157+
if "parent" in geode_object_value(geode_object).keys():
158+
parent_key = geode_object_value(geode_object)["parent"]
159+
return_list += geode_objects_output_extensions(parent_key)
160+
161+
return return_list
162+
163+
165164
def versions(list_packages: list):
166165
list_with_versions = []
167166
for package in list_packages:
168167
list_with_versions.append(
169168
{
170169
"package": package,
171-
"version": pkg_resources.distribution(package).version,
170+
"version": pkg_resources.get_distribution(package).version,
172171
}
173172
)
174173
return list_with_versions

tests/test_functions.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ def test_geode_object_input_extensions():
7272
for geode_object, value in geode_objects.geode_objects_dict().items():
7373
input_extensions = geode_functions.geode_object_input_extensions(geode_object)
7474
assert type(input_extensions) is list
75-
for extension in input_extensions:
76-
assert type(extension) is str
75+
for input_extension in input_extensions:
76+
assert type(input_extension) is str
7777

7878

7979
def test_geode_object_output_extensions():
8080
for geode_object, value in geode_objects.geode_objects_dict().items():
8181
output_extensions = geode_functions.geode_object_output_extensions(geode_object)
8282
assert type(output_extensions) is list
83-
for extension in output_extensions:
84-
assert type(extension) is str
83+
for output_extension in output_extensions:
84+
assert type(output_extension) is str
8585

8686

8787
def test_list_input_extensions():
@@ -139,20 +139,33 @@ def test_list_geode_objects():
139139
assert len(geode_objects_list) >= 1
140140

141141

142+
def test_geode_objects_output_extensions():
143+
for geode_object, value in geode_objects.geode_objects_dict().items():
144+
geode_objects_and_output_extensions_list = (
145+
geode_functions.geode_objects_output_extensions(geode_object)
146+
)
147+
print(f"{geode_objects_and_output_extensions_list=}")
148+
assert type(geode_objects_and_output_extensions_list) is list
149+
for (
150+
geode_object_and_output_extensions
151+
) in geode_objects_and_output_extensions_list:
152+
assert type(geode_object_and_output_extensions) is dict
153+
154+
142155
def test_versions():
143156
list_packages = [
144157
"OpenGeode-core",
145158
"OpenGeode-IO",
146159
"OpenGeode-Geosciences",
147160
"OpenGeode-GeosciencesIO",
148161
]
149-
versions = geode_functions.get_versions(list_packages)
162+
versions = geode_functions.versions(list_packages)
150163
assert type(versions) is list
151164
for version in versions:
152165
assert type(version) is dict
153166

154167

155168
def test_extension_from_filename():
156-
extension = geode_functions.get_extension_from_filename("test.toto")
169+
extension = geode_functions.extension_from_filename("test.toto")
157170
assert type(extension) is str
158171
assert extension.count(".") == 0

0 commit comments

Comments
 (0)