cvsuser 03/12/11 08:07:00
Modified: App-Options/t main.t test1 test2 test3 test4 test5
Log:
sync
Revision Changes Path
1.2 +33 -33 p5ee/App-Options/t/main.t
Index: main.t
===================================================================
RCS file: /cvs/public/p5ee/App-Options/t/main.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- main.t 16 Nov 2003 21:21:22 -0000 1.1
+++ main.t 11 Dec 2003 16:07:00 -0000 1.2
@@ -15,38 +15,38 @@
delete $ENV{DOCUMENT_ROOT};
App::Options->init();
-#print "CONF:\n ", join("\n ",%App::conf), "\n";
-ok(%App::conf, "put something in %App::conf");
-is($App::conf{prefix}, "/usr/local", "prefix = /usr/local");
-is($App::conf{app}, "main", "app = main");
-is($App::conf{var}, "value", "var = value");
-is($App::conf{var1}, "pattern match", "pattern match");
-is($App::conf{var2}, "old pattern match", "old pattern match");
-is($App::conf{htdocs_dir}, "/usr/local/htdocs", "variable substitution");
-is($App::conf{cgibin_dir}, "/usr/local/cgi-bin", "variable substitution (default
used)");
-is($App::conf{template_dir}, "/usr/local/template", "variable substitution (default
supplied but not used)");
-is($App::conf{greeting}, "Hello", "variable substitution (var name used since var
not defined)");
-is($App::conf{var3}, "value3", "inline pattern match");
-is($App::conf{var4}, undef, "section excluded");
-is($App::conf{var5}, "value5", "section exclusion ended");
-is($App::conf{var6}, undef, "section excluded again");
-is($App::conf{var7}, "value7", "section included");
-is($App::conf{var8}, "value8", "ALL works");
+#print "CONF:\n ", join("\n ",%App::options), "\n";
+ok(%App::options, "put something in %App::options");
+is($App::options{prefix}, "/usr/local", "prefix = /usr/local");
+is($App::options{app}, "main", "app = main");
+is($App::options{var}, "value", "var = value");
+is($App::options{var1}, "pattern match", "pattern match");
+is($App::options{var2}, "old pattern match", "old pattern match");
+is($App::options{htdocs_dir}, "/usr/local/htdocs", "variable substitution");
+is($App::options{cgibin_dir}, "/usr/local/cgi-bin", "variable substitution (default
used)");
+is($App::options{template_dir}, "/usr/local/template", "variable substitution
(default supplied but not used)");
+is($App::options{greeting}, "Hello", "variable substitution (var name used since
var not defined)");
+is($App::options{var3}, "value3", "inline pattern match");
+is($App::options{var4}, undef, "section excluded");
+is($App::options{var5}, "value5", "section exclusion ended");
+is($App::options{var6}, undef, "section excluded again");
+is($App::options{var7}, "value7", "section included");
+is($App::options{var8}, "value8", "ALL works");
-%App::conf = (
+%App::options = (
config_file => "$dir/app.conf",
prefix => "/usr/local",
perlinc => "/usr/mycompany/2.1.7/lib/perl5"
);
App::Options->init();
-#print "CONF:\n ", join("\n ",%App::conf), "\n";
-ok(%App::conf, "put something in %App::conf");
-is($App::conf{prefix}, "/usr/local", "prefix = /usr/local");
-is($App::conf{app}, "main", "app = main");
-is($App::conf{var}, "value", "var = value");
-is($App::conf{var1}, "pattern match", "pattern match");
-is($App::conf{var2}, "old pattern match", "old pattern match");
+#print "CONF:\n ", join("\n ",%App::options), "\n";
+ok(%App::options, "put something in %App::options");
+is($App::options{prefix}, "/usr/local", "prefix = /usr/local");
+is($App::options{app}, "main", "app = main");
+is($App::options{var}, "value", "var = value");
+is($App::options{var1}, "pattern match", "pattern match");
+is($App::options{var2}, "old pattern match", "old pattern match");
is($INC[0], "/usr/mycompany/2.1.7/lib/perl5", "[EMAIL PROTECTED] affected by
perlinc");
App::Options->init(\%App::otherconf);
@@ -58,14 +58,14 @@
is($App::otherconf{var1}, "pattern match", "pattern match");
is($App::otherconf{var2}, "old pattern match", "old pattern match");
-App::Options->init(conf => \%App::conf3);
-#print "CONF:\n ", join("\n ",%App::conf3), "\n";
-ok(%App::conf3, "put something in %App::conf3");
-is($App::conf3{prefix}, "/usr/local", "prefix = /usr/local");
-is($App::conf3{app}, "main", "app = main");
-is($App::conf3{var}, "value", "var = value");
-is($App::conf3{var1}, "pattern match", "pattern match");
-is($App::conf3{var2}, "old pattern match", "old pattern match");
+App::Options->init(values => \%App::options3);
+#print "CONF:\n ", join("\n ",%App::options3), "\n";
+ok(%App::options3, "put something in %App::options3");
+is($App::options3{prefix}, "/usr/local", "prefix = /usr/local");
+is($App::options3{app}, "main", "app = main");
+is($App::options3{var}, "value", "var = value");
+is($App::options3{var1}, "pattern match", "pattern match");
+is($App::options3{var2}, "old pattern match", "old pattern match");
exit 0;
1.2 +5 -3 p5ee/App-Options/t/test1
Index: test1
===================================================================
RCS file: /cvs/public/p5ee/App-Options/t/test1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- test1 16 Nov 2003 21:21:22 -0000 1.1
+++ test1 11 Dec 2003 16:07:00 -0000 1.2
@@ -1,9 +1,11 @@
#!/usr/local/bin/perl
BEGIN {
- use App::BEGIN;
- App::BEGIN->init(
- params => [ "invoice_id", "cust_nm" ],
+ use lib "lib";
+ use lib "../lib";
+ use App::Options;
+ App::Options->init(
+ options => [ "invoice_id", "cust_nm" ],
);
}
1.2 +5 -3 p5ee/App-Options/t/test2
Index: test2
===================================================================
RCS file: /cvs/public/p5ee/App-Options/t/test2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- test2 16 Nov 2003 21:21:22 -0000 1.1
+++ test2 11 Dec 2003 16:07:00 -0000 1.2
@@ -1,9 +1,11 @@
#!/usr/local/bin/perl
BEGIN {
- use App::BEGIN;
- App::BEGIN->init(
- param => {
+ use lib "lib";
+ use lib "../lib";
+ use App::Options;
+ App::Options->init(
+ option => {
invoice_id => "4",
cust_nm => "Joe Smith",
},
1.2 +6 -4 p5ee/App-Options/t/test3
Index: test3
===================================================================
RCS file: /cvs/public/p5ee/App-Options/t/test3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- test3 16 Nov 2003 21:21:22 -0000 1.1
+++ test3 11 Dec 2003 16:07:00 -0000 1.2
@@ -1,10 +1,12 @@
#!/usr/local/bin/perl
BEGIN {
- use App::BEGIN;
- App::BEGIN->init(
- param => {
- invoice_id => "4;type=int",
+ use lib "lib";
+ use lib "../lib";
+ use App::Options;
+ App::Options->init(
+ option => {
+ invoice_id => "4;type=integer",
cust_nm => "Joe Smith",
purchase_dttm => "2003-10-31 23:59:59; required; type=datetime",
delivery_dt => "required=1; type=date",
1.2 +6 -4 p5ee/App-Options/t/test4
Index: test4
===================================================================
RCS file: /cvs/public/p5ee/App-Options/t/test4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- test4 16 Nov 2003 21:21:22 -0000 1.1
+++ test4 11 Dec 2003 16:07:00 -0000 1.2
@@ -1,10 +1,12 @@
#!/usr/local/bin/perl
BEGIN {
- use App::BEGIN;
- App::BEGIN->init(
- param => {
- invoice_id => {default => 4, type => "int"},
+ use lib "lib";
+ use lib "../lib";
+ use App::Options;
+ App::Options->init(
+ option => {
+ invoice_id => {default => 4, type => "integer"},
cust_nm => {default => "Joe Smith"},
purchase_dttm => {default => "2003-10-31 23:59:59", required => 1, type
=> "datetime"},
delivery_dt => {required => 1, type => "date"},
1.2 +8 -5 p5ee/App-Options/t/test5
Index: test5
===================================================================
RCS file: /cvs/public/p5ee/App-Options/t/test5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- test5 16 Nov 2003 21:21:22 -0000 1.1
+++ test5 11 Dec 2003 16:07:00 -0000 1.2
@@ -1,15 +1,18 @@
#!/usr/local/bin/perl
BEGIN {
- use App::BEGIN;
- App::BEGIN->init(
- params => [ "invoice_id", "cust_nm", "price" ],
- param => {
- invoice_id => {default => 4, type => "int"},
+ use lib "lib";
+ use lib "../lib";
+ use App::Options;
+ App::Options->init(
+ options => [ "invoice_id", "cust_nm", "price" ],
+ option => {
+ invoice_id => {default => 4, type => "integer"},
cust_nm => {default => "Joe Smith"},
purchase_dttm => {default => "2003-10-31 23:59:59", type => "datetime"},
delivery_dt => {type => "date"},
price => {type => "float"},
+ sell_ind => {type => '^(Y|N)$'},
},
);
}
