diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-02-19 22:10:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:48:38 -0500 |
| commit | 4e757aa64c76a4d15db88cfb20cf118cc739789d (patch) | |
| tree | 431090cca59bddb608fdbfac4e05cd06ec5fee8c /source4/pidl/tests/ndr.pl | |
| parent | ac0433e3d3b5feb7629f67f35ea914c11686591c (diff) | |
| download | samba-4e757aa64c76a4d15db88cfb20cf118cc739789d.tar.gz samba-4e757aa64c76a4d15db88cfb20cf118cc739789d.tar.bz2 samba-4e757aa64c76a4d15db88cfb20cf118cc739789d.zip | |
r21457: Cope with anonymous nested types in the NDR layer. This doesn't handled
named nested types yet, as these have to be registered.
(This used to be commit 9b0416b5d06286c81c73477a24cb591fd4b23d18)
Diffstat (limited to 'source4/pidl/tests/ndr.pl')
| -rwxr-xr-x | source4/pidl/tests/ndr.pl | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source4/pidl/tests/ndr.pl b/source4/pidl/tests/ndr.pl index baf06b1eae..26fb6c290b 100755 --- a/source4/pidl/tests/ndr.pl +++ b/source4/pidl/tests/ndr.pl @@ -27,15 +27,13 @@ is_deeply(GetElementLevelTable($e), [ 'IS_DEFERRED' => 0, 'LEVEL_INDEX' => 0, 'DATA_TYPE' => 'uint8', - 'CONVERT_FROM' => undef, 'CONTAINS_DEFERRED' => 0, 'TYPE' => 'DATA', 'IS_SURROUNDING' => 0, - 'CONVERT_TO' => undef } ]); -my $ne = ParseElement($e); +my $ne = ParseElement($e, undef); is($ne->{ORIGINAL}, $e); is($ne->{NAME}, "v"); is($ne->{ALIGN}, 1); @@ -45,11 +43,9 @@ is_deeply($ne->{LEVELS}, [ 'IS_DEFERRED' => 0, 'LEVEL_INDEX' => 0, 'DATA_TYPE' => 'uint8', - 'CONVERT_FROM' => undef, 'CONTAINS_DEFERRED' => 0, 'TYPE' => 'DATA', 'IS_SURROUNDING' => 0, - 'CONVERT_TO' => undef } ]); @@ -77,11 +73,9 @@ is_deeply(GetElementLevelTable($e), [ 'IS_DEFERRED' => 1, 'LEVEL_INDEX' => 1, 'DATA_TYPE' => 'uint8', - 'CONVERT_FROM' => undef, 'CONTAINS_DEFERRED' => 0, 'TYPE' => 'DATA', 'IS_SURROUNDING' => 0, - 'CONVERT_TO' => undef } ]); @@ -117,11 +111,9 @@ is_deeply(GetElementLevelTable($e), [ 'IS_DEFERRED' => 1, 'LEVEL_INDEX' => 2, 'DATA_TYPE' => 'uint8', - 'CONVERT_FROM' => undef, 'CONTAINS_DEFERRED' => 0, 'TYPE' => 'DATA', 'IS_SURROUNDING' => 0, - 'CONVERT_TO' => undef } ]); @@ -149,11 +141,9 @@ is_deeply(GetElementLevelTable($e), [ 'IS_DEFERRED' => 1, 'LEVEL_INDEX' => 1, 'DATA_TYPE' => 'uint8', - 'CONVERT_FROM' => undef, 'CONTAINS_DEFERRED' => 0, 'TYPE' => 'DATA', 'IS_SURROUNDING' => 0, - 'CONVERT_TO' => undef } ]); @@ -182,11 +172,9 @@ is_deeply(GetElementLevelTable($e), [ 'IS_DEFERRED' => 0, 'LEVEL_INDEX' => 1, 'DATA_TYPE' => 'uint8', - 'CONVERT_FROM' => undef, 'CONTAINS_DEFERRED' => 0, 'TYPE' => 'DATA', 'IS_SURROUNDING' => 0, - 'CONVERT_TO' => undef } ]); @@ -200,7 +188,7 @@ $e = { 'PARENT' => { TYPE => 'STRUCT' }, 'LINE' => 42 }; -$ne = ParseElement($e); +$ne = ParseElement($e, undef); is($ne->{REPRESENTATION_TYPE}, "bar"); # representation_type @@ -213,5 +201,5 @@ $e = { 'PARENT' => { TYPE => 'STRUCT' }, 'LINE' => 42 }; -$ne = ParseElement($e); +$ne = ParseElement($e, undef); is($ne->{REPRESENTATION_TYPE}, "uint8"); |