--- trunk/t/3-normalize.t	2007/11/03 13:33:19	980
+++ trunk/t/3-normalize.t	2007/11/04 11:12:38	983
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 351;
+use Test::More tests => 352;
 
 BEGIN {
 	use_ok( 'WebPAC::Test' );
@@ -162,7 +162,9 @@
 
 	ok(! _set_lookup( undef ), "set_lookup(undef)");
 
-	_set_rec( $rec1 );
+	_set_ds( $rec1 );
+
+	is_deeply( get_ds, $rec1, 'get_ds' );
 
 	cmp_ok( join(",", rec2('200','a') ), 'eq', '200a,200a*2', 'join rec2' );
 	cmp_ok( join(",", rec2('200','a'), rec2('200','b') ), 'eq', '200a,200a*2,200b', 'join rec2 rec2' );
@@ -358,7 +360,7 @@
 
 	#ok(! lookup('non-existent'), 'lookup non-existant' );
 
-	_set_rec( $rec2 );
+	_set_ds( $rec2 );
 
 	test_s(qq{
 		search_display('Title',
@@ -445,7 +447,7 @@
 	my $rules = qq{ search('mixed', rec('200') ) };
 	
 	_clean_ds();
-	_set_rec( $rec );
+	_set_ds( $rec );
 	test_s( $rules );
 	ok($ds = _get_ds(), "get_ds");
 	is_deeply( $ds, {
@@ -462,7 +464,7 @@
 
 	# wird and non-valid structure which is supported anyway
 	_clean_ds();
-	_set_rec({
+	_set_ds({
 		'200' => [{
 			'a' => '200a',
 		},
@@ -512,7 +514,7 @@
 		my ($msg, $rec, $rules, $struct) = @_;
 
 		_clean_ds();
-		_set_rec($rec);
+		_set_ds($rec);
 
 		foreach my $r (split(/;/, $rules)) {
 			$r =~ s/[\s\n\r]+/ /gs;
@@ -621,7 +623,7 @@
 	sub test_rule {
 		my ($msg, $rec, $rule, $struct) = @_;
 		_clean_ds();
-		_set_rec( $rec );
+		_set_ds( $rec );
 		$rule =~ s/\\/\\/gs;
 		my $r = test_s( $rule );
 		diag "for ", dump($rec), " got:\n", dump($r), "\nexpect:\n" if ($debug > 1);