CGI::Ex 2.10

[chaz/p5-CGI-Ex] / t / 1_validate_11_no_extra.t

diff --git a/t/1_validate_11_no_extra.t b/t/1_validate_11_no_extra.t
index c7a8d0ca5861c96d6dd47c99b1f54bb12865e26d..226cdf61c2ca304a5dac6811719dc58a0049bec5 100644 (file)
--- a/t/1_validate_11_no_extra.t
+++ b/t/1_validate_11_no_extra.t
@@ -7,7 +7,7 @@
 =cut
 
 use strict;
-use Test::More tests => 21;
+use Test::More tests => 13;
 
 use_ok('CGI::Ex::Validate');
 
@@ -18,12 +18,10 @@ sub validate { CGI::Ex::Validate::validate(@_) }
 ###----------------------------------------------------------------###
 
 ### test single group for extra fields
-$v = [
-{
-  'general no_extra_fields' => 'all',
+$v = {
+  'group no_extra_fields' => 1,
   foo => {max_len => 10},
-},
-];
+};
 
 $e = validate({}, $v);
 ok(! $e);
@@ -39,13 +37,11 @@ ok($e);
 
 
 ### test on failed validate if
-$v = [
-{
-  'general no_extra_fields' => 'all',
+$v = {
+  'group no_extra_fields' => 1,
   'group validate_if' => 'baz',
   foo => {max_len => 10},
-},
-];
+};
 
 $e = validate({}, $v);
 ok(! $e);
@@ -60,14 +56,12 @@ $e = validate({bar => "bar"}, $v);
 ok(! $e);
 
 ### test on successful validate if
-$v = [
-{
-  'general no_extra_fields' => 'all',
+$v = {
+  'group no_extra_fields' => 1,
   'group validate_if' => 'baz',
   foo => {max_len => 10},
   baz => {max_len => 10},
-},
-];
+};
 
 $e = validate({baz => 1}, $v);
 ok(! $e);
@@ -81,55 +75,3 @@ ok($e);
 $e = validate({baz => 1, bar => "bar"}, $v);
 ok($e);
 
-### test on multiple groups, some with validate if
-$v = [
-{
-  'general no_extra_fields' => 'all',
-  'group validate_if' => 'baz',
-  foo => {max_len => 10},
-  baz => {max_len => 10},
-},
-{
-  'group validate_if' => 'hem',
-  haw => {max_len => 10},
-},
-];
-
-$e = validate({haw => 1, baz => 1}, $v);
-ok(! $e);
-
-$e = validate({haw => 1, baz => 1, foo => "foo"}, $v);
-ok(! $e);
-
-$e = validate({haw => 1, baz => 1, foo => "foo", bar => "bar"}, $v);
-ok($e);
-
-$e = validate({haw => 1, baz => 1, bar => "bar"}, $v);
-ok($e);
-
-
-### test on multiple groups, some with validate if
-$v = [
-{
-  'general no_extra_fields' => 'used',
-  'group validate_if' => 'baz',
-  foo => {max_len => 10},
-  baz => {max_len => 10},
-},
-{
-  'group validate_if' => 'hem',
-  haw => {max_len => 10},
-},
-];
-
-$e = validate({haw => 1, baz => 1}, $v);
-ok($e);
-
-$e = validate({haw => 1, baz => 1, foo => "foo"}, $v);
-ok($e);
-
-$e = validate({haw => 1, baz => 1, foo => "foo", bar => "bar"}, $v);
-ok($e);
-
-$e = validate({haw => 1, baz => 1, bar => "bar"}, $v);
-ok($e);