Skip to content

Commit c8bd0ad

Browse files
onefloidMariusWirtz
onefloid
authored and
MariusWirtz
committed
Refactor: Renamed skip_test_if_version_... util functions
1 parent d4aee16 commit c8bd0ad

12 files changed

+103
-99
lines changed

‎Tests/ApplicationService_test.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Subset, Process, Chore, ChoreStartTime, ChoreFrequency, ChoreTask
99
from TM1py.Objects.Application import CubeApplication, ApplicationTypes, ChoreApplication, DimensionApplication, \
1010
FolderApplication, LinkApplication, ProcessApplication, SubsetApplication, ViewApplication, DocumentApplication
11-
from .Utils import skip_if_insufficient_version, verify_version
11+
from .Utils import skip_if_version_lower_than, verify_version
1212

1313

1414
class TestApplicationService(unittest.TestCase):
@@ -242,11 +242,11 @@ def run_dimension_application(self, private=False):
242242
def test_dimension_application_private(self):
243243
self.run_dimension_application(private=True)
244244

245-
@skip_if_insufficient_version(version="11.4")
245+
@skip_if_version_lower_than(version="11.4")
246246
def test_dimension_application_public(self):
247247
self.run_dimension_application(private=False)
248248

249-
@skip_if_insufficient_version(version="11.4")
249+
@skip_if_version_lower_than(version="11.4")
250250
def run_document_application(self, private):
251251
with open(Path(__file__).parent.joinpath('resources', 'document.xlsx'), "rb") as file:
252252
app = DocumentApplication(path=self.tm1py_app_folder, name=self.document_name, content=file.read())

‎Tests/CellService_test.py

+22-22
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from TM1py.Services import TM1Service
1313
from TM1py.Utils import Utils, element_names_from_element_unique_names, CaseAndSpaceInsensitiveDict, \
1414
CaseAndSpaceInsensitiveTuplesDict, verify_version
15-
from .Utils import skip_if_insufficient_version, skip_if_no_pandas, skip_if_deprecated_in_version
15+
from .Utils import skip_if_version_lower_than, skip_if_no_pandas, skip_if_version_higher_or_equal_than
1616

1717
try:
1818
import pandas as pd
@@ -1610,12 +1610,12 @@ def run_test_execute_mdx_with_empty_rows(self, max_workers=1):
16101610
self.assertIn("[TM1py_Tests_Cell_Dimension2].", coordinates[1])
16111611
self.assertIn("[TM1py_Tests_Cell_Dimension3].", coordinates[2])
16121612

1613-
@skip_if_deprecated_in_version(version="12")
1613+
@skip_if_version_higher_or_equal_than(version="12")
16141614
# v12 does not support empty row sets
16151615
def test_execute_mdx_with_empty_rows(self):
16161616
self.run_test_execute_mdx_with_empty_rows(max_workers=1)
16171617

1618-
@skip_if_deprecated_in_version(version="12")
1618+
@skip_if_version_higher_or_equal_than(version="12")
16191619
# v12 does not support empty row sets
16201620
def test_execute_mdx_with_empty_rows_async(self):
16211621
self.run_test_execute_mdx_with_empty_rows(max_workers=4)
@@ -1644,11 +1644,11 @@ def run_test_execute_mdx_with_empty_columns(self, max_workers=1):
16441644
self.assertIn("[TM1py_Tests_Cell_Dimension2].", coordinates[1])
16451645
self.assertIn("[TM1py_Tests_Cell_Dimension3].", coordinates[2])
16461646

1647-
@skip_if_deprecated_in_version(version="12")
1647+
@skip_if_version_higher_or_equal_than(version="12")
16481648
def test_execute_mdx_with_empty_columns(self):
16491649
self.run_test_execute_mdx_with_empty_columns(max_workers=1)
16501650

1651-
@skip_if_deprecated_in_version(version="12")
1651+
@skip_if_version_higher_or_equal_than(version="12")
16521652
def test_execute_mdx_with_empty_columns_async(self):
16531653
self.run_test_execute_mdx_with_empty_columns(max_workers=4)
16541654

@@ -4052,7 +4052,7 @@ def test_write_values_through_cellset(self):
40524052
values = self.tm1.cells.execute_mdx_values(mdx)
40534053
self.assertEqual(values[0], 1.5)
40544054

4055-
@skip_if_deprecated_in_version(version='12')
4055+
@skip_if_version_higher_or_equal_than(version='12')
40564056
def test_write_values_through_cellset_deactivate_transaction_log(self):
40574057
query = MdxBuilder.from_cube(self.cube_name)
40584058
query = query.add_hierarchy_set_to_row_axis(
@@ -4069,7 +4069,7 @@ def test_write_values_through_cellset_deactivate_transaction_log(self):
40694069

40704070
self.assertFalse(self.tm1.cells.transaction_log_is_active(self.cube_name))
40714071

4072-
@skip_if_deprecated_in_version(version='12')
4072+
@skip_if_version_higher_or_equal_than(version='12')
40734073
def test_write_values_through_cellset_deactivate_transaction_log_reactivate_transaction_log(self):
40744074
mdx = MdxBuilder.from_cube(self.cube_name) \
40754075
.add_hierarchy_set_to_row_axis(MdxHierarchySet.member(Member.of(self.dimension_names[0], "element2"))) \
@@ -4089,7 +4089,7 @@ def test_write_values_through_cellset_deactivate_transaction_log_reactivate_tran
40894089
self.assertEqual(values[0], 1.5)
40904090
self.assertTrue(self.tm1.cells.transaction_log_is_active(self.cube_name))
40914091

4092-
@skip_if_deprecated_in_version(version='12')
4092+
@skip_if_version_higher_or_equal_than(version='12')
40934093
def test_deactivate_transaction_log(self):
40944094
self.tm1.cells.write_value(value="YES",
40954095
cube_name="}CubeProperties",
@@ -4098,7 +4098,7 @@ def test_deactivate_transaction_log(self):
40984098
value = self.tm1.cells.get_value("}CubeProperties", "{},LOGGING".format(self.cube_name))
40994099
self.assertEqual("NO", value.upper())
41004100

4101-
@skip_if_deprecated_in_version(version='12')
4101+
@skip_if_version_higher_or_equal_than(version='12')
41024102
def test_activate_transaction_log(self):
41034103
self.tm1.cells.write_value(value="NO",
41044104
cube_name="}CubeProperties",
@@ -4158,7 +4158,7 @@ def test_read_write_with_custom_encoding_fail_request_encoding(self):
41584158
values = self.tm1.cells.execute_mdx_values(mdx=mdx, encoding="latin-1")
41594159
self.assertNotEqual(self.latin_1_encoded_text, values[0])
41604160

4161-
@skip_if_insufficient_version(version="11.7")
4161+
@skip_if_version_lower_than(version="11.7")
41624162
def test_clear_with_mdx_happy_case(self):
41634163
cells = {("Element17", "Element21", "Element15"): 1}
41644164
self.tm1.cells.write_values(self.cube_name, cells)
@@ -4174,7 +4174,7 @@ def test_clear_with_mdx_happy_case(self):
41744174
value = self.tm1.cells.execute_mdx_values(mdx=mdx)[0]
41754175
self.assertEqual(value, None)
41764176

4177-
@skip_if_insufficient_version(version="11.7")
4177+
@skip_if_version_lower_than(version="11.7")
41784178
def test_clear_with_mdx_all_on_axis0(self):
41794179
cells = {("Element19", "Element11", "Element31"): 1}
41804180
self.tm1.cells.write_values(self.cube_name, cells)
@@ -4189,7 +4189,7 @@ def test_clear_with_mdx_all_on_axis0(self):
41894189
value = self.tm1.cells.execute_mdx_values(mdx=mdx)[0]
41904190
self.assertEqual(value, None)
41914191

4192-
@skip_if_insufficient_version(version="11.7")
4192+
@skip_if_version_lower_than(version="11.7")
41934193
def test_clear_happy_case(self):
41944194
cells = {("Element12", "Element17", "Element32"): 1}
41954195
self.tm1.cells.write_values(self.cube_name, cells)
@@ -4210,8 +4210,8 @@ def test_clear_happy_case(self):
42104210
value = self.tm1.cells.execute_mdx_values(mdx=mdx)[0]
42114211
self.assertEqual(value, None)
42124212

4213-
@skip_if_insufficient_version(version="11.7")
4214-
@skip_if_deprecated_in_version(version="12")
4213+
@skip_if_version_lower_than(version="11.7")
4214+
@skip_if_version_higher_or_equal_than(version="12")
42154215
# skip if version 12 as invalid element names do not raise an exception
42164216
def test_clear_invalid_element_name(self):
42174217

@@ -4227,7 +4227,7 @@ def test_clear_invalid_element_name(self):
42274227
'\\"NotExistingElement\\" :',
42284228
str(e.exception.message))
42294229

4230-
@skip_if_insufficient_version(version="11.7")
4230+
@skip_if_version_lower_than(version="11.7")
42314231
def test_clear_with_mdx_invalid_query(self):
42324232
with self.assertRaises(TM1pyException) as e:
42334233
mdx = f"""
@@ -4260,7 +4260,7 @@ def test_clear_with_mdx_unsupported_version(self):
42604260

42614261
self.tm1._tm1_rest.set_version()
42624262

4263-
@skip_if_insufficient_version(version="11.7")
4263+
@skip_if_version_lower_than(version="11.7")
42644264
def test_clear_with_dataframe_happy_case(self):
42654265
cells = {("Element17", "Element21", "Element15"): 1}
42664266
self.tm1.cells.write_values(self.cube_name, cells)
@@ -4282,7 +4282,7 @@ def test_clear_with_dataframe_happy_case(self):
42824282
value = self.tm1.cells.execute_mdx_values(mdx=mdx)[0]
42834283
self.assertEqual(value, None)
42844284

4285-
@skip_if_insufficient_version(version="11.7")
4285+
@skip_if_version_lower_than(version="11.7")
42864286
def test_clear_with_dataframe_dimension_mapping(self):
42874287
cells = {("Element17", "Element21", "Element15"): 1}
42884288
self.tm1.cells.write_values(self.cube_name, cells)
@@ -4341,19 +4341,19 @@ def test_execute_mdx_with_top_skip(self):
43414341
elements = element_names_from_element_unique_names(list(cells.keys())[0])
43424342
self.assertEqual(elements, ("Element 2", "Element 1", "Element 1"))
43434343

4344-
@skip_if_deprecated_in_version(version='12')
4344+
@skip_if_version_higher_or_equal_than(version='12')
43454345
def test_transaction_log_is_active_false(self):
43464346
self.tm1.cells.deactivate_transactionlog(self.cube_name)
43474347

43484348
self.assertFalse(self.tm1.cells.transaction_log_is_active(self.cube_name))
43494349

4350-
@skip_if_deprecated_in_version(version='12')
4350+
@skip_if_version_higher_or_equal_than(version='12')
43514351
def test_transaction_log_is_active_true(self):
43524352
self.tm1.cells.activate_transactionlog(self.cube_name)
43534353

43544354
self.assertTrue(self.tm1.cells.transaction_log_is_active(self.cube_name))
43554355

4356-
@skip_if_deprecated_in_version(version='12')
4356+
@skip_if_version_higher_or_equal_than(version='12')
43574357
def test_manage_transaction_log_deactivate_reactivate(self):
43584358
self.tm1.cells.write_values(
43594359
self.cube_name,
@@ -4363,7 +4363,7 @@ def test_manage_transaction_log_deactivate_reactivate(self):
43634363

43644364
self.assertTrue(self.tm1.cells.transaction_log_is_active(self.cube_name))
43654365

4366-
@skip_if_deprecated_in_version(version='12')
4366+
@skip_if_version_higher_or_equal_than(version='12')
43674367
def test_manage_transaction_log_not_deactivate_not_reactivate(self):
43684368
pre_state = self.tm1.cells.transaction_log_is_active(self.cube_name)
43694369

@@ -4375,7 +4375,7 @@ def test_manage_transaction_log_not_deactivate_not_reactivate(self):
43754375

43764376
self.assertEqual(pre_state, self.tm1.cells.transaction_log_is_active(self.cube_name))
43774377

4378-
@skip_if_deprecated_in_version(version='12')
4378+
@skip_if_version_higher_or_equal_than(version='12')
43794379
def test_manage_transaction_log_deactivate_not_reactivate(self):
43804380
self.tm1.cells.write_values(
43814381
self.cube_name,

‎Tests/ChoreService_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from TM1py.Objects import Chore, ChoreStartTime, ChoreFrequency, ChoreTask, Process
1010
from TM1py.Services import TM1Service
11-
from .Utils import skip_if_insufficient_version
11+
from .Utils import skip_if_version_lower_than
1212

1313

1414
class TestChoreService(unittest.TestCase):
@@ -93,7 +93,7 @@ def tearDown(self):
9393
if self.tm1.chores.exists(self.chore_name4):
9494
self.tm1.chores.delete(self.chore_name4)
9595

96-
@skip_if_insufficient_version(version="11.7.00002.1")
96+
@skip_if_version_lower_than(version="11.7.00002.1")
9797
def test_create_chore_with_dst_multi_commit(self):
9898
# create chores
9999
c4 = Chore(name=self.chore_name4,

‎Tests/CubeService_test.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from TM1py.Objects import Cube
99
from TM1py.Objects import Rules
1010
from TM1py.Services import TM1Service
11-
from .Utils import skip_if_insufficient_version, skip_if_deprecated_in_version
11+
from .Utils import skip_if_version_lower_than, skip_if_version_higher_or_equal_than
1212

1313

1414
class TestCubeService(unittest.TestCase):
@@ -157,7 +157,7 @@ def test_get_all_names(self):
157157
self.assertNotEqual(self.tm1.cubes.get_all_names_without_rules(),
158158
self.tm1.cubes.get_all_names_without_rules(skip_control_cubes=True))
159159

160-
@skip_if_insufficient_version(version="11.4")
160+
@skip_if_version_lower_than(version="11.4")
161161
def test_get_storage_dimension_order(self):
162162
dimensions = self.tm1.cubes.get_storage_dimension_order(cube_name=self.cube_name)
163163
self.assertEqual(dimensions, self.dimension_names)
@@ -204,12 +204,12 @@ def test_search_for_dimension_substring_skip_control_cubes_true(self):
204204
cubes = self.tm1.cubes.search_for_dimension_substring(substring="}cubes", skip_control_cubes=True)
205205
self.assertEqual({}, cubes)
206206

207-
@skip_if_deprecated_in_version(version="12")
207+
@skip_if_version_higher_or_equal_than(version="12")
208208
def test_search_for_dimension_substring_skip_control_cubes_false_v11(self):
209209
cubes = self.tm1.cubes.search_for_dimension_substring(substring="}cubes", skip_control_cubes=False)
210210
self.assertEqual(cubes['}CubeProperties'], ['}Cubes'])
211211

212-
@skip_if_insufficient_version(version="12")
212+
@skip_if_version_lower_than(version="12")
213213
def test_search_for_dimension_substring_skip_control_cubes_false_v12(self):
214214
cubes = self.tm1.cubes.search_for_dimension_substring(substring="}cubes", skip_control_cubes=False)
215215
self.assertEqual(cubes['}CubeSecurity'], ['}Cubes'])
@@ -218,7 +218,7 @@ def test_get_number_of_cubes(self):
218218
number_of_cubes = self.tm1.cubes.get_number_of_cubes()
219219
self.assertIsInstance(number_of_cubes, int)
220220

221-
@skip_if_insufficient_version(version="11.4")
221+
@skip_if_version_lower_than(version="11.4")
222222
def test_update_storage_dimension_order(self):
223223
self.tm1.cubes.update_storage_dimension_order(
224224
cube_name=self.cube_name,
@@ -228,14 +228,14 @@ def test_update_storage_dimension_order(self):
228228
list(reversed(dimensions)),
229229
self.dimension_names)
230230

231-
@skip_if_insufficient_version(version="11.6")
232-
@skip_if_deprecated_in_version(version="12")
231+
@skip_if_version_lower_than(version="11.6")
232+
@skip_if_version_higher_or_equal_than(version="12")
233233
def test_load(self):
234234
response = self.tm1.cubes.load(cube_name=self.cube_name)
235235
self.assertTrue(response.ok)
236236

237-
@skip_if_insufficient_version(version="11.6")
238-
@skip_if_deprecated_in_version(version="12")
237+
@skip_if_version_lower_than(version="11.6")
238+
@skip_if_version_higher_or_equal_than(version="12")
239239
def test_unload(self):
240240
response = self.tm1.cubes.unload(cube_name=self.cube_name)
241241
self.assertTrue(response.ok)

‎Tests/ElementService_test.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from TM1py.Exceptions import TM1pyRestException, TM1pyException
1010
from TM1py.Objects import Dimension, Hierarchy, Element, ElementAttribute
1111
from TM1py.Services import TM1Service
12-
from Tests.Utils import skip_if_insufficient_version, skip_if_no_pandas
12+
from Tests.Utils import skip_if_version_lower_than, skip_if_no_pandas
1313

1414

1515
class TestElementService(unittest.TestCase):
@@ -1105,7 +1105,7 @@ def test_get_element_types(self):
11051105
}
11061106
self.assertEqual(expected, element_types)
11071107

1108-
@skip_if_insufficient_version(version="11.8.023")
1108+
@skip_if_version_lower_than(version="11.8.023")
11091109
def test_element_lock_and_unlock(self):
11101110
self.tm1.elements.element_lock(dimension_name=self.dimension_name,
11111111
hierarchy_name=self.hierarchy_name,
@@ -1184,7 +1184,7 @@ def test_remove_edge_happy_case(self):
11841184
edges = self.tm1.elements.get_edges(self.dimension_name, self.dimension_name)
11851185
self.assertNotIn(("Total Years", "1989"), edges)
11861186

1187-
@skip_if_insufficient_version(version="11.4")
1187+
@skip_if_version_lower_than(version="11.4")
11881188
def test_delete_edges(self):
11891189
self.tm1.elements.delete_edges(
11901190
dimension_name=self.dimension_name,

0 commit comments

Comments
 (0)