[interchange-cvs] interchange - heins modified 3 files

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-04-11 16:23:06 GMT
Modified:  dist/test catalog.cfg
Modified:  dist/test/products tests.asc
Added:     dist/test/products composite.asc
Log:
* Add tests for DBI_CompositeKey

Revision  Changes    Path
2.7       +9 -0      interchange/dist/test/catalog.cfg


rev 2.7, prev_rev 2.6
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/test/catalog.cfg,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- catalog.cfg	6 Jul 2003 04:38:28 -0000	2.6
+++ catalog.cfg	11 Apr 2004 16:23:05 -0000	2.7
@@ -14,6 +14,15 @@
 Database             pricing   KEY           sku
 Database             sort      sort.asc      TAB
 Database             sort      MEMORY         1
+Database             composite composite.asc dbi:mysql:test
+Database             composite MULTIPLE_KEYS key1 key2 key3
+Database             composite COLUMN_DEF    "key1=varchar(64)"
+Database             composite COLUMN_DEF    "key2=varchar(64)"
+Database             composite COLUMN_DEF    "key3=varchar(64)"
+Database             composite COLUMN_DEF    "value1=varchar(64)"
+Database             composite INDEX         key1 key2 key3
+
+Database             userdb    userdb.txt    TAB
 
 Database             userdb    userdb.txt    TAB
 UserDB default crypt 0



2.16      +69 -7     interchange/dist/test/products/tests.asc


rev 2.16, prev_rev 2.15
Index: tests.asc
===================================================================
RCS file: /var/cvs/interchange/dist/test/products/tests.asc,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -r2.15 -r2.16
--- tests.asc	17 Feb 2004 15:58:28 -0000	2.15
+++ tests.asc	11 Apr 2004 16:23:06 -0000	2.16
@@ -2506,20 +2506,82 @@
 %%
 Test chained tag-based conditionals, e.g. [if ...][or ...]...[/if]
 %%%
-999999
+000153
 %%
-[the test] [perl]
-# Make this come out right
-return 'The expected result as a regex.';
+[data table=composite col=value1 key.0=a key.1=b key.2=c value=abc]
+[data table=composite col=value1 key.0=a key.1=b key.2=c]
+[data table=composite col=value1 key.0=a key.1=b key.2=d value=abd]
+[data table=composite col=value1 key.0=a key.1=b key.2=d]
+[data table=composite col=value1 key.0=a key.1=b key.2=c]
+%%
+abc\s+abc\s+abd\s+abd\s+abc
+%%
+
+%%
+
+%%
+Test multiple key set/retrieve with [data] tag.
+%%%
+000154
+%%
+[perl tables=composite]
+	# test set_slice, query, set_field, etc.
+	my $db = $Db{composite};
+	$db->query("delete from composite where key1 = 'a'");
+	my %hash = qw/
+		key1 a
+		key2 b
+		key3 e
+		value1 abe
+	/;
+	$db->set_slice(undef,\%hash);
+	$hash{key3} = 'f';
+	$hash{value1} = 'abf';
+	$db->set_slice(\%hash,\%hash);
+
+	my @key = qw/ a b g /;
+	$db->set_slice(\@key, { value1 => 'abg' });
+	my $key = join "\0", qw/ a b h /;
+	$db->set_slice($key, { value1 => 'abh' });
+	$key[2] = 'i';
+	$db->set_slice(\@key, ['value1'], ['abi']);
+	my $fary = [ qw/ key1 key2 key3 value1 /];
+	my $vary = [ qw/ a b j abj /];
+	$db->set_slice(undef, $fary, $vary);
+	$db->set_field([qw/a b k/], 'value1', 'abk');
+	return;
+[/perl]
+[query list=1 sql="select value1 from composite where key1 = 'a' order by key3"][sql-code]
+[/query]
+[perl tables=composite]
+	my @out;
+	my $db = $Db{composite};
+
+	@values = $db->get_slice([qw/ a b g /], [qw/key3 value1/]);
+	push @out, join " ", @values;
+
+	my %hash = qw/
+		key1 a
+		key2 b
+		key3 h
+	/;
+	@values = $db->get_slice(\%hash, [qw/key3 value1/]);
+	push @out, join " ", @values;
+
+	my $key = join "\0", qw/a b i/;
+	@values = $db->get_slice($key, [qw/key3 value1/]);
+	push @out, join " ", @values;
+
+	return join "\n", @out;
 [/perl]
 %%
-The expected result as a regex.
+abe\s+abf\s+abg\s+abh\s+abi\s+abj\s+abk\s+g\s+abg\s+h\s+abh\s+i\s+abi
 %%
-The NOT expected result.
+abc
 %%
 
 %%
-Skeleton test.
+Test $db->set_slice() and $db->set_field()
 %%%
 999999
 %%



2.1                  interchange/dist/test/products/composite.asc


rev 2.1, prev_rev 2.0