@@ -583,37 +583,19 @@ def test_3to4_name_identifier_empty_identifier():
583583 src .ids_properties .homogeneous_time = IDS_TIME_MODE_HOMOGENEOUS
584584 src .coil .resize (2 )
585585 # Case 1: name populated, identifier empty
586- src .coil [0 ].name = "CS3U "
586+ src .coil [0 ].name = "TEST_NAME "
587587 src .coil [0 ].identifier = ""
588588 # Case 2: name populated, identifier not set at all
589- src .coil [1 ].name = "PF1 "
589+ src .coil [1 ].name = "TEST_NAME2 "
590590
591591 dst = convert_ids (src , "4.0.0" )
592592
593593 # name must be preserved in DD4 name (not overwritten by empty identifier)
594- assert dst .coil [0 ].name == "CS3U "
595- assert dst .coil [0 ].description == "CS3U "
594+ assert dst .coil [0 ].name == "TEST_NAME "
595+ assert dst .coil [0 ].description == "TEST_NAME "
596596
597- assert dst .coil [1 ].name == "PF1"
598- assert dst .coil [1 ].description == "PF1"
599-
600-
601- def test_3to4_name_identifier_both_populated ():
602- """GH#114: when both name and identifier are populated, identifier wins."""
603- factory = IDSFactory ("3.40.1" )
604-
605- src = factory .pf_active ()
606- src .ids_properties .homogeneous_time = IDS_TIME_MODE_HOMOGENEOUS
607- src .coil .resize (1 )
608- src .coil [0 ].name = "CS3U"
609- src .coil [0 ].identifier = "COIL_ID"
610-
611- dst = convert_ids (src , "4.0.0" )
612-
613- # DD3 identifier -> DD4 name
614- assert dst .coil [0 ].name == "COIL_ID"
615- # DD3 name -> DD4 description
616- assert dst .coil [0 ].description == "CS3U"
597+ assert dst .coil [1 ].name == "TEST_NAME2"
598+ assert dst .coil [1 ].description == "TEST_NAME2"
617599
618600
619601def test_3to4_cocos_hardcoded_paths ():
0 commit comments