22import uuid
33
44from requests import delete
5+ import test
56
67import pytest
78
@@ -264,7 +265,7 @@ def test_custom_values_on_entities(project_entity_fixture):
264265 hub .commit_changes ()
265266
266267
267- def test_label_eq_name_on_entities (project_entity_fixture ):
268+ def test_label_eq_name_on_entities_1 (project_entity_fixture ):
268269 """Test label that have same values as name on folder and task.
269270
270271 When the entity has same name and label, the label should be set to None.
@@ -372,11 +373,11 @@ def test_data_changes_on_entities(project_entity_fixture):
372373
373374 hub = EntityHub (project_name )
374375
375- folder = hub .get_or_query_entity_by_id (folder_id , {"folder" })
376+ folder = hub .get_or_fetch_entity_by_id (folder_id , {"folder" })
376377 folder .data ["key3" ] = "value3"
377378 folder .data .pop ("key1" )
378379
379- task = hub .get_or_query_entity_by_id (task_id , {"task" })
380+ task = hub .get_or_fetch_entity_by_id (task_id , {"task" })
380381 task .data ["key4" ] = "value4"
381382 task .data .pop ("key2" )
382383 hub .commit_changes ()
@@ -397,7 +398,7 @@ def test_data_changes_on_entities(project_entity_fixture):
397398 hub .commit_changes ()
398399
399400
400- def test_label_eq_name_on_entities (project_entity_fixture ):
401+ def test_label_eq_name_on_entities_2 (project_entity_fixture ):
401402 """Test label that have same values as name on folder and task.
402403
403404 When the entity has same name and label, the label should be set to None.
@@ -430,8 +431,8 @@ def test_label_eq_name_on_entities(project_entity_fixture):
430431 hub .commit_changes ()
431432
432433 hub = EntityHub (project_name )
433- folder = hub .get_or_query_entity_by_id (folder_id , {"folder" })
434- task = hub .get_or_query_entity_by_id (task_id , {"task" })
434+ folder = hub .get_or_fetch_entity_by_id (folder_id , {"folder" })
435+ task = hub .get_or_fetch_entity_by_id (task_id , {"task" })
435436
436437 assert folder .status == init_status_name , (
437438 "Folder status set on create was not propagated"
@@ -759,7 +760,7 @@ def test_create_delete_with_duplicated_names(
759760
760761test_names = [
761762 ("test_name" ),
762- # ("test_123"),
763+ ("test_123" ),
763764]
764765
765766test_product_types = [
@@ -769,6 +770,8 @@ def test_create_delete_with_duplicated_names(
769770 ("workfile" ),
770771]
771772
773+
774+ @pytest .mark .usefixtures ("clean_project" )
772775@pytest .mark .parametrize ("folder_name" , test_names )
773776@pytest .mark .parametrize ("product_name" , test_names )
774777@pytest .mark .parametrize ("product_type" , test_product_types )
@@ -833,6 +836,7 @@ def test_create_delete_products(
833836 assert product .get_folder_id () == folder ["id" ]
834837
835838
839+ @pytest .mark .usefixtures ("clean_project" )
836840@pytest .mark .parametrize ("name" , test_names )
837841def test_create_delete_folders (project_entity_fixture , name ):
838842 project_name = project_entity_fixture ["name" ]
@@ -893,10 +897,12 @@ def test_create_delete_folders(project_entity_fixture, name):
893897
894898
895899test_version_numbers = [
896- ([1 , 2 , 3 , 4 ])
900+ ([1 , 2 , 3 , 4 ]),
901+ ([8 , 10 , 4 , 5 ]),
897902]
898903
899904
905+ @pytest .mark .usefixtures ("clean_project" )
900906@pytest .mark .parametrize ("version_numbers" , test_version_numbers )
901907def test_create_delete_versions (project_entity_fixture , version_numbers ):
902908 # prepare hierarchy
@@ -953,6 +959,7 @@ def test_create_delete_versions(project_entity_fixture, version_numbers):
953959]
954960
955961
962+ @pytest .mark .usefixtures ("clean_project" )
956963@pytest .mark .parametrize ("version_number" , test_invalid_version_number )
957964def test_create_invalid_versions (project_entity_fixture , version_number ):
958965 # prepare hierarchy
@@ -983,6 +990,7 @@ def test_create_invalid_versions(project_entity_fixture, version_number):
983990 hub .commit_changes ()
984991
985992
993+ @pytest .mark .usefixtures ("clean_project" )
986994def test_change_status_on_version (project_entity_fixture ):
987995 folder_types = [
988996 type ["name" ] for type in project_entity_fixture ["folderTypes" ]
@@ -1020,6 +1028,7 @@ def test_change_status_on_version(project_entity_fixture):
10201028 assert version .get_status () == status_name
10211029
10221030
1031+ @pytest .mark .usefixtures ("clean_project" )
10231032@pytest .mark .parametrize ("version" , test_version_numbers )
10241033def test_set_invalid_status_on_version (project_entity_fixture , version ):
10251034 folder_types = [
@@ -1087,6 +1096,7 @@ def test_set_invalid_status_on_version(project_entity_fixture, version):
10871096]
10881097
10891098
1099+ @pytest .mark .usefixtures ("clean_project" )
10901100@pytest .mark .parametrize ("tags" , test_tags )
10911101def test_set_tag_on_version (project_entity_fixture , tags ):
10921102 folder_types = [
@@ -1125,12 +1135,37 @@ def test_set_invalid_tag_on_version():
11251135 raise NotImplementedError ()
11261136
11271137
1128- def test_status_definition_on_project (project_entity_fixture ):
1138+ test_statuses = [
1139+ ("status1" ),
1140+ ("status2" ),
1141+ ("status3" ),
1142+ ]
1143+
1144+ test_icon = [
1145+ ("arrow_forward" ),
1146+ ("expand_circle_down" ),
1147+ ("done_outline" ),
1148+ ]
1149+
1150+
1151+ @pytest .mark .parametrize ("status_name" , test_statuses )
1152+ @pytest .mark .parametrize ("icon_name" , test_icon )
1153+ def test_status_definition_on_project (
1154+ project_entity_fixture ,
1155+ status_name ,
1156+ icon_name
1157+ ):
11291158 hub = EntityHub (project_entity_fixture ["name" ])
11301159
11311160 project = hub .project_entity
1132- project .status = "test_status"
1133- print (project .status )
1161+ project .get_statuses ().create (
1162+ status_name ,
1163+ icon_name
1164+ )
1165+ assert status_name == project .get_statuses ().get (status_name ).get_name ()
1166+ assert icon_name == project .get_statuses ().get (status_name ).get_icon ()
1167+
1168+ # print(project.status)
11341169
11351170 # project.set_status()
11361171 # project_status_obj = hub.project_entity.get_statuses()
0 commit comments