TT#39583 Fix tests broken by links format changes

Change-Id: I14d850616e7e9bb4c5d35a0cc9ec00102483156f

t/api-rest/api-billingfees.t

@@ -98,10 +98,12 @@ $test_machine->check_bundle();
     ($res, $z_fee, $req) = $test_machine->check_item_get($test_machine->normalize_uri($res->header('Location')),"fetch profile fee with new implicit zone");
     ok(exists $z_fee->{billing_zone_id} && $z_fee->{billing_zone_id} > $test_machine->DATA_ITEM->{billing_zone_id}, "check if implicit zone returns a new zone id");
 
-    ($req,$res,$content) = $test_machine->request_delete($test_machine->normalize_uri($z_fee->{_links}->{'ngcp:billingzones'}->{href}));
+    my $href = ref $z_fee->{_links}->{'ngcp:billingzones'} eq 'ARRAY'
+        ? $z_fee->{_links}->{'ngcp:billingzones'}->[0]->{href}
+        : $z_fee->{_links}->{'ngcp:billingzones'}->{href};
+    ($req,$res,$content) = $test_machine->request_delete($test_machine->normalize_uri($href));
     is($res->code, 204, "delete new implicit zone");
-
-    ($res) = $test_machine->request_get($test_machine->normalize_uri($z_fee->{_links}->{'self'}->{href}));
+    ($res) = $test_machine->request_get($test_machine->normalize_uri($href));
     is($res->code, 404, "check if fee is deleted when zone is deleted");    
 }
 

t/api-rest/api-journals.t

@@ -2309,7 +2309,10 @@ sub _test_item_journal_link {
     if (_is_journal_resource_enabled($resource)) {
         ok(exists $item->{_links}, "check existence of _links");
         ok($item->{_links}->{'ngcp:journal'}, "check existence of ngcp:journal link");
-        ok($item->{_links}->{'ngcp:journal'}->{href} eq '/api/'.$resource . '/' . $item_id . '/journal/', "check if ngcp:journal link equals '/api/$resource/$item_id/journal/'");
+        my $href = ref $item->{_links}->{'ngcp:journal'} eq 'ARRAY' 
+            ? $item->{_links}->{'ngcp:journal'}->[0]->{href}
+            : $item->{_links}->{'ngcp:journal'}->{href};
+        ok($href eq '/api/'.$resource . '/' . $item_id . '/journal/', "check if ngcp:journal link equals '/api/$resource/$item_id/journal/'");
     }
 }
 
@@ -2337,7 +2340,10 @@ sub _test_journal_top_journalitem {
             ok($journal->{_links}->{self}, "check existence of self link");
             ok($journal->{_links}->{collection}, "check existence of collection link");
             ok($journal->{_links}->{'ngcp:'.$resource}, "check existence of ngcp:$resource link");
-            ok($journal->{_links}->{'ngcp:'.$resource}->{href} eq '/api/'.$resource . '/' . $item_id, "check if ngcp:$resource link equals '/api/$resource/$item_id'");
+            my $href_resource = ref $journal->{_links}->{'ngcp:'.$resource} eq 'ARRAY'
+                ? $journal->{_links}->{'ngcp:'.$resource}->[0]->{href}
+                : $journal->{_links}->{'ngcp:'.$resource}->{href};
+            ok($href_resource eq '/api/'.$resource . '/' . $item_id, "check if ngcp:$resource link equals '/api/$resource/$item_id'");
 
             if (defined $old_journal) {
                 ok($journal->{timestamp} ge $old_journal->{timestamp},"check incremented timestamp");