Changeset 1567 for trunk

Timestamp:

12/30/15 14:45:22 (9 years ago)

Author:

nanardon

Message:

Fix returned value and test

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases/Attributes.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Objects.pm (modified) (2 diffs)
• live-test/10_sql.t (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Attributes.pm

@@ -452 +452 @@
             return @{$res} ? $res : undef;
         } elsif ($self->multiple) {
-            return ref $res ? $res : [$res]
+            return (ref $res ? $res : [$res])
         } else {
             return $res;

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm

@@ -248 +248 @@
     my ($self, $cfield) = @_;
     my $res = $self->get_c_field($cfield);
-    return ref $res ? @{ $res } : ($res);
+    if ($res) {
+        return(ref $res ? @{$res} : $res);
+    } else {
+        return;
+    }
 }
 
@@ -254 +258 @@
     my ($self, $cfield) = @_;
     my $res = $self->_get_c_field($cfield);
-    return ref $res ? @{ $res } : ($res);
+    if ($res) {
+        return(ref $res ? @{$res} : ($res));
+    } else {
+        return;
+    }
 }
 

trunk/LATMOS-Accounts/live-test/10_sql.t

@@ -71 +71 @@
 ok(my $obj = $base->get_object('nethost', $oid), "nethost $oid is actually deleted");
 is($obj->get_attributes('description'), "Nethost Test");
-is($obj->get_attributes('ip'), '255.255.255.255');
+my ($ip) = $obj->get_attributes('ip');
+is($ip, '255.255.255.255');
 
 ok($base->delete_object('nethost', $oid), "Can delete nethost $oid");