diff --git a/t/api-rest/api-subscribers.t b/t/api-rest/api-subscribers.t index 52fbe4197a..a251f2f26c 100644 --- a/t/api-rest/api-subscribers.t +++ b/t/api-rest/api-subscribers.t @@ -169,17 +169,17 @@ my $remote_config = $test_machine->init_catalyst_config; diag("1. Check that member will return empty groups after put groups empty"); my($member_put,$member_get) = $test_machine->check_put2get($members->[0]); - $members->[0]->{content}->{pbx_group_ids} = [map { $groups->[$_]->{content}->{id} } (1,0,2)]; + $members->[0]->{content}->{pbx_group_ids} = [map { $groups->[$_]->{content}->{id} } (2,1)]; diag("2. Check that member will return groups as they were specified"); ($member_put,$member_get) = $test_machine->check_put2get($members->[0]); - $groups->[0]->{content}->{pbx_groupmember_ids} = [map { $members->[$_]->{content}->{id} } (2,1,0)]; + $groups->[1]->{content}->{pbx_groupmember_ids} = [map { $members->[$_]->{content}->{id} } (2,1,0)]; diag("3. Check that group will return members as they were specified"); - my($group_put,$group_get) = $test_machine->check_put2get($groups->[0]); + my($group_put,$group_get) = $test_machine->check_put2get($groups->[1]); - $groups->[0]->{content}->{pbx_groupmember_ids} = []; + $groups->[1]->{content}->{pbx_groupmember_ids} = []; diag("4. Check that group will return empty members after put members empty"); - my($group_put,$group_get) = $test_machine->check_put2get($groups->[0]); + my($group_put,$group_get) = $test_machine->check_put2get($groups->[1]); $test_machine->clear_test_data_all();#fake data aren't registered in this test machine, so they will stay. } diff --git a/t/lib/Test/Collection.pm b/t/lib/Test/Collection.pm index cce7122e52..73959a6d7d 100644 --- a/t/lib/Test/Collection.pm +++ b/t/lib/Test/Collection.pm @@ -310,7 +310,7 @@ sub get_item_hal{ if(( $name eq $self->name ) && $self->DATA_CREATED->{FIRST}){ $resitem = $self->get_created_first; } - if($self->DATA_LOADED->{$name} && @{$self->DATA_LOADED->{$name}}){ + if(!$resitem && $self->DATA_LOADED->{$name} && @{$self->DATA_LOADED->{$name}}){ $resitem = $self->DATA_LOADED->{$name}->[0]; } }