@@ -145,13 +145,13 @@ def test_repr_populated(self):
145145 container .parent = file
146146 er .add_ref (container = container ,
147147 key = 'Mus musculus' ,
148- entity_id = 'NCBI_TAXON :10090' ,
148+ entity_id = 'NCBITaxon :10090' ,
149149 entity_uri = 'http://x' )
150150 text = repr (er )
151151 self .assertIn ('1 key(s), 1 entity(ies), 1 object(s), 1 file(s)' , text )
152152 # the HTML repr surfaces the flattened table content
153153 html = er ._repr_html_ ()
154- self .assertIn ('NCBI_TAXON :10090' , html )
154+ self .assertIn ('NCBITaxon :10090' , html )
155155 self .assertIn ('http://x' , html )
156156
157157 def test_assert_external_resources_equal (self ):
@@ -390,7 +390,7 @@ def test_add_ref_container_data(self):
390390
391391 er .add_ref_container (root_container = em )
392392 self .assertEqual (er .keys .data , [('Homo sapiens' ,)])
393- self .assertEqual (er .entities .data , [('NCBI_TAXON :9606' ,
393+ self .assertEqual (er .entities .data , [('NCBITaxon :9606' ,
394394 'https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606' )])
395395 self .assertEqual (er .objects .data , [(0 , col1 .object_id , 'VectorData' , '' , '' )])
396396
@@ -413,7 +413,7 @@ def test_add_ref_container_attr(self):
413413
414414 er .add_ref_container (root_container = em )
415415 self .assertEqual (er .keys .data , [('Homo sapiens' ,)])
416- self .assertEqual (er .entities .data , [('NCBI_TAXON :9606' ,
416+ self .assertEqual (er .entities .data , [('NCBITaxon :9606' ,
417417 'https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606' )])
418418 self .assertEqual (er .objects .data , [(0 , col1 .object_id , 'VectorData' , 'description' , '' )])
419419
@@ -437,7 +437,7 @@ def test_add_ref_termset(self):
437437 termset = terms
438438 )
439439 self .assertEqual (er .keys .data , [('Homo sapiens' ,)])
440- self .assertEqual (er .entities .data , [('NCBI_TAXON :9606' ,
440+ self .assertEqual (er .entities .data , [('NCBITaxon :9606' ,
441441 'https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606' )])
442442 self .assertEqual (er .objects .data , [(0 , col1 .object_id , 'VectorData' , '' , '' )])
443443
@@ -475,7 +475,7 @@ def test_add_ref_termset_attribute_none(self):
475475 termset = terms
476476 )
477477 self .assertEqual (er .keys .data , [('Homo sapiens' ,)])
478- self .assertEqual (er .entities .data , [('NCBI_TAXON :9606' ,
478+ self .assertEqual (er .entities .data , [('NCBITaxon :9606' ,
479479 'https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606' )])
480480 self .assertEqual (er .objects .data , [(0 , col1 .object_id , 'VectorData' , '' , '' )])
481481
@@ -498,7 +498,7 @@ def test_add_ref_termset_data_object_list(self):
498498 termset = terms
499499 )
500500 self .assertEqual (er .keys .data , [('Homo sapiens' ,)])
501- self .assertEqual (er .entities .data , [('NCBI_TAXON :9606' ,
501+ self .assertEqual (er .entities .data , [('NCBITaxon :9606' ,
502502 'https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606' )])
503503 self .assertEqual (er .objects .data , [(0 , species .object_id , 'DynamicTable' , 'colnames' , '' )])
504504
@@ -521,9 +521,9 @@ def test_add_ref_termset_bulk(self):
521521 termset = terms
522522 )
523523 self .assertEqual (er .keys .data , [('Homo sapiens' ,), ('Mus musculus' ,)])
524- self .assertEqual (er .entities .data , [('NCBI_TAXON :9606' ,
524+ self .assertEqual (er .entities .data , [('NCBITaxon :9606' ,
525525 'https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606' ),
526- ('NCBI_TAXON :10090' ,
526+ ('NCBITaxon :10090' ,
527527 'https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=10090' )])
528528 self .assertEqual (er .objects .data , [(0 , col1 .object_id , 'VectorData' , '' , '' )])
529529
@@ -546,7 +546,7 @@ def test_add_ref_termset_missing_terms(self):
546546 termset = terms
547547 )
548548 self .assertEqual (er .keys .data , [('Homo sapiens' ,)])
549- self .assertEqual (er .entities .data , [('NCBI_TAXON :9606' ,
549+ self .assertEqual (er .entities .data , [('NCBITaxon :9606' ,
550550 'https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606' )])
551551 self .assertEqual (er .objects .data , [(0 , col1 .object_id , 'VectorData' , '' , '' )])
552552 self .assertEqual (missing_terms , {'missing_terms' : ['missing_term' ]})
@@ -792,7 +792,7 @@ def test_get_obj_entities_hdf5_roundtrip(self):
792792 data .parent = file
793793 er .add_ref (container = data ,
794794 key = 'Homo sapiens' ,
795- entity_id = 'NCBI_TAXON :9606' ,
795+ entity_id = 'NCBITaxon :9606' ,
796796 entity_uri = 'http://x' )
797797
798798 path = 'test_HERD_hdf5_roundtrip.h5'
@@ -809,7 +809,7 @@ def test_get_obj_entities_hdf5_roundtrip(self):
809809 remove_test_file (path )
810810
811811 expected_df = pd .DataFrame .from_dict (
812- {'entity_id' : {0 : 'NCBI_TAXON :9606' },
812+ {'entity_id' : {0 : 'NCBITaxon :9606' },
813813 'entity_uri' : {0 : 'http://x' }}
814814 )
815815 pd .testing .assert_frame_equal (df , expected_df )
0 commit comments