Mailing List Archive

Author: creamyg
Date: 2008-09-06 16:46:47 -0700 (Sat, 06 Sep 2008)
New Revision: 3828

Modified:
trunk/c_src/KinoSearch/Test/TestQueryParserLogic.c
trunk/c_src/KinoSearch/Test/TestQueryParserSyntax.c
trunk/charmonizer/src/Charmonizer/Test.charm
trunk/charmonizer/src/Charmonizer/Test.harm
trunk/perl/buildlib/Lucy/Build.pm
Log:
Add a PLAN function to Charmonizer's testing utilities.


Modified: trunk/c_src/KinoSearch/Test/TestQueryParserLogic.c
===================================================================
--- trunk/c_src/KinoSearch/Test/TestQueryParserLogic.c 2008-09-06 20:03:36 UTC (rev 3827)
+++ trunk/c_src/KinoSearch/Test/TestQueryParserLogic.c 2008-09-06 23:46:47 UTC (rev 3828)
@@ -609,9 +609,9 @@
QParser_Set_Heed_Colons(or_parser, true);
QParser_Set_Heed_Colons(and_parser, true);

- /* FIXME!! This is cheap substitute for plan(). */
- printf("1..%u\n", batch->num_tests);
+ PLAN(batch);

+ /* Run logical tests with default boolop of OR. */
for (i = 0; logical_test_funcs[i] != NULL; i++) {
kino_TestQPLogic_logical_test_t test_func = logical_test_funcs[i];
TestQueryParser *test_case = test_func(BOOLOP_OR);
@@ -630,6 +630,7 @@
REFCOUNT_DEC(test_case);
}

+ /* Run logical tests with default boolop of AND. */
for (i = 0; logical_test_funcs[i] != NULL; i++) {
kino_TestQPLogic_logical_test_t test_func = logical_test_funcs[i];
TestQueryParser *test_case = test_func(BOOLOP_AND);
@@ -648,7 +649,7 @@
REFCOUNT_DEC(test_case);
}

-
+ /* Run tests for QParser_Prune(). */
for (i = 0; prune_test_funcs[i] != NULL; i++) {
kino_TestQPLogic_prune_test_t test_func = prune_test_funcs[i];
TestQueryParser *test_case = test_func();

Modified: trunk/c_src/KinoSearch/Test/TestQueryParserSyntax.c
===================================================================
--- trunk/c_src/KinoSearch/Test/TestQueryParserSyntax.c 2008-09-06 20:03:36 UTC (rev 3827)
+++ trunk/c_src/KinoSearch/Test/TestQueryParserSyntax.c 2008-09-06 23:46:47 UTC (rev 3828)
@@ -216,8 +216,7 @@
NULL, NULL, NULL);
QParser_Set_Heed_Colons(qparser, true);

- /* FIXME!! This is cheap substitute for plan(). */
- printf("1..%u\n", batch->num_tests);
+ PLAN(batch);

for (i = 0; leaf_test_funcs[i] != NULL; i++) {
kino_TestQPSyntax_test_t test_func = leaf_test_funcs[i];

Modified: trunk/charmonizer/src/Charmonizer/Test.charm
===================================================================
--- trunk/charmonizer/src/Charmonizer/Test.charm 2008-09-06 20:03:36 UTC (rev 3827)
+++ trunk/charmonizer/src/Charmonizer/Test.charm 2008-09-06 23:46:47 UTC (rev 3828)
@@ -48,6 +48,12 @@
return batch;
}

+void
+chaz_Test_plan(TestBatch *batch)
+{
+ printf("1..%u\n", batch->num_tests);
+}
+
static void
TestBatch_destroy(TestBatch *batch)
{
@@ -59,7 +65,7 @@
TestBatch_run_test(TestBatch *batch)
{
/* print start */
- printf("1..%u\n", batch->num_tests);
+ PLAN(batch);

/* run the batch */
batch->test_func(batch);

Modified: trunk/charmonizer/src/Charmonizer/Test.harm
===================================================================
--- trunk/charmonizer/src/Charmonizer/Test.harm 2008-09-06 20:03:36 UTC (rev 3827)
+++ trunk/charmonizer/src/Charmonizer/Test.harm 2008-09-06 23:46:47 UTC (rev 3828)
@@ -49,6 +49,7 @@

/* Note: maybe add line numbers later.
*/
+#define CHAZ_TEST_PLAN chaz_Test_plan
#define CHAZ_TEST_ASSERT_TRUE chaz_Test_assert_true
#define CHAZ_TEST_ASSERT_FALSE chaz_Test_assert_false
#define CHAZ_TEST_ASSERT_STR_EQ chaz_Test_assert_str_eq
@@ -72,6 +73,8 @@
return; \
} while (0)

+void
+chaz_Test_plan(chaz_TestBatch *batch);

void
chaz_Test_assert_true(chaz_TestBatch *batch, int expression,
@@ -117,6 +120,8 @@
#define TestBatch chaz_TestBatch
#define Test_init chaz_Test_init
#define Test_new_batch chaz_Test_new_batch
+ #define Test_plan chaz_Test_plan
+ #define PLAN CHAZ_TEST_PLAN
#define ASSERT_TRUE CHAZ_TEST_ASSERT_TRUE
#define ASSERT_FALSE CHAZ_TEST_ASSERT_FALSE
#define ASSERT_STR_EQ CHAZ_TEST_ASSERT_STR_EQ

Modified: trunk/perl/buildlib/Lucy/Build.pm
===================================================================
--- trunk/perl/buildlib/Lucy/Build.pm 2008-09-06 20:03:36 UTC (rev 3827)
+++ trunk/perl/buildlib/Lucy/Build.pm 2008-09-06 23:46:47 UTC (rev 3828)
@@ -491,24 +491,6 @@
return \@filtered;
}

-# Prepend a big fat warning to some content, then blast it out to a file.
-sub _write_autogenerated_file {
- my ( $self, $outfilepath, $source_path, $content ) = @_;
-
- # assume that if it's autogenerated we'll want to clean it up later
- $self->add_to_cleanup($outfilepath);
-
- my $autogen_header = $self->autogen_header;
- print "Writing $outfilepath\n";
- unlink $outfilepath;
- sysopen( my $fh, $outfilepath, O_CREAT | O_WRONLY | O_EXCL )
- or die "Couldn't open file '$outfilepath' for writing: $!";
- print $fh qq|$autogen_header\n#line 1 "$source_path"\n$content|
- or die "Print to '$outfilepath' failed: $!";
-
- close $fh or die "Couldn't close file '$outfilepath': $!";
-}
-
sub autogen_header {
my $self = shift;
return <<"END_AUTOGEN";


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits