From 4e757aa64c76a4d15db88cfb20cf118cc739789d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 19 Feb 2007 22:10:23 +0000
Subject: 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)

---
 source4/pidl/tests/ndr.pl | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'source4/pidl/tests')

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");
-- 
cgit