You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2013/05/30 22:36:37 UTC
[lucy-commits] [19/26] git commit: refs/heads/separate-clownfish-wip2 - Move Lucy
tests to a separate parcel TestLucy
Move Lucy tests to a separate parcel TestLucy
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/ffb0e921
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/ffb0e921
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/ffb0e921
Branch: refs/heads/separate-clownfish-wip2
Commit: ffb0e921389b2546ee70b89b802cba89a2a0b8f5
Parents: 9f826b3
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 27 20:48:40 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Thu May 30 22:32:00 2013 +0200
----------------------------------------------------------------------
c/t/test_lucy.c | 4 +-
common/charmonizer.c | 9 ++++++
common/charmonizer.main | 9 ++++++
core/Lucy/Test.c | 1 +
core/Lucy/Test.cfh | 2 +-
core/Lucy/Test/Analysis/TestAnalyzer.c | 1 +
core/Lucy/Test/Analysis/TestAnalyzer.cfh | 2 +-
core/Lucy/Test/Analysis/TestCaseFolder.c | 3 +-
core/Lucy/Test/Analysis/TestCaseFolder.cfh | 2 +-
core/Lucy/Test/Analysis/TestNormalizer.c | 3 +-
core/Lucy/Test/Analysis/TestNormalizer.cfh | 2 +-
core/Lucy/Test/Analysis/TestPolyAnalyzer.c | 3 +-
core/Lucy/Test/Analysis/TestPolyAnalyzer.cfh | 2 +-
core/Lucy/Test/Analysis/TestRegexTokenizer.c | 3 +-
core/Lucy/Test/Analysis/TestRegexTokenizer.cfh | 2 +-
core/Lucy/Test/Analysis/TestSnowballStemmer.c | 3 +-
core/Lucy/Test/Analysis/TestSnowballStemmer.cfh | 2 +-
core/Lucy/Test/Analysis/TestSnowballStopFilter.c | 3 +-
core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh | 2 +-
core/Lucy/Test/Analysis/TestStandardTokenizer.c | 3 +-
core/Lucy/Test/Analysis/TestStandardTokenizer.cfh | 2 +-
core/Lucy/Test/Highlight/TestHeatMap.c | 1 +
core/Lucy/Test/Highlight/TestHeatMap.cfh | 2 +-
core/Lucy/Test/Highlight/TestHighlighter.c | 3 +-
core/Lucy/Test/Highlight/TestHighlighter.cfh | 2 +-
core/Lucy/Test/Index/TestDocWriter.c | 3 +-
core/Lucy/Test/Index/TestDocWriter.cfh | 2 +-
core/Lucy/Test/Index/TestHighlightWriter.c | 3 +-
core/Lucy/Test/Index/TestHighlightWriter.cfh | 2 +-
core/Lucy/Test/Index/TestIndexManager.c | 1 +
core/Lucy/Test/Index/TestIndexManager.cfh | 2 +-
core/Lucy/Test/Index/TestPolyReader.c | 3 +-
core/Lucy/Test/Index/TestPolyReader.cfh | 2 +-
core/Lucy/Test/Index/TestPostingListWriter.c | 3 +-
core/Lucy/Test/Index/TestPostingListWriter.cfh | 2 +-
core/Lucy/Test/Index/TestSegWriter.c | 3 +-
core/Lucy/Test/Index/TestSegWriter.cfh | 2 +-
core/Lucy/Test/Index/TestSegment.c | 3 +-
core/Lucy/Test/Index/TestSegment.cfh | 2 +-
core/Lucy/Test/Index/TestSnapshot.c | 1 +
core/Lucy/Test/Index/TestSnapshot.cfh | 2 +-
core/Lucy/Test/Index/TestTermInfo.c | 3 +-
core/Lucy/Test/Index/TestTermInfo.cfh | 2 +-
core/Lucy/Test/Object/TestBitVector.c | 3 +-
core/Lucy/Test/Object/TestBitVector.cfh | 2 +-
core/Lucy/Test/Object/TestI32Array.c | 3 +-
core/Lucy/Test/Object/TestI32Array.cfh | 2 +-
core/Lucy/Test/Plan/TestArchitecture.c | 3 +-
core/Lucy/Test/Plan/TestArchitecture.cfh | 2 +-
core/Lucy/Test/Plan/TestBlobType.c | 3 +-
core/Lucy/Test/Plan/TestBlobType.cfh | 2 +-
core/Lucy/Test/Plan/TestFieldMisc.c | 1 +
core/Lucy/Test/Plan/TestFieldMisc.cfh | 2 +-
core/Lucy/Test/Plan/TestFieldType.c | 3 +-
core/Lucy/Test/Plan/TestFieldType.cfh | 2 +-
core/Lucy/Test/Plan/TestFullTextType.c | 3 +-
core/Lucy/Test/Plan/TestFullTextType.cfh | 2 +-
core/Lucy/Test/Plan/TestNumericType.c | 3 +-
core/Lucy/Test/Plan/TestNumericType.cfh | 2 +-
core/Lucy/Test/Search/TestLeafQuery.c | 3 +-
core/Lucy/Test/Search/TestLeafQuery.cfh | 2 +-
core/Lucy/Test/Search/TestMatchAllQuery.c | 3 +-
core/Lucy/Test/Search/TestMatchAllQuery.cfh | 2 +-
core/Lucy/Test/Search/TestNOTQuery.c | 3 +-
core/Lucy/Test/Search/TestNOTQuery.cfh | 2 +-
core/Lucy/Test/Search/TestNoMatchQuery.c | 3 +-
core/Lucy/Test/Search/TestNoMatchQuery.cfh | 2 +-
core/Lucy/Test/Search/TestPhraseQuery.c | 3 +-
core/Lucy/Test/Search/TestPhraseQuery.cfh | 2 +-
core/Lucy/Test/Search/TestPolyQuery.c | 3 +-
core/Lucy/Test/Search/TestPolyQuery.cfh | 2 +-
core/Lucy/Test/Search/TestQueryParser.c | 3 +-
core/Lucy/Test/Search/TestQueryParser.cfh | 2 +-
core/Lucy/Test/Search/TestQueryParserLogic.c | 11 ++++---
core/Lucy/Test/Search/TestQueryParserLogic.cfh | 2 +-
core/Lucy/Test/Search/TestQueryParserSyntax.c | 15 ++++++-----
core/Lucy/Test/Search/TestQueryParserSyntax.cfh | 2 +-
core/Lucy/Test/Search/TestRangeQuery.c | 3 +-
core/Lucy/Test/Search/TestRangeQuery.cfh | 2 +-
core/Lucy/Test/Search/TestReqOptQuery.c | 3 +-
core/Lucy/Test/Search/TestReqOptQuery.cfh | 2 +-
core/Lucy/Test/Search/TestSeriesMatcher.c | 3 +-
core/Lucy/Test/Search/TestSeriesMatcher.cfh | 2 +-
core/Lucy/Test/Search/TestSortSpec.c | 3 +-
core/Lucy/Test/Search/TestSortSpec.cfh | 2 +-
core/Lucy/Test/Search/TestSpan.c | 3 +-
core/Lucy/Test/Search/TestSpan.cfh | 2 +-
core/Lucy/Test/Search/TestTermQuery.c | 3 +-
core/Lucy/Test/Search/TestTermQuery.cfh | 2 +-
core/Lucy/Test/Store/MockFileHandle.c | 3 +-
core/Lucy/Test/Store/MockFileHandle.cfh | 2 +-
core/Lucy/Test/Store/TestCompoundFileReader.c | 1 +
core/Lucy/Test/Store/TestCompoundFileReader.cfh | 2 +-
core/Lucy/Test/Store/TestCompoundFileWriter.c | 1 +
core/Lucy/Test/Store/TestCompoundFileWriter.cfh | 2 +-
core/Lucy/Test/Store/TestFSDirHandle.c | 1 +
core/Lucy/Test/Store/TestFSDirHandle.cfh | 2 +-
core/Lucy/Test/Store/TestFSFileHandle.c | 1 +
core/Lucy/Test/Store/TestFSFileHandle.cfh | 2 +-
core/Lucy/Test/Store/TestFSFolder.c | 1 +
core/Lucy/Test/Store/TestFSFolder.cfh | 2 +-
core/Lucy/Test/Store/TestFileHandle.c | 3 +-
core/Lucy/Test/Store/TestFileHandle.cfh | 2 +-
core/Lucy/Test/Store/TestFolder.c | 1 +
core/Lucy/Test/Store/TestFolder.cfh | 2 +-
core/Lucy/Test/Store/TestFolderCommon.c | 1 +
core/Lucy/Test/Store/TestFolderCommon.cfh | 2 +-
core/Lucy/Test/Store/TestIOChunks.c | 3 +-
core/Lucy/Test/Store/TestIOChunks.cfh | 2 +-
core/Lucy/Test/Store/TestIOPrimitives.c | 3 +-
core/Lucy/Test/Store/TestIOPrimitives.cfh | 2 +-
core/Lucy/Test/Store/TestInStream.c | 3 +-
core/Lucy/Test/Store/TestInStream.cfh | 2 +-
core/Lucy/Test/Store/TestRAMDirHandle.c | 1 +
core/Lucy/Test/Store/TestRAMDirHandle.cfh | 2 +-
core/Lucy/Test/Store/TestRAMFileHandle.c | 3 +-
core/Lucy/Test/Store/TestRAMFileHandle.cfh | 2 +-
core/Lucy/Test/Store/TestRAMFolder.c | 1 +
core/Lucy/Test/Store/TestRAMFolder.cfh | 2 +-
core/Lucy/Test/TestSchema.c | 3 +-
core/Lucy/Test/TestSchema.cfh | 2 +-
core/Lucy/Test/TestUtils.c | 3 +-
core/Lucy/Test/TestUtils.cfh | 2 +-
core/Lucy/Test/Util/BBSortEx.c | 7 +++--
core/Lucy/Test/Util/BBSortEx.cfh | 2 +-
core/Lucy/Test/Util/TestIndexFileNames.c | 1 +
core/Lucy/Test/Util/TestIndexFileNames.cfh | 2 +-
core/Lucy/Test/Util/TestJson.c | 1 +
core/Lucy/Test/Util/TestJson.cfh | 2 +-
core/Lucy/Test/Util/TestMemoryPool.c | 3 +-
core/Lucy/Test/Util/TestMemoryPool.cfh | 2 +-
core/Lucy/Test/Util/TestPriorityQueue.c | 3 +-
core/Lucy/Test/Util/TestPriorityQueue.cfh | 2 +-
core/TestLucy.c | 20 +++++++++++++++
core/TestLucy.cfp | 4 +++
perl/Build.PL | 4 ++-
perl/buildlib/Lucy/Build/Binding/Misc.pm | 20 +++++++-------
137 files changed, 247 insertions(+), 138 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/c/t/test_lucy.c
----------------------------------------------------------------------
diff --git a/c/t/test_lucy.c b/c/t/test_lucy.c
index d7ba0bb..fc3f81e 100644
--- a/c/t/test_lucy.c
+++ b/c/t/test_lucy.c
@@ -26,11 +26,11 @@ main() {
bool success = true;
testcfish_bootstrap_parcel();
- lucy_bootstrap_parcel();
+ testlucy_bootstrap_parcel();
formatter = cfish_TestFormatterCF_new();
success &= testcfish_Test_run_all_batches((cfish_TestFormatter*)formatter);
- success &= lucy_Test_run_all_batches((cfish_TestFormatter*)formatter);
+ success &= testlucy_Test_run_all_batches((cfish_TestFormatter*)formatter);
CFISH_DECREF(formatter);
return success ? EXIT_SUCCESS : EXIT_FAILURE;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 81daf3f..89af398 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -6835,6 +6835,7 @@ S_add_compiler_flags(struct chaz_CLIArgs *args) {
chaz_CFlags_add_define(extra_cflags, "CFP_CFISH", NULL);
chaz_CFlags_add_define(extra_cflags, "CFP_TESTCFISH", NULL);
chaz_CFlags_add_define(extra_cflags, "CFP_LUCY", NULL);
+ chaz_CFlags_add_define(extra_cflags, "CFP_TESTLUCY", NULL);
}
static int
@@ -6997,6 +6998,10 @@ S_write_makefile(struct chaz_CLIArgs *args) {
"lucy_parcel", obj_ext, NULL);
chaz_MakeVar_append(var, scratch);
free(scratch);
+ scratch = chaz_Util_join("", "autogen", dir_sep, "source", dir_sep,
+ "testlucy_parcel", obj_ext, NULL);
+ chaz_MakeVar_append(var, scratch);
+ free(scratch);
/* Clownfish header files */
@@ -7044,6 +7049,10 @@ S_write_makefile(struct chaz_CLIArgs *args) {
NULL);
rule = chaz_MakeFile_add_rule(makefile, scratch, "autogen");
free(scratch);
+ scratch = chaz_Util_join(dir_sep, "autogen", "source", "testlucy_parcel.c",
+ NULL);
+ rule = chaz_MakeFile_add_rule(makefile, scratch, "autogen");
+ free(scratch);
rule = chaz_MakeFile_add_rule(makefile, "$(LUCY_OBJS)", "autogen");
/*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/common/charmonizer.main b/common/charmonizer.main
index 539d0fb..815191f 100644
--- a/common/charmonizer.main
+++ b/common/charmonizer.main
@@ -93,6 +93,7 @@ S_add_compiler_flags(struct chaz_CLIArgs *args) {
chaz_CFlags_add_define(extra_cflags, "CFP_CFISH", NULL);
chaz_CFlags_add_define(extra_cflags, "CFP_TESTCFISH", NULL);
chaz_CFlags_add_define(extra_cflags, "CFP_LUCY", NULL);
+ chaz_CFlags_add_define(extra_cflags, "CFP_TESTLUCY", NULL);
}
static int
@@ -255,6 +256,10 @@ S_write_makefile(struct chaz_CLIArgs *args) {
"lucy_parcel", obj_ext, NULL);
chaz_MakeVar_append(var, scratch);
free(scratch);
+ scratch = chaz_Util_join("", "autogen", dir_sep, "source", dir_sep,
+ "testlucy_parcel", obj_ext, NULL);
+ chaz_MakeVar_append(var, scratch);
+ free(scratch);
/* Clownfish header files */
@@ -302,6 +307,10 @@ S_write_makefile(struct chaz_CLIArgs *args) {
NULL);
rule = chaz_MakeFile_add_rule(makefile, scratch, "autogen");
free(scratch);
+ scratch = chaz_Util_join(dir_sep, "autogen", "source", "testlucy_parcel.c",
+ NULL);
+ rule = chaz_MakeFile_add_rule(makefile, scratch, "autogen");
+ free(scratch);
rule = chaz_MakeFile_add_rule(makefile, "$(LUCY_OBJS)", "autogen");
/*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test.c b/core/Lucy/Test.c
index 19fef0e..ded5834 100644
--- a/core/Lucy/Test.c
+++ b/core/Lucy/Test.c
@@ -16,6 +16,7 @@
#include <stdio.h>
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Test.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test.cfh b/core/Lucy/Test.cfh
index 661b6a0..4c215bb 100644
--- a/core/Lucy/Test.cfh
+++ b/core/Lucy/Test.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Testing framework.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestAnalyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestAnalyzer.c b/core/Lucy/Test/Analysis/TestAnalyzer.c
index 4b72f53..1443f8c 100644
--- a/core/Lucy/Test/Analysis/TestAnalyzer.c
+++ b/core/Lucy/Test/Analysis/TestAnalyzer.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestAnalyzer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestAnalyzer.cfh b/core/Lucy/Test/Analysis/TestAnalyzer.cfh
index ef9d042..78c0391 100644
--- a/core/Lucy/Test/Analysis/TestAnalyzer.cfh
+++ b/core/Lucy/Test/Analysis/TestAnalyzer.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Analysis::TestAnalyzer
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestCaseFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestCaseFolder.c b/core/Lucy/Test/Analysis/TestCaseFolder.c
index b428d38..8ee0f51 100644
--- a/core/Lucy/Test/Analysis/TestCaseFolder.c
+++ b/core/Lucy/Test/Analysis/TestCaseFolder.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTCASEFOLDER
+#define C_TESTLUCY_TESTCASEFOLDER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestCaseFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestCaseFolder.cfh b/core/Lucy/Test/Analysis/TestCaseFolder.cfh
index fa6d06e..087a5e1 100644
--- a/core/Lucy/Test/Analysis/TestCaseFolder.cfh
+++ b/core/Lucy/Test/Analysis/TestCaseFolder.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Analysis::TestCaseFolder
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestNormalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestNormalizer.c b/core/Lucy/Test/Analysis/TestNormalizer.c
index ca3e70d..94904d2 100644
--- a/core/Lucy/Test/Analysis/TestNormalizer.c
+++ b/core/Lucy/Test/Analysis/TestNormalizer.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_TESTNORMALIZER
+#define C_TESTLUCY_TESTNORMALIZER
#define C_LUCY_NORMALIZER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestNormalizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestNormalizer.cfh b/core/Lucy/Test/Analysis/TestNormalizer.cfh
index 40e2917..cff80bc 100644
--- a/core/Lucy/Test/Analysis/TestNormalizer.cfh
+++ b/core/Lucy/Test/Analysis/TestNormalizer.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Analysis::TestNormalizer
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestPolyAnalyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestPolyAnalyzer.c b/core/Lucy/Test/Analysis/TestPolyAnalyzer.c
index 7c6178c..a1f3f8f 100644
--- a/core/Lucy/Test/Analysis/TestPolyAnalyzer.c
+++ b/core/Lucy/Test/Analysis/TestPolyAnalyzer.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTPOLYANALYZER
+#define C_TESTLUCY_TESTPOLYANALYZER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestPolyAnalyzer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestPolyAnalyzer.cfh b/core/Lucy/Test/Analysis/TestPolyAnalyzer.cfh
index e6f94f9..2e5319b 100644
--- a/core/Lucy/Test/Analysis/TestPolyAnalyzer.cfh
+++ b/core/Lucy/Test/Analysis/TestPolyAnalyzer.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Analysis::TestPolyAnalyzer
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestRegexTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestRegexTokenizer.c b/core/Lucy/Test/Analysis/TestRegexTokenizer.c
index 4a97bf7..92b9b5b 100644
--- a/core/Lucy/Test/Analysis/TestRegexTokenizer.c
+++ b/core/Lucy/Test/Analysis/TestRegexTokenizer.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTREGEXTOKENIZER
+#define C_TESTLUCY_TESTREGEXTOKENIZER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestRegexTokenizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestRegexTokenizer.cfh b/core/Lucy/Test/Analysis/TestRegexTokenizer.cfh
index bbaab59..8a23975 100644
--- a/core/Lucy/Test/Analysis/TestRegexTokenizer.cfh
+++ b/core/Lucy/Test/Analysis/TestRegexTokenizer.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Analysis::TestRegexTokenizer
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestSnowballStemmer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestSnowballStemmer.c b/core/Lucy/Test/Analysis/TestSnowballStemmer.c
index 043e5ee..f045fe0 100644
--- a/core/Lucy/Test/Analysis/TestSnowballStemmer.c
+++ b/core/Lucy/Test/Analysis/TestSnowballStemmer.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTSNOWBALLSTEMMER
+#define C_TESTLUCY_TESTSNOWBALLSTEMMER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh b/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh
index 208d85b..f91aea4 100644
--- a/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh
+++ b/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Analysis::TestSnowballStemmer cnick TestSnowStemmer
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestSnowballStopFilter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestSnowballStopFilter.c b/core/Lucy/Test/Analysis/TestSnowballStopFilter.c
index 3d11015..0e5663e 100644
--- a/core/Lucy/Test/Analysis/TestSnowballStopFilter.c
+++ b/core/Lucy/Test/Analysis/TestSnowballStopFilter.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTSNOWBALLSTOPFILTER
+#define C_TESTLUCY_TESTSNOWBALLSTOPFILTER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh b/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh
index 6cb74e6..c80864b 100644
--- a/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh
+++ b/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Analysis::TestSnowballStopFilter cnick TestSnowStop
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestStandardTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestStandardTokenizer.c b/core/Lucy/Test/Analysis/TestStandardTokenizer.c
index 9e550a0..9f1775c 100644
--- a/core/Lucy/Test/Analysis/TestStandardTokenizer.c
+++ b/core/Lucy/Test/Analysis/TestStandardTokenizer.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTSTANDARDTOKENIZER
+#define C_TESTLUCY_TESTSTANDARDTOKENIZER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Analysis/TestStandardTokenizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestStandardTokenizer.cfh b/core/Lucy/Test/Analysis/TestStandardTokenizer.cfh
index 0d45263..12f93b6 100644
--- a/core/Lucy/Test/Analysis/TestStandardTokenizer.cfh
+++ b/core/Lucy/Test/Analysis/TestStandardTokenizer.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Analysis::TestStandardTokenizer
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Highlight/TestHeatMap.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Highlight/TestHeatMap.c b/core/Lucy/Test/Highlight/TestHeatMap.c
index 9e2bd37..08877e8 100644
--- a/core/Lucy/Test/Highlight/TestHeatMap.c
+++ b/core/Lucy/Test/Highlight/TestHeatMap.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Highlight/TestHeatMap.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Highlight/TestHeatMap.cfh b/core/Lucy/Test/Highlight/TestHeatMap.cfh
index 4d1997b..8df87c9 100644
--- a/core/Lucy/Test/Highlight/TestHeatMap.cfh
+++ b/core/Lucy/Test/Highlight/TestHeatMap.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Highlight::TestHeatMap
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Highlight/TestHighlighter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Highlight/TestHighlighter.c b/core/Lucy/Test/Highlight/TestHighlighter.c
index 769f22e..4194539 100644
--- a/core/Lucy/Test/Highlight/TestHighlighter.c
+++ b/core/Lucy/Test/Highlight/TestHighlighter.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTHIGHLIGHTER
+#define C_TESTLUCY_TESTHIGHLIGHTER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Highlight/TestHighlighter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Highlight/TestHighlighter.cfh b/core/Lucy/Test/Highlight/TestHighlighter.cfh
index 3ded317..6419bb9 100644
--- a/core/Lucy/Test/Highlight/TestHighlighter.cfh
+++ b/core/Lucy/Test/Highlight/TestHighlighter.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Highlight::TestHighlighter
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestDocWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestDocWriter.c b/core/Lucy/Test/Index/TestDocWriter.c
index 6af446e..b49a30f 100644
--- a/core/Lucy/Test/Index/TestDocWriter.c
+++ b/core/Lucy/Test/Index/TestDocWriter.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTDOCWRITER
+#define C_TESTLUCY_TESTDOCWRITER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestDocWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestDocWriter.cfh b/core/Lucy/Test/Index/TestDocWriter.cfh
index b43adf1..40403af 100644
--- a/core/Lucy/Test/Index/TestDocWriter.cfh
+++ b/core/Lucy/Test/Index/TestDocWriter.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestDocWriter
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestHighlightWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestHighlightWriter.c b/core/Lucy/Test/Index/TestHighlightWriter.c
index 821c6b1..e4152f6 100644
--- a/core/Lucy/Test/Index/TestHighlightWriter.c
+++ b/core/Lucy/Test/Index/TestHighlightWriter.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTHIGHLIGHTWRITER
+#define C_TESTLUCY_TESTHIGHLIGHTWRITER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestHighlightWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestHighlightWriter.cfh b/core/Lucy/Test/Index/TestHighlightWriter.cfh
index 7291f1b..7173c63 100644
--- a/core/Lucy/Test/Index/TestHighlightWriter.cfh
+++ b/core/Lucy/Test/Index/TestHighlightWriter.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestHighlightWriter cnick TestHLWriter
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestIndexManager.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestIndexManager.c b/core/Lucy/Test/Index/TestIndexManager.c
index 0aec551..aeda532 100644
--- a/core/Lucy/Test/Index/TestIndexManager.c
+++ b/core/Lucy/Test/Index/TestIndexManager.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestIndexManager.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestIndexManager.cfh b/core/Lucy/Test/Index/TestIndexManager.cfh
index 71e05bc..911afaa 100644
--- a/core/Lucy/Test/Index/TestIndexManager.cfh
+++ b/core/Lucy/Test/Index/TestIndexManager.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestIndexManager cnick TestIxManager
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestPolyReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestPolyReader.c b/core/Lucy/Test/Index/TestPolyReader.c
index 5ec243b..58bd248 100644
--- a/core/Lucy/Test/Index/TestPolyReader.c
+++ b/core/Lucy/Test/Index/TestPolyReader.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTPOLYREADER
+#define C_TESTLUCY_TESTPOLYREADER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestPolyReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestPolyReader.cfh b/core/Lucy/Test/Index/TestPolyReader.cfh
index 74b9456..1040439 100644
--- a/core/Lucy/Test/Index/TestPolyReader.cfh
+++ b/core/Lucy/Test/Index/TestPolyReader.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestPolyReader
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestPostingListWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestPostingListWriter.c b/core/Lucy/Test/Index/TestPostingListWriter.c
index 09cbf20..27db6a8 100644
--- a/core/Lucy/Test/Index/TestPostingListWriter.c
+++ b/core/Lucy/Test/Index/TestPostingListWriter.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTPOSTINGLISTWRITER
+#define C_TESTLUCY_TESTPOSTINGLISTWRITER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestPostingListWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestPostingListWriter.cfh b/core/Lucy/Test/Index/TestPostingListWriter.cfh
index 8c5f5dd..353bdbe 100644
--- a/core/Lucy/Test/Index/TestPostingListWriter.cfh
+++ b/core/Lucy/Test/Index/TestPostingListWriter.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestPostingListWriter cnick TestPListWriter
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestSegWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestSegWriter.c b/core/Lucy/Test/Index/TestSegWriter.c
index 86801bf..e949c9d 100644
--- a/core/Lucy/Test/Index/TestSegWriter.c
+++ b/core/Lucy/Test/Index/TestSegWriter.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTSEGWRITER
+#define C_TESTLUCY_TESTSEGWRITER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestSegWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestSegWriter.cfh b/core/Lucy/Test/Index/TestSegWriter.cfh
index a55c877..471df86 100644
--- a/core/Lucy/Test/Index/TestSegWriter.cfh
+++ b/core/Lucy/Test/Index/TestSegWriter.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestSegWriter
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestSegment.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestSegment.c b/core/Lucy/Test/Index/TestSegment.c
index a802576..aa46dac 100644
--- a/core/Lucy/Test/Index/TestSegment.c
+++ b/core/Lucy/Test/Index/TestSegment.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTSEG
+#define C_TESTLUCY_TESTSEG
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestSegment.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestSegment.cfh b/core/Lucy/Test/Index/TestSegment.cfh
index 237d843..76feab5 100644
--- a/core/Lucy/Test/Index/TestSegment.cfh
+++ b/core/Lucy/Test/Index/TestSegment.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestSegment cnick TestSeg
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestSnapshot.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestSnapshot.c b/core/Lucy/Test/Index/TestSnapshot.c
index a0bbfa7..3e905cb 100644
--- a/core/Lucy/Test/Index/TestSnapshot.c
+++ b/core/Lucy/Test/Index/TestSnapshot.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestSnapshot.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestSnapshot.cfh b/core/Lucy/Test/Index/TestSnapshot.cfh
index 4be6876..4ecdf9d 100644
--- a/core/Lucy/Test/Index/TestSnapshot.cfh
+++ b/core/Lucy/Test/Index/TestSnapshot.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestSnapshot
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestTermInfo.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestTermInfo.c b/core/Lucy/Test/Index/TestTermInfo.c
index 9de3a08..3474e56 100644
--- a/core/Lucy/Test/Index/TestTermInfo.c
+++ b/core/Lucy/Test/Index/TestTermInfo.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTTERMINFO
+#define C_TESTLUCY_TESTTERMINFO
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Index/TestTermInfo.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestTermInfo.cfh b/core/Lucy/Test/Index/TestTermInfo.cfh
index c98bc30..6f7cb43 100644
--- a/core/Lucy/Test/Index/TestTermInfo.cfh
+++ b/core/Lucy/Test/Index/TestTermInfo.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Index::TestTermInfo
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Object/TestBitVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Object/TestBitVector.c b/core/Lucy/Test/Object/TestBitVector.c
index 6913d6b..cce4df9 100644
--- a/core/Lucy/Test/Object/TestBitVector.c
+++ b/core/Lucy/Test/Object/TestBitVector.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTBITVECTOR
+#define C_TESTLUCY_TESTBITVECTOR
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Object/TestBitVector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Object/TestBitVector.cfh b/core/Lucy/Test/Object/TestBitVector.cfh
index 99a1338..75a1006 100644
--- a/core/Lucy/Test/Object/TestBitVector.cfh
+++ b/core/Lucy/Test/Object/TestBitVector.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Object::TestBitVector
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Object/TestI32Array.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Object/TestI32Array.c b/core/Lucy/Test/Object/TestI32Array.c
index 7c2550f..058d9ec 100644
--- a/core/Lucy/Test/Object/TestI32Array.c
+++ b/core/Lucy/Test/Object/TestI32Array.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTI32ARRAY
+#define C_TESTLUCY_TESTI32ARRAY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Object/TestI32Array.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Object/TestI32Array.cfh b/core/Lucy/Test/Object/TestI32Array.cfh
index 1f03ccb..7f5c19f 100644
--- a/core/Lucy/Test/Object/TestI32Array.cfh
+++ b/core/Lucy/Test/Object/TestI32Array.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Object::TestI32Array cnick TestI32Arr
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestArchitecture.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestArchitecture.c b/core/Lucy/Test/Plan/TestArchitecture.c
index cdc64e0..9cd2636 100644
--- a/core/Lucy/Test/Plan/TestArchitecture.c
+++ b/core/Lucy/Test/Plan/TestArchitecture.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTARCHITECTURE
+#define C_TESTLUCY_TESTARCHITECTURE
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Test.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestArchitecture.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestArchitecture.cfh b/core/Lucy/Test/Plan/TestArchitecture.cfh
index c80c00c..9d227e1 100644
--- a/core/Lucy/Test/Plan/TestArchitecture.cfh
+++ b/core/Lucy/Test/Plan/TestArchitecture.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/**
* Returns absurdly low values for Index_Interval() and Skip_Interval().
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestBlobType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestBlobType.c b/core/Lucy/Test/Plan/TestBlobType.c
index eec3127..2012088 100644
--- a/core/Lucy/Test/Plan/TestBlobType.c
+++ b/core/Lucy/Test/Plan/TestBlobType.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTBLOBTYPE
+#define C_TESTLUCY_TESTBLOBTYPE
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestBlobType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestBlobType.cfh b/core/Lucy/Test/Plan/TestBlobType.cfh
index 42f76cd..8ec6fc1 100644
--- a/core/Lucy/Test/Plan/TestBlobType.cfh
+++ b/core/Lucy/Test/Plan/TestBlobType.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Plan::TestBlobType
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestFieldMisc.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestFieldMisc.c b/core/Lucy/Test/Plan/TestFieldMisc.c
index 6cb5f23..bd39cc4 100644
--- a/core/Lucy/Test/Plan/TestFieldMisc.c
+++ b/core/Lucy/Test/Plan/TestFieldMisc.c
@@ -15,6 +15,7 @@
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
#include "Lucy/Test.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestFieldMisc.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestFieldMisc.cfh b/core/Lucy/Test/Plan/TestFieldMisc.cfh
index 8d57777..98734b8 100644
--- a/core/Lucy/Test/Plan/TestFieldMisc.cfh
+++ b/core/Lucy/Test/Plan/TestFieldMisc.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Plan::TestFieldMisc
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestFieldType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestFieldType.c b/core/Lucy/Test/Plan/TestFieldType.c
index d160f45..e2ce6b2 100644
--- a/core/Lucy/Test/Plan/TestFieldType.c
+++ b/core/Lucy/Test/Plan/TestFieldType.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_TESTFIELDTYPE
+#define C_TESTLUCY_TESTFIELDTYPE
#define C_LUCY_DUMMYFIELDTYPE
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestFieldType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestFieldType.cfh b/core/Lucy/Test/Plan/TestFieldType.cfh
index 0a0ec65..f91ec94 100644
--- a/core/Lucy/Test/Plan/TestFieldType.cfh
+++ b/core/Lucy/Test/Plan/TestFieldType.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Plan::TestFieldType cnick TestFType
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestFullTextType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestFullTextType.c b/core/Lucy/Test/Plan/TestFullTextType.c
index 9ee470e..cf8ef8f 100644
--- a/core/Lucy/Test/Plan/TestFullTextType.c
+++ b/core/Lucy/Test/Plan/TestFullTextType.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTFULLTEXTTYPE
+#define C_TESTLUCY_TESTFULLTEXTTYPE
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestFullTextType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestFullTextType.cfh b/core/Lucy/Test/Plan/TestFullTextType.cfh
index 031be31..91b9f30 100644
--- a/core/Lucy/Test/Plan/TestFullTextType.cfh
+++ b/core/Lucy/Test/Plan/TestFullTextType.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Plan::TestFullTextType
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestNumericType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestNumericType.c b/core/Lucy/Test/Plan/TestNumericType.c
index c1f554d..cdc42b5 100644
--- a/core/Lucy/Test/Plan/TestNumericType.c
+++ b/core/Lucy/Test/Plan/TestNumericType.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTNUMERICTYPE
+#define C_TESTLUCY_TESTNUMERICTYPE
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Plan/TestNumericType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestNumericType.cfh b/core/Lucy/Test/Plan/TestNumericType.cfh
index f411aff..72f7823 100644
--- a/core/Lucy/Test/Plan/TestNumericType.cfh
+++ b/core/Lucy/Test/Plan/TestNumericType.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Plan::TestNumericType
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestLeafQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestLeafQuery.c b/core/Lucy/Test/Search/TestLeafQuery.c
index 8381fd6..7dd37f8 100644
--- a/core/Lucy/Test/Search/TestLeafQuery.c
+++ b/core/Lucy/Test/Search/TestLeafQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTLEAFQUERY
+#define C_TESTLUCY_TESTLEAFQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestLeafQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestLeafQuery.cfh b/core/Lucy/Test/Search/TestLeafQuery.cfh
index 4fc8a37..7bb03ab 100644
--- a/core/Lucy/Test/Search/TestLeafQuery.cfh
+++ b/core/Lucy/Test/Search/TestLeafQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestLeafQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestMatchAllQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestMatchAllQuery.c b/core/Lucy/Test/Search/TestMatchAllQuery.c
index ec95b62..57f395b 100644
--- a/core/Lucy/Test/Search/TestMatchAllQuery.c
+++ b/core/Lucy/Test/Search/TestMatchAllQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTMATCHALLQUERY
+#define C_TESTLUCY_TESTMATCHALLQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestMatchAllQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestMatchAllQuery.cfh b/core/Lucy/Test/Search/TestMatchAllQuery.cfh
index 8f66e34..1f09bc1 100644
--- a/core/Lucy/Test/Search/TestMatchAllQuery.cfh
+++ b/core/Lucy/Test/Search/TestMatchAllQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestMatchAllQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestNOTQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNOTQuery.c b/core/Lucy/Test/Search/TestNOTQuery.c
index 58c7f4a..374fd3d 100644
--- a/core/Lucy/Test/Search/TestNOTQuery.c
+++ b/core/Lucy/Test/Search/TestNOTQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTNOTQUERY
+#define C_TESTLUCY_TESTNOTQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestNOTQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNOTQuery.cfh b/core/Lucy/Test/Search/TestNOTQuery.cfh
index 38a138a..becf64e 100644
--- a/core/Lucy/Test/Search/TestNOTQuery.cfh
+++ b/core/Lucy/Test/Search/TestNOTQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestNOTQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestNoMatchQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNoMatchQuery.c b/core/Lucy/Test/Search/TestNoMatchQuery.c
index 94fb3d3..a1a9e20 100644
--- a/core/Lucy/Test/Search/TestNoMatchQuery.c
+++ b/core/Lucy/Test/Search/TestNoMatchQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTNOMATCHQUERY
+#define C_TESTLUCY_TESTNOMATCHQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestNoMatchQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNoMatchQuery.cfh b/core/Lucy/Test/Search/TestNoMatchQuery.cfh
index 3e679ad..a283efa 100644
--- a/core/Lucy/Test/Search/TestNoMatchQuery.cfh
+++ b/core/Lucy/Test/Search/TestNoMatchQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestNoMatchQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestPhraseQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestPhraseQuery.c b/core/Lucy/Test/Search/TestPhraseQuery.c
index 6759b49..3f07f9d 100644
--- a/core/Lucy/Test/Search/TestPhraseQuery.c
+++ b/core/Lucy/Test/Search/TestPhraseQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTPHRASEQUERY
+#define C_TESTLUCY_TESTPHRASEQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestPhraseQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestPhraseQuery.cfh b/core/Lucy/Test/Search/TestPhraseQuery.cfh
index e183818..c39290a 100644
--- a/core/Lucy/Test/Search/TestPhraseQuery.cfh
+++ b/core/Lucy/Test/Search/TestPhraseQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestPhraseQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestPolyQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestPolyQuery.c b/core/Lucy/Test/Search/TestPolyQuery.c
index 93b560c..531bb3c 100644
--- a/core/Lucy/Test/Search/TestPolyQuery.c
+++ b/core/Lucy/Test/Search/TestPolyQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTPOLYQUERY
+#define C_TESTLUCY_TESTPOLYQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestPolyQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestPolyQuery.cfh b/core/Lucy/Test/Search/TestPolyQuery.cfh
index fbc1f24..768e8c4 100644
--- a/core/Lucy/Test/Search/TestPolyQuery.cfh
+++ b/core/Lucy/Test/Search/TestPolyQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestANDQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestQueryParser.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParser.c b/core/Lucy/Test/Search/TestQueryParser.c
index 3a25afe..665b275 100644
--- a/core/Lucy/Test/Search/TestQueryParser.c
+++ b/core/Lucy/Test/Search/TestQueryParser.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTQUERYPARSER
+#define C_TESTLUCY_TESTQUERYPARSER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <string.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestQueryParser.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParser.cfh b/core/Lucy/Test/Search/TestQueryParser.cfh
index cbf711a..62b9c74 100644
--- a/core/Lucy/Test/Search/TestQueryParser.cfh
+++ b/core/Lucy/Test/Search/TestQueryParser.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Test case object for QueryParser unit tests.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestQueryParserLogic.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserLogic.c b/core/Lucy/Test/Search/TestQueryParserLogic.c
index 02b398e..0d88816 100644
--- a/core/Lucy/Test/Search/TestQueryParserLogic.c
+++ b/core/Lucy/Test/Search/TestQueryParserLogic.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_TESTQUERYPARSERLOGIC
-#define C_LUCY_TESTQUERYPARSER
+#define C_TESTLUCY_TESTQUERYPARSERLOGIC
+#define C_TESTLUCY_TESTQUERYPARSER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <string.h>
@@ -42,9 +43,9 @@
#include "Lucy/Search/RequiredOptionalQuery.h"
#include "Lucy/Store/RAMFolder.h"
-#define make_leaf_query (Query*)lucy_TestUtils_make_leaf_query
-#define make_not_query (Query*)lucy_TestUtils_make_not_query
-#define make_poly_query (Query*)lucy_TestUtils_make_poly_query
+#define make_leaf_query (Query*)TestUtils_make_leaf_query
+#define make_not_query (Query*)TestUtils_make_not_query
+#define make_poly_query (Query*)TestUtils_make_poly_query
TestQueryParserLogic*
TestQPLogic_new(TestFormatter *formatter) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestQueryParserLogic.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserLogic.cfh b/core/Lucy/Test/Search/TestQueryParserLogic.cfh
index 94f1486..5f28b54 100644
--- a/core/Lucy/Test/Search/TestQueryParserLogic.cfh
+++ b/core/Lucy/Test/Search/TestQueryParserLogic.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Tests for logical structure of Query objects output by QueryParser.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestQueryParserSyntax.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserSyntax.c b/core/Lucy/Test/Search/TestQueryParserSyntax.c
index dd209e3..ededff1 100644
--- a/core/Lucy/Test/Search/TestQueryParserSyntax.c
+++ b/core/Lucy/Test/Search/TestQueryParserSyntax.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_TESTQUERYPARSERSYNTAX
-#define C_LUCY_TESTQUERYPARSER
+#define C_TESTLUCY_TESTQUERYPARSERSYNTAX
+#define C_TESTLUCY_TESTQUERYPARSER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <string.h>
@@ -43,11 +44,11 @@
#include "Lucy/Store/Folder.h"
#include "Lucy/Store/RAMFolder.h"
-#define make_term_query (Query*)lucy_TestUtils_make_term_query
-#define make_phrase_query (Query*)lucy_TestUtils_make_phrase_query
-#define make_leaf_query (Query*)lucy_TestUtils_make_leaf_query
-#define make_not_query (Query*)lucy_TestUtils_make_not_query
-#define make_poly_query (Query*)lucy_TestUtils_make_poly_query
+#define make_term_query (Query*)TestUtils_make_term_query
+#define make_phrase_query (Query*)TestUtils_make_phrase_query
+#define make_leaf_query (Query*)TestUtils_make_leaf_query
+#define make_not_query (Query*)TestUtils_make_not_query
+#define make_poly_query (Query*)TestUtils_make_poly_query
TestQueryParserSyntax*
TestQPSyntax_new(TestFormatter *formatter) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserSyntax.cfh b/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
index 6b12d9d..794dbe7 100644
--- a/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
+++ b/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Tests for logical structure of Query objects output by QueryParser.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestRangeQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestRangeQuery.c b/core/Lucy/Test/Search/TestRangeQuery.c
index 8fc75ed..7d76eee 100644
--- a/core/Lucy/Test/Search/TestRangeQuery.c
+++ b/core/Lucy/Test/Search/TestRangeQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTRANGEQUERY
+#define C_TESTLUCY_TESTRANGEQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestRangeQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestRangeQuery.cfh b/core/Lucy/Test/Search/TestRangeQuery.cfh
index d885f29..41e98d3 100644
--- a/core/Lucy/Test/Search/TestRangeQuery.cfh
+++ b/core/Lucy/Test/Search/TestRangeQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestRangeQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestReqOptQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestReqOptQuery.c b/core/Lucy/Test/Search/TestReqOptQuery.c
index 097cee3..f32bc5d 100644
--- a/core/Lucy/Test/Search/TestReqOptQuery.c
+++ b/core/Lucy/Test/Search/TestReqOptQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTREQOPTQUERY
+#define C_TESTLUCY_TESTREQOPTQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestReqOptQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestReqOptQuery.cfh b/core/Lucy/Test/Search/TestReqOptQuery.cfh
index 7011ebe..b783734 100644
--- a/core/Lucy/Test/Search/TestReqOptQuery.cfh
+++ b/core/Lucy/Test/Search/TestReqOptQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestReqOptQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestSeriesMatcher.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSeriesMatcher.c b/core/Lucy/Test/Search/TestSeriesMatcher.c
index 1c0c297..e3e68db 100644
--- a/core/Lucy/Test/Search/TestSeriesMatcher.c
+++ b/core/Lucy/Test/Search/TestSeriesMatcher.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTSERIESMATCHER
+#define C_TESTLUCY_TESTSERIESMATCHER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestSeriesMatcher.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSeriesMatcher.cfh b/core/Lucy/Test/Search/TestSeriesMatcher.cfh
index 00c6c11..5952ce6 100644
--- a/core/Lucy/Test/Search/TestSeriesMatcher.cfh
+++ b/core/Lucy/Test/Search/TestSeriesMatcher.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestSeriesMatcher
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestSortSpec.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSortSpec.c b/core/Lucy/Test/Search/TestSortSpec.c
index 5836293..a8b1e3e 100644
--- a/core/Lucy/Test/Search/TestSortSpec.c
+++ b/core/Lucy/Test/Search/TestSortSpec.c
@@ -15,7 +15,8 @@
*/
-#define C_LUCY_TESTREVERSETYPE
+#define C_TESTLUCY_TESTREVERSETYPE
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestSortSpec.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSortSpec.cfh b/core/Lucy/Test/Search/TestSortSpec.cfh
index 7d96228..633b452 100644
--- a/core/Lucy/Test/Search/TestSortSpec.cfh
+++ b/core/Lucy/Test/Search/TestSortSpec.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestSortSpec
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestSpan.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSpan.c b/core/Lucy/Test/Search/TestSpan.c
index 2dd41a6..d359dbe 100644
--- a/core/Lucy/Test/Search/TestSpan.c
+++ b/core/Lucy/Test/Search/TestSpan.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTTERMINFO
+#define C_TESTLUCY_TESTTERMINFO
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestSpan.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSpan.cfh b/core/Lucy/Test/Search/TestSpan.cfh
index 83a91ef..1c9a119 100644
--- a/core/Lucy/Test/Search/TestSpan.cfh
+++ b/core/Lucy/Test/Search/TestSpan.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestSpan
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestTermQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestTermQuery.c b/core/Lucy/Test/Search/TestTermQuery.c
index 65291b2..809c440 100644
--- a/core/Lucy/Test/Search/TestTermQuery.c
+++ b/core/Lucy/Test/Search/TestTermQuery.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTTERMQUERY
+#define C_TESTLUCY_TESTTERMQUERY
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <math.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Search/TestTermQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestTermQuery.cfh b/core/Lucy/Test/Search/TestTermQuery.cfh
index b8ecf6a..96e5d09 100644
--- a/core/Lucy/Test/Search/TestTermQuery.cfh
+++ b/core/Lucy/Test/Search/TestTermQuery.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Search::TestTermQuery
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/MockFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/MockFileHandle.c b/core/Lucy/Test/Store/MockFileHandle.c
index 09df022..3e3ba04 100644
--- a/core/Lucy/Test/Store/MockFileHandle.c
+++ b/core/Lucy/Test/Store/MockFileHandle.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_MOCKFILEHANDLE
+#define C_TESTLUCY_MOCKFILEHANDLE
#define C_LUCY_FILEWINDOW
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Test/Store/MockFileHandle.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/MockFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/MockFileHandle.cfh b/core/Lucy/Test/Store/MockFileHandle.cfh
index b142c00..a88468f 100644
--- a/core/Lucy/Test/Store/MockFileHandle.cfh
+++ b/core/Lucy/Test/Store/MockFileHandle.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Mock-object FileHandle for testing InStream/OutStream.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestCompoundFileReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileReader.c b/core/Lucy/Test/Store/TestCompoundFileReader.c
index 101b5a0..f3748be 100644
--- a/core/Lucy/Test/Store/TestCompoundFileReader.c
+++ b/core/Lucy/Test/Store/TestCompoundFileReader.c
@@ -15,6 +15,7 @@
*/
#define C_LUCY_RAMFOLDER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestCompoundFileReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileReader.cfh b/core/Lucy/Test/Store/TestCompoundFileReader.cfh
index fb2e300..f12c05b 100644
--- a/core/Lucy/Test/Store/TestCompoundFileReader.cfh
+++ b/core/Lucy/Test/Store/TestCompoundFileReader.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestCompoundFileReader cnick TestCFReader
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestCompoundFileWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileWriter.c b/core/Lucy/Test/Store/TestCompoundFileWriter.c
index e2b9281..76dc72c 100644
--- a/core/Lucy/Test/Store/TestCompoundFileWriter.c
+++ b/core/Lucy/Test/Store/TestCompoundFileWriter.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileWriter.cfh b/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
index 073aee8..f1ca473 100644
--- a/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
+++ b/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestCompoundFileWriter cnick TestCFWriter
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFSDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSDirHandle.c b/core/Lucy/Test/Store/TestFSDirHandle.c
index 4c9ea2d..da9f9ff 100644
--- a/core/Lucy/Test/Store/TestFSDirHandle.c
+++ b/core/Lucy/Test/Store/TestFSDirHandle.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
// rmdir
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFSDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSDirHandle.cfh b/core/Lucy/Test/Store/TestFSDirHandle.cfh
index e12601b..d76dabb 100644
--- a/core/Lucy/Test/Store/TestFSDirHandle.cfh
+++ b/core/Lucy/Test/Store/TestFSDirHandle.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestFSDirHandle cnick TestFSDH
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFSFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFileHandle.c b/core/Lucy/Test/Store/TestFSFileHandle.c
index b9aec6c..34048a3 100644
--- a/core/Lucy/Test/Store/TestFSFileHandle.c
+++ b/core/Lucy/Test/Store/TestFSFileHandle.c
@@ -18,6 +18,7 @@
#define C_LUCY_FSFILEHANDLE
#define C_LUCY_FILEWINDOW
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#ifdef CHY_HAS_UNISTD_H
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFSFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFileHandle.cfh b/core/Lucy/Test/Store/TestFSFileHandle.cfh
index 6a7e7f4..6fd288c 100644
--- a/core/Lucy/Test/Store/TestFSFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestFSFileHandle.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestFSFileHandle cnick TestFSFH
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFSFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFolder.c b/core/Lucy/Test/Store/TestFSFolder.c
index 74165ff..d85deef 100644
--- a/core/Lucy/Test/Store/TestFSFolder.c
+++ b/core/Lucy/Test/Store/TestFSFolder.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
// mkdir, rmdir
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFSFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFolder.cfh b/core/Lucy/Test/Store/TestFSFolder.cfh
index 0793c88..896e813 100644
--- a/core/Lucy/Test/Store/TestFSFolder.cfh
+++ b/core/Lucy/Test/Store/TestFSFolder.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestFSFolder
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFileHandle.c b/core/Lucy/Test/Store/TestFileHandle.c
index 1c54276..645b516 100644
--- a/core/Lucy/Test/Store/TestFileHandle.c
+++ b/core/Lucy/Test/Store/TestFileHandle.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_TESTINSTREAM
+#define C_TESTLUCY_TESTINSTREAM
#define C_LUCY_INSTREAM
#define C_LUCY_FILEWINDOW
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFileHandle.cfh b/core/Lucy/Test/Store/TestFileHandle.cfh
index 6f24a6a..8e852ba 100644
--- a/core/Lucy/Test/Store/TestFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestFileHandle.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestFileHandle cnick TestFH
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolder.c b/core/Lucy/Test/Store/TestFolder.c
index 1de7699..75eb6e6 100644
--- a/core/Lucy/Test/Store/TestFolder.c
+++ b/core/Lucy/Test/Store/TestFolder.c
@@ -15,6 +15,7 @@
*/
#define C_LUCY_RAMFOLDER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolder.cfh b/core/Lucy/Test/Store/TestFolder.cfh
index 37af079..09e4c2b 100644
--- a/core/Lucy/Test/Store/TestFolder.cfh
+++ b/core/Lucy/Test/Store/TestFolder.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestFolder
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFolderCommon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolderCommon.c b/core/Lucy/Test/Store/TestFolderCommon.c
index b10a6ff..ddbb421 100644
--- a/core/Lucy/Test/Store/TestFolderCommon.c
+++ b/core/Lucy/Test/Store/TestFolderCommon.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Test.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestFolderCommon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolderCommon.cfh b/core/Lucy/Test/Store/TestFolderCommon.cfh
index 26dbdc8..f072ce9 100644
--- a/core/Lucy/Test/Store/TestFolderCommon.cfh
+++ b/core/Lucy/Test/Store/TestFolderCommon.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
__C__
typedef lucy_Folder*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestIOChunks.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOChunks.c b/core/Lucy/Test/Store/TestIOChunks.c
index ffaf148..3f88a3d 100644
--- a/core/Lucy/Test/Store/TestIOChunks.c
+++ b/core/Lucy/Test/Store/TestIOChunks.c
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-#define C_LUCY_TESTINSTREAM
+#define C_TESTLUCY_TESTINSTREAM
#define C_LUCY_INSTREAM
#define C_LUCY_FILEWINDOW
#include <stdlib.h>
#include <time.h>
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
#include "Lucy/Test.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestIOChunks.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOChunks.cfh b/core/Lucy/Test/Store/TestIOChunks.cfh
index 753ad19..94e5813 100644
--- a/core/Lucy/Test/Store/TestIOChunks.cfh
+++ b/core/Lucy/Test/Store/TestIOChunks.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Tests reading and writing of composite types using InStream/OutStream.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestIOPrimitives.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOPrimitives.c b/core/Lucy/Test/Store/TestIOPrimitives.c
index 542655e..009043b 100644
--- a/core/Lucy/Test/Store/TestIOPrimitives.c
+++ b/core/Lucy/Test/Store/TestIOPrimitives.c
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-#define C_LUCY_TESTINSTREAM
+#define C_TESTLUCY_TESTINSTREAM
#define C_LUCY_INSTREAM
#define C_LUCY_FILEWINDOW
#include <stdlib.h>
#include <time.h>
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
#include "Lucy/Test.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestIOPrimitives.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOPrimitives.cfh b/core/Lucy/Test/Store/TestIOPrimitives.cfh
index dddd202..106f940 100644
--- a/core/Lucy/Test/Store/TestIOPrimitives.cfh
+++ b/core/Lucy/Test/Store/TestIOPrimitives.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Tests reading and writing of primitive types using InStream/OutStream.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestInStream.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestInStream.c b/core/Lucy/Test/Store/TestInStream.c
index e15139f..95b2cb1 100644
--- a/core/Lucy/Test/Store/TestInStream.c
+++ b/core/Lucy/Test/Store/TestInStream.c
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#define C_LUCY_TESTINSTREAM
+#define C_TESTLUCY_TESTINSTREAM
#define C_LUCY_INSTREAM
#define C_LUCY_FILEWINDOW
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
#include "Lucy/Test.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestInStream.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestInStream.cfh b/core/Lucy/Test/Store/TestInStream.cfh
index b20668d..5052685 100644
--- a/core/Lucy/Test/Store/TestInStream.cfh
+++ b/core/Lucy/Test/Store/TestInStream.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Tests for basic functionality of InStream using both memory-mapped and
* streamed sources.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestRAMDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMDirHandle.c b/core/Lucy/Test/Store/TestRAMDirHandle.c
index 69e3e28..fcdcd1a 100644
--- a/core/Lucy/Test/Store/TestRAMDirHandle.c
+++ b/core/Lucy/Test/Store/TestRAMDirHandle.c
@@ -15,6 +15,7 @@
*/
#define C_LUCY_RAMFOLDER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestRAMDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMDirHandle.cfh b/core/Lucy/Test/Store/TestRAMDirHandle.cfh
index 460889c..aabe232 100644
--- a/core/Lucy/Test/Store/TestRAMDirHandle.cfh
+++ b/core/Lucy/Test/Store/TestRAMDirHandle.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestRAMDirHandle cnick TestRAMDH
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestRAMFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFileHandle.c b/core/Lucy/Test/Store/TestRAMFileHandle.c
index 7c7df13..5d75bc3 100644
--- a/core/Lucy/Test/Store/TestRAMFileHandle.c
+++ b/core/Lucy/Test/Store/TestRAMFileHandle.c
@@ -16,9 +16,10 @@
#include <string.h>
-#define C_LUCY_TESTINSTREAM
+#define C_TESTLUCY_TESTINSTREAM
#define C_LUCY_INSTREAM
#define C_LUCY_FILEWINDOW
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestRAMFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFileHandle.cfh b/core/Lucy/Test/Store/TestRAMFileHandle.cfh
index 87fa5bc..8ee2c1d 100644
--- a/core/Lucy/Test/Store/TestRAMFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestRAMFileHandle.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestRAMFileHandle cnick TestRAMFH
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestRAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFolder.c b/core/Lucy/Test/Store/TestRAMFolder.c
index 0261fe3..0446e9d 100644
--- a/core/Lucy/Test/Store/TestRAMFolder.c
+++ b/core/Lucy/Test/Store/TestRAMFolder.c
@@ -15,6 +15,7 @@
*/
#define C_LUCY_RAMFOLDER
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Store/TestRAMFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFolder.cfh b/core/Lucy/Test/Store/TestRAMFolder.cfh
index b1877b6..dfc3864 100644
--- a/core/Lucy/Test/Store/TestRAMFolder.cfh
+++ b/core/Lucy/Test/Store/TestRAMFolder.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Store::TestRAMFolder
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/TestSchema.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestSchema.c b/core/Lucy/Test/TestSchema.c
index 0fe51b3..34029cd 100644
--- a/core/Lucy/Test/TestSchema.c
+++ b/core/Lucy/Test/TestSchema.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTSCHEMA
+#define C_TESTLUCY_TESTSCHEMA
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/TestSchema.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestSchema.cfh b/core/Lucy/Test/TestSchema.cfh
index 9296edc..decb6d5 100644
--- a/core/Lucy/Test/TestSchema.cfh
+++ b/core/Lucy/Test/TestSchema.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** Schema for use by the test suite.
*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/TestUtils.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestUtils.c b/core/Lucy/Test/TestUtils.c
index e724694..d567e15 100644
--- a/core/Lucy/Test/TestUtils.c
+++ b/core/Lucy/Test/TestUtils.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTUTILS
+#define C_TESTLUCY_TESTUTILS
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include <string.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/TestUtils.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestUtils.cfh b/core/Lucy/Test/TestUtils.cfh
index 5fb5d77..23c55c5 100644
--- a/core/Lucy/Test/TestUtils.cfh
+++ b/core/Lucy/Test/TestUtils.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
inert class Lucy::Test::TestUtils {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Util/BBSortEx.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/BBSortEx.c b/core/Lucy/Test/Util/BBSortEx.c
index ad5bad8..cdff551 100644
--- a/core/Lucy/Test/Util/BBSortEx.c
+++ b/core/Lucy/Test/Util/BBSortEx.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_BBSORTEX
+#define C_TESTLUCY_BBSORTEX
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Test/Util/BBSortEx.h"
@@ -54,14 +55,14 @@ BBSortEx_clear_cache(BBSortEx *self) {
}
self->mem_consumed = 0;
BBSortEx_Clear_Cache_t super_clear_cache
- = SUPER_METHOD_PTR(BBSORTEX, Lucy_BBSortEx_Clear_Cache);
+ = SUPER_METHOD_PTR(BBSORTEX, TestLucy_BBSortEx_Clear_Cache);
super_clear_cache(self);
}
void
BBSortEx_feed(BBSortEx *self, void *data) {
BBSortEx_Feed_t super_feed
- = SUPER_METHOD_PTR(BBSORTEX, Lucy_BBSortEx_Feed);
+ = SUPER_METHOD_PTR(BBSORTEX, TestLucy_BBSortEx_Feed);
super_feed(self, data);
// Flush() if necessary.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Util/BBSortEx.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/BBSortEx.cfh b/core/Lucy/Test/Util/BBSortEx.cfh
index f82954f..1978085 100644
--- a/core/Lucy/Test/Util/BBSortEx.cfh
+++ b/core/Lucy/Test/Util/BBSortEx.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
/** SortExternal for ByteBufs.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Util/TestIndexFileNames.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestIndexFileNames.c b/core/Lucy/Test/Util/TestIndexFileNames.c
index d98b92c..95e0f3f 100644
--- a/core/Lucy/Test/Util/TestIndexFileNames.c
+++ b/core/Lucy/Test/Util/TestIndexFileNames.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Util/TestIndexFileNames.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestIndexFileNames.cfh b/core/Lucy/Test/Util/TestIndexFileNames.cfh
index 5702eb4..8e106b7 100644
--- a/core/Lucy/Test/Util/TestIndexFileNames.cfh
+++ b/core/Lucy/Test/Util/TestIndexFileNames.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Util::TestIndexFileNames cnick TestIxFileNames
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Util/TestJson.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestJson.c b/core/Lucy/Test/Util/TestJson.c
index cc3a872..6d379a2 100644
--- a/core/Lucy/Test/Util/TestJson.c
+++ b/core/Lucy/Test/Util/TestJson.c
@@ -15,6 +15,7 @@
*/
#include <string.h>
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Util/TestJson.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestJson.cfh b/core/Lucy/Test/Util/TestJson.cfh
index c7728c1..0bf2e2f 100644
--- a/core/Lucy/Test/Util/TestJson.cfh
+++ b/core/Lucy/Test/Util/TestJson.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel TestLucy;
class Lucy::Test::Util::TestJson
inherits Clownfish::Test::TestBatch {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ffb0e921/core/Lucy/Test/Util/TestMemoryPool.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestMemoryPool.c b/core/Lucy/Test/Util/TestMemoryPool.c
index 4c9d96c..b7a63ae 100644
--- a/core/Lucy/Test/Util/TestMemoryPool.c
+++ b/core/Lucy/Test/Util/TestMemoryPool.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_TESTMEMORYPOOL
+#define C_TESTLUCY_TESTMEMORYPOOL
#define C_LUCY_MEMORYPOOL
+#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Test/TestFormatter.h"