@@ -557,12 +557,34 @@ fn test_node_table_column_access() {
557557 let node = t
558558 . add_row ( tskit:: NodeFlags :: new_sample ( ) , 0.0 , -1 , -1 )
559559 . unwrap ( ) ;
560- let individual = t. individual_column ( ) ;
561- assert_eq ! ( individual[ node] , tskit:: IndividualId :: NULL ) ;
562- let population = t. population_column ( ) ;
563- assert_eq ! ( population[ node] , tskit:: PopulationId :: NULL ) ;
564- let time = t. time_column ( ) ;
565- assert_eq ! ( time[ node] , 0.0 ) ;
566- let flags = t. flags_column ( ) ;
567- assert_eq ! ( flags[ node] , tskit:: NodeFlags :: IS_SAMPLE ) ;
560+ {
561+ let individual = t. individual_column ( ) ;
562+ assert_eq ! ( individual[ node] , tskit:: IndividualId :: NULL ) ;
563+ assert_eq ! (
564+ individual. get_with_id( node) . unwrap( ) ,
565+ & tskit:: IndividualId :: NULL
566+ ) ;
567+ assert ! ( individual. get_with_size_type( t. num_rows( ) ) . is_none( ) ) ;
568+ }
569+ {
570+ let population = t. population_column ( ) ;
571+ assert_eq ! ( population[ node] , tskit:: PopulationId :: NULL ) ;
572+ assert_eq ! (
573+ population. get_with_id( node) . unwrap( ) ,
574+ & tskit:: PopulationId :: NULL
575+ ) ;
576+ }
577+ {
578+ let time = t. time_column ( ) ;
579+ assert_eq ! ( time[ node] , 0.0 ) ;
580+ assert_eq ! ( time. get_with_id( node) . unwrap( ) , & 0.0 ) ;
581+ }
582+ {
583+ let flags = t. flags_column ( ) ;
584+ assert_eq ! ( flags[ node] , tskit:: NodeFlags :: IS_SAMPLE ) ;
585+ assert_eq ! (
586+ flags. get_with_id( node) . unwrap( ) ,
587+ & tskit:: NodeFlags :: IS_SAMPLE
588+ ) ;
589+ }
568590}
0 commit comments