Changeset 23 for trunk

Timestamp:

09/28/05 21:55:53 (19 years ago)

Author:

thauvin

Message:

• check obs really exists when getting value

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (2 diffs, 1 prop)
• t/O-01.t (modified) (1 diff, 1 prop)
• t/O-02.t (modified) (2 diffs, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -48 +48 @@
 }
 
+sub is_obs {
+    my ($self, $obs) = @_;
+    grep { $_ eq "Obs $obs" } $self->{config}->GroupMembers('Obs');
+}
+
 sub list_datadir {
     my ($self, $obs) = @_;
-    $self->{config}->SectionExists($obs) or return undef;
+    $self->is_obs($obs) or return undef;
     map { m,^datadir/(.*),; ( $1 => $self->{config}->val($obs, $_) ) }
         grep { m,^datadir/, } 
@@ -56 +61 @@
 }
 
+sub get_datadir {
+    my ($self, $obs, $type) = @_;
+    $self->is_obs($obs) or return undef;
+    $self->getvalue($obs, "datadir/$type");
+}
+
 1;

trunk/soft/ObsData/t/O-01.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 use_ok('ObsData');
 
-# can_ok('ObsData', qw());
+can_ok('ObsData', qw(list_obs list_datadir get_datadir getvalue is_obs));
 
 ok(ObsData->new('testdata/obsdata-conftest'), "Can create object");

trunk/soft/ObsData/t/O-02.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 5;
+use Test::More tests => 8;
 
 use_ok('ObsData');
@@ -9 +9 @@
 
 ok(grep { 'ohp' } $o->list_obs, "Can list observatories");
+
+ok($o->is_obs('ohp'), "check is an obs is defined");
+ok(!$o->is_obs('NOohp'), "check is an obs is not defined");
+
 my %datadir =  $o->list_datadir('ohp');
-ok($datadir{ozone} = 'testdata/ohp/ozone', "Can get list of data directory");
+ok($datadir{ozone} eq 'testdata/ohp/ozone', "Can get list of data directory");
+ok($o->get_datadir('ohp', 'ozone') eq 'testdata/ohp/ozone', 'Can retrive data directory');