Changeset 2497f99

Timestamp:

Jun 14, 2013, 7:39:23 PM (11 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

5d8c9a7

Parents:

80c0fc7

git-author:

Robert Jacobs <rnjacobs@mit.edu> (06/04/13 19:19:44)

git-committer:

David Benjamin <davidben@mit.edu> (06/14/13 19:39:23)

Message:

Add tests to detect new_variable_* overriding previously set values

[davidben@mit.edu: Fix some nits]

File:

• t/variable.t (modified) (6 diffs)

t/variable.t

@@ -17 +17 @@
 BarnOwl::unset("-q", "intvar");
 is(BarnOwl::getvar("intvar"), "24", "intvar unset bogus");
+BarnOwl::new_variable_int("intvar", { default => 7 });
+isnt(BarnOwl::getvar("intvar"), "7", "intvar reinit shouldn't override preexisting value");
 
 BarnOwl::new_variable_bool("boolvar", { default => 1 });
@@ -28 +30 @@
 BarnOwl::unset("-q", "boolvar");
 is(BarnOwl::getvar("boolvar"), "off", "boolvar unset");
+BarnOwl::new_variable_bool("boolvar", { default => 1 });
+isnt(BarnOwl::getvar("boolvar"), "on", "boolvar reinit shouldn't override preexisting value");
 
 BarnOwl::new_variable_string("strvar", { default => "monkey" });
@@ -37 +41 @@
 BarnOwl::unset("-q", "strvar");
 is(BarnOwl::getvar("strvar"), "cuttlefish", "strvar unset bogus");
+BarnOwl::new_variable_string("strvar", { default => "monkey" });
+isnt(BarnOwl::getvar("strvar"), "monkey", "strvar reinit shouldn't override value");
 
 BarnOwl::new_variable_enum("enumvar", { validsettings => [qw/foo bar baz/], default => "bar" });
@@ -46 +52 @@
 BarnOwl::unset("-q", "enumvar");
 is(BarnOwl::getvar("enumvar"), "baz", "enumvar unset bogus");
+BarnOwl::new_variable_enum("enumvar", { validsettings => [qw/foo bar baz/], default => "bar" });
+isnt(BarnOwl::getvar("enumvar"), "bar", "enumvar reinit shouldn't override value");
 
 BarnOwl::new_variable_int("intvar2");
@@ -62 +70 @@
     get_tostring => sub { "value is " . $value },
     set_fromstring => sub {
-        die "Too long" unless $_[0] =~ /^...?$/;
-        $value = $_[0];
+        die "Too long" unless $_[0] =~ /^...?$/;
+        $value = $_[0];
     },
     takes_on_off => 1
@@ -78 +86 @@
 $value = "something really long";
 is(BarnOwl::getvar("fullvar"), "value is something really long", "fullvar set out-of-band");
+# Kinda verbose, but better to test all forms
+my $value = "foo";
+BarnOwl::new_variable_full("fullvar", {
+    validsettings => '<short-words>',
+    get_tostring => sub { "value is " . $value },
+    set_fromstring => sub {
+        die "Too long" unless $_[0] =~ /^...?$/;
+        $value = $_[0];
+    },
+    takes_on_off => 1
+});
+isnt(BarnOwl::getvar("fullvar"), "value is foo", "fullvar reinit doesn't override value");
 
 1;