Changeset 53

Timestamp:

11/25/05 06:37:12 (19 years ago)

Author:

thauvin

Message:

• build_dest_filename return also

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData.pm

@@ -283 +283 @@
             $val{$_} = shift(@data);
         }
-        return sprintf(
+        return ($datatype, sprintf(
             $dest,
             map { $val{$_} } @destarg,
-        );
+        ));
     }
     undef;

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

@@ -42 +42 @@
 ok(!$o->find_match_data_type('foo12.gz'), "is able to find good datatype");
 
-ok($o->build_dest_filename('ozone12.gz') eq 'dest12', "Can build dest string");
-ok($o->build_dest_filename('ozone12.gz', 'ozone') eq 'dest12', "Can build dest string with datatype");
+ok(
+    eq_array( 
+        [ $o->build_dest_filename('ozone12.gz') ], 
+        [ 'ozone', 'dest12' ]
+    ), 
+    "Can build dest string"
+);
+ok(
+    eq_array(
+        [ $o->build_dest_filename('ozone12.gz', 'ozone') ],
+        [ 'ozone', 'dest12' ]
+    ),
+    "Can build dest string with datatype"
+);
 ok(!defined($o->build_dest_filename('foo12.gz')), "Return undef if no match");
 ok(!defined($o->build_dest_filename('ozone12.gz', 'oxygene')), "Return undef if no match");