Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8F2CF47E2 for ; Mon, 11 Jul 2011 19:13:43 +0000 (UTC) Received: (qmail 12164 invoked by uid 500); 11 Jul 2011 19:13:43 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 12156 invoked by uid 99); 11 Jul 2011 19:13:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jul 2011 19:13:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jul 2011 19:13:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9DC6723888CF; Mon, 11 Jul 2011 19:13:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1145297 [1/8] - in /lucene/dev/branches/fieldtype: lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/ lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ lucene/contrib/instantiated/src/test/o... Date: Mon, 11 Jul 2011 19:13:06 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110711191309.9DC6723888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Mon Jul 11 19:12:59 2011 New Revision: 1145297 URL: http://svn.apache.org/viewvc?rev=1145297&view=rev Log: LUCENE-2308: cutover non-solr tests to new FieldType API Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java lucene/dev/branches/fieldtype/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java lucene/dev/branches/fieldtype/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java lucene/dev/branches/fieldtype/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java lucene/dev/branches/fieldtype/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document2/BinaryField.java lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document2/Document.java lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document2/NumericField.java lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document2/StringField.java lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document2/TextField.java lucene/dev/branches/fieldtype/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java lucene/dev/branches/fieldtype/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java lucene/dev/branches/fieldtype/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestDemo.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestExternalCodecs.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestSearch.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/Test2BTerms.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestCodecs.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestCrash.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDoc.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFlex.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReader.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderDelete.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderOnDiskFull.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestLazyBug.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestLongPostings.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestMultiFields.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestNorms.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestOmitTf.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestParallelReader.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestPayloads.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestPerFieldCodecSupport.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestRollback.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTransactions.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBoolean2.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDateFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDateSort.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDocBoost.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestExplanations.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFieldCache.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestNot.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSetNorm.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarity.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSort.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermScorer.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermVectors.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestThreadSafe.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcard.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestLockFactory.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestMultiMMap.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/search/TestSort.java lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Mon Jul 11 19:12:59 2011 @@ -60,7 +60,7 @@ public class HighlighterPhraseTest exten newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false))); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -108,7 +108,7 @@ public class HighlighterPhraseTest exten try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -182,7 +182,7 @@ public class HighlighterPhraseTest exten try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -229,7 +229,7 @@ public class HighlighterPhraseTest exten try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStored(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectors(true); @@ -273,7 +273,7 @@ public class HighlighterPhraseTest exten newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false))); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Mon Jul 11 19:12:59 2011 @@ -1531,7 +1531,7 @@ public class HighlighterTest extends Bas private Document doc( String f, String v ){ Document doc = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStored(true); doc.add( new Field( f, customType, v)); return doc; @@ -1658,7 +1658,7 @@ public class HighlighterTest extends Bas addDoc(writer, text); } Document doc = new Document(); - FieldType storedNumericType = new FieldType(NumericField.DEFAULT_TYPE); + FieldType storedNumericType = new FieldType(NumericField.TYPE_UNSTORED); storedNumericType.setStored(true); NumericField nfield = new NumericField(NUMERIC_FIELD_NAME, storedNumericType); nfield.setIntValue(1); @@ -1696,7 +1696,7 @@ public class HighlighterTest extends Bas private void addDoc(IndexWriter writer, String text) throws IOException { Document d = new Document(); - FieldType storedType = new FieldType(TextField.DEFAULT_TYPE); + FieldType storedType = new FieldType(TextField.TYPE_UNSTORED); storedType.setStored(true); Field f = new Field(FIELD_NAME, storedType, text); d.add(f); Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Mon Jul 11 19:12:59 2011 @@ -108,7 +108,7 @@ public class TokenSourcesTest extends Lu newIndexWriterConfig(TEST_VERSION_CURRENT, new OverlapAnalyzer())); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, customType, new TokenStreamOverlap())); @@ -156,7 +156,7 @@ public class TokenSourcesTest extends Lu newIndexWriterConfig(TEST_VERSION_CURRENT, new OverlapAnalyzer())); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); @@ -205,7 +205,7 @@ public class TokenSourcesTest extends Lu newIndexWriterConfig(TEST_VERSION_CURRENT, new OverlapAnalyzer())); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, customType, new TokenStreamOverlap())); @@ -254,7 +254,7 @@ public class TokenSourcesTest extends Lu newIndexWriterConfig(TEST_VERSION_CURRENT, new OverlapAnalyzer())); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, customType, new TokenStreamOverlap())); Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Mon Jul 11 19:12:59 2011 @@ -331,7 +331,7 @@ public abstract class AbstractTestCase e IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzer).setOpenMode(OpenMode.CREATE)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); @@ -350,7 +350,7 @@ public abstract class AbstractTestCase e IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzerK).setOpenMode(OpenMode.CREATE)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Mon Jul 11 19:12:59 2011 @@ -131,7 +131,7 @@ public class SimpleFragmentsBuilderTest IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzerW).setOpenMode(OpenMode.CREATE)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java Mon Jul 11 19:12:59 2011 @@ -206,7 +206,7 @@ public class TestIndicesEquals extends L private void assembleDocument(Document document, int i) { - FieldType customType = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); @@ -218,19 +218,19 @@ public class TestIndicesEquals extends L document.add(new Field("b0", customType, i + " All work and no play makes Jack a dull boy")); //document.add(new Field("b1", i + " All work and no play makes Jack a dull boy", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS, Field.TermVector.NO)); - FieldType customType2 = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType2 = new FieldType(TextField.TYPE_UNSTORED); customType2.setStored(true); customType2.setTokenized(false); customType2.setOmitNorms(true); document.add(new Field("b1", customType2, i + " All work and no play makes Jack a dull boy")); //document.add(new Field("b2", i + " All work and no play makes Jack a dull boy", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.NO)); - FieldType customType3 = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType3 = new FieldType(TextField.TYPE_UNSTORED); customType3.setTokenized(false); document.add(new Field("b1", customType3, i + " All work and no play makes Jack a dull boy")); //document.add(new Field("b3", i + " All work and no play makes Jack a dull boy", Field.Store.YES, Field.Index.NO, Field.TermVector.NO)); - FieldType customType4 = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType4 = new FieldType(TextField.TYPE_UNSTORED); customType4.setStored(true); customType4.setIndexed(false); customType4.setTokenized(false); @@ -244,7 +244,7 @@ public class TestIndicesEquals extends L if (i > 3) { //Field f = new Field("e", i + " Heres Johnny!", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS); //f.setOmitNorms(true); - FieldType customType5 = new FieldType(TextField.DEFAULT_TYPE); + FieldType customType5 = new FieldType(TextField.TYPE_UNSTORED); customType5.setOmitNorms(true); Field f = new Field("e", customType5, i + " Heres Johnny!"); document.add(f); Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java Mon Jul 11 19:12:59 2011 @@ -24,8 +24,8 @@ import org.apache.lucene.index.IndexWrit import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.TextField; /** * @since 2009-mar-30 13:15:49 @@ -65,7 +65,7 @@ public class TestUnoptimizedReaderOnCons private void addDocument(IndexWriter iw, String text) throws IOException { Document doc = new Document(); - doc.add(new Field("field", text, Field.Store.NO, Field.Index.ANALYZED)); + doc.add(new TextField("field", text)); iw.addDocument(doc); } } Modified: lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Mon Jul 11 19:12:59 2011 @@ -29,8 +29,9 @@ import org.apache.lucene.analysis.BaseTo import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenFilter; import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.queryParser.QueryParser; @@ -108,8 +109,8 @@ public class MemoryIndexTest extends Bas IndexWriter writer = new IndexWriter(ramdir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodecProvider(_TestUtil.alwaysCodec("Standard"))); Document doc = new Document(); - Field field1 = newField("foo", fooField.toString(), Field.Store.NO, Field.Index.ANALYZED); - Field field2 = newField("term", termField.toString(), Field.Store.NO, Field.Index.ANALYZED); + Field field1 = newField("foo", fooField.toString(), TextField.TYPE_UNSTORED); + Field field2 = newField("term", termField.toString(), TextField.TYPE_UNSTORED); doc.add(field1); doc.add(field2); writer.addDocument(doc); Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Mon Jul 11 19:12:59 2011 @@ -21,8 +21,10 @@ import java.io.IOException; import java.util.Arrays; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.Collector; import org.apache.lucene.search.DefaultSimilarity; @@ -65,13 +67,21 @@ public class TestFieldNormModifier exten for (int i = 0; i < NUM_DOCS; i++) { Document d = new Document(); - d.add(newField("field", "word", Field.Store.YES, Field.Index.ANALYZED)); - d.add(newField("nonorm", "word", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); - d.add(newField("untokfield", "20061212 20071212", Field.Store.YES, Field.Index.ANALYZED)); + + FieldType storedTextType = new FieldType(TextField.TYPE_UNSTORED); + storedTextType.setStored(true); + d.add(newField("field", "word", storedTextType)); + + FieldType storedTextType2 = new FieldType(TextField.TYPE_UNSTORED); + storedTextType2.setStored(true); + storedTextType2.setTokenized(false); + storedTextType2.setOmitNorms(true); + d.add(newField("nonorm", "word", storedTextType2)); + d.add(newField("untokfield", "20061212 20071212", storedTextType)); for (int j = 1; j <= i; j++) { - d.add(newField("field", "crap", Field.Store.YES, Field.Index.ANALYZED)); - d.add(newField("nonorm", "more words", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); + d.add(newField("field", "crap", storedTextType)); + d.add(newField("nonorm", "more words", storedTextType2)); } writer.addDocument(d); } Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java Mon Jul 11 19:12:59 2011 @@ -19,7 +19,7 @@ package org.apache.lucene.index; import java.io.File; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; +import org.apache.lucene.document2.Document; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Mon Jul 11 19:12:59 2011 @@ -17,8 +17,10 @@ package org.apache.lucene.index; */ import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; @@ -36,8 +38,13 @@ public class TestMultiPassIndexSplitter Document doc; for (int i = 0; i < NUM_DOCS; i++) { doc = new Document(); - doc.add(newField("id", i + "", Field.Store.YES, Field.Index.NOT_ANALYZED)); - doc.add(newField("f", i + " " + i, Field.Store.YES, Field.Index.ANALYZED)); + FieldType storedTextType = new FieldType(TextField.TYPE_UNSTORED); + storedTextType.setStored(true); + storedTextType.setTokenized(false); + FieldType storedTextType2 = new FieldType(TextField.TYPE_UNSTORED); + storedTextType.setStored(true); + doc.add(newField("id", i + "", storedTextType)); + doc.add(newField("f", i + " " + i, storedTextType2)); w.addDocument(doc); } w.close(); @@ -70,7 +77,7 @@ public class TestMultiPassIndexSplitter IndexReader ir; ir = IndexReader.open(dirs[0], true); assertTrue(ir.numDocs() - NUM_DOCS / 3 <= 1); // rounding error - Document doc = ir.document(0); + org.apache.lucene.document.Document doc = ir.document(0); assertEquals("0", doc.get("id")); TermsEnum te = MultiFields.getTerms(ir, "id").iterator(); assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seek(new BytesRef("1"))); @@ -115,7 +122,7 @@ public class TestMultiPassIndexSplitter IndexReader ir; ir = IndexReader.open(dirs[0], true); assertTrue(ir.numDocs() - NUM_DOCS / 3 <= 1); - Document doc = ir.document(0); + org.apache.lucene.document.Document doc = ir.document(0); assertEquals("0", doc.get("id")); int start = ir.numDocs(); ir.close(); Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java Mon Jul 11 19:12:59 2011 @@ -1,8 +1,10 @@ package org.apache.lucene.index; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -30,33 +32,42 @@ public class TestTermVectorAccessor exte Document doc; doc = new Document(); - doc.add(newField("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); - doc.add(newField("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); - doc.add(newField("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStoreTermVectors(true); + customType.setStoreTermVectorPositions(true); + customType.setStoreTermVectorOffsets(true); + doc.add(newField("a", "a b a c a d a e a f a g a h a", customType)); + doc.add(newField("b", "a b c b d b e b f b g b h b", customType)); + doc.add(newField("c", "a c b c d c e c f c g c h c", customType)); iw.addDocument(doc); doc = new Document(); - doc.add(newField("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS)); - doc.add(newField("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS)); - doc.add(newField("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS)); + FieldType customType2 = new FieldType(TextField.TYPE_UNSTORED); + customType2.setStoreTermVectors(true); + customType2.setStoreTermVectorPositions(true); + doc.add(newField("a", "a b a c a d a e a f a g a h a", customType2)); + doc.add(newField("b", "a b c b d b e b f b g b h b", customType2)); + doc.add(newField("c", "a c b c d c e c f c g c h c", customType2)); iw.addDocument(doc); doc = new Document(); - doc.add(newField("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.YES)); - doc.add(newField("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.YES)); - doc.add(newField("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.YES)); + FieldType customType3 = new FieldType(TextField.TYPE_UNSTORED); + customType3.setStoreTermVectors(true); + doc.add(newField("a", "a b a c a d a e a f a g a h a", customType3)); + doc.add(newField("b", "a b c b d b e b f b g b h b", customType3)); + doc.add(newField("c", "a c b c d c e c f c g c h c", customType3)); iw.addDocument(doc); doc = new Document(); - doc.add(newField("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.NO)); - doc.add(newField("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.NO)); - doc.add(newField("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(newField("a", "a b a c a d a e a f a g a h a", TextField.TYPE_UNSTORED)); + doc.add(newField("b", "a b c b d b e b f b g b h b", TextField.TYPE_UNSTORED)); + doc.add(newField("c", "a c b c d c e c f c g c h c", TextField.TYPE_UNSTORED)); iw.addDocument(doc); doc = new Document(); - doc.add(newField("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); - doc.add(newField("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.NO)); - doc.add(newField("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.YES)); + doc.add(newField("a", "a b a c a d a e a f a g a h a", customType)); + doc.add(newField("b", "a b c b d b e b f b g b h b", TextField.TYPE_UNSTORED)); + doc.add(newField("c", "a c b c d c e c f c g c h c", customType3)); iw.addDocument(doc); iw.close(); Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java Mon Jul 11 19:12:59 2011 @@ -21,10 +21,9 @@ import java.io.IOException; import java.util.Random; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field.Index; -import org.apache.lucene.document.Field.Store; -import org.apache.lucene.document.Field.TermVector; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReader; @@ -140,7 +139,12 @@ public class TestAppendingCodec extends ((TieredMergePolicy)cfg.getMergePolicy()).setUseCompoundFile(false); IndexWriter writer = new IndexWriter(dir, cfg); Document doc = new Document(); - doc.add(newField("f", text, Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS)); + FieldType storedTextType = new FieldType(TextField.TYPE_UNSTORED); + storedTextType.setStored(true); + storedTextType.setStoreTermVectors(true); + storedTextType.setStoreTermVectorPositions(true); + storedTextType.setStoreTermVectorOffsets(true); + doc.add(newField("f", text, storedTextType)); writer.addDocument(doc); writer.commit(); writer.addDocument(doc); @@ -148,8 +152,8 @@ public class TestAppendingCodec extends writer.close(); IndexReader reader = IndexReader.open(dir, null, true, 1, new AppendingCodecProvider()); assertEquals(2, reader.numDocs()); - doc = reader.document(0); - assertEquals(text, doc.get("f")); + org.apache.lucene.document.Document doc2 = reader.document(0); + assertEquals(text, doc2.get("f")); Fields fields = MultiFields.getFields(reader); Terms terms = fields.terms("f"); assertNotNull(terms); Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java Mon Jul 11 19:12:59 2011 @@ -19,8 +19,10 @@ package org.apache.lucene.misc; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; @@ -199,13 +201,15 @@ public class TestHighFreqTerms extends L /** * Generate 10 documents where term n has a docFreq of n and a totalTermFreq of n*2 (squared). */ + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); for (int i = 1; i <= 10; i++) { Document doc = new Document(); String content = getContent(i); - doc.add(newField(random, "FIELD_1", content, Field.Store.YES,Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(newField(random, "FIELD_1", content, customType)); //add a different field - doc.add(newField(random, "different_field", "diff", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(newField(random, "different_field", "diff", customType)); writer.addDocument(doc); } @@ -213,7 +217,7 @@ public class TestHighFreqTerms extends L //highest freq terms for a specific field. for (int i = 1; i <= 10; i++) { Document doc = new Document(); - doc.add(newField(random, "different_field", "diff", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(newField(random, "different_field", "diff", customType)); writer.addDocument(doc); } // add some docs where tf < df so we can see if sorting works @@ -224,7 +228,7 @@ public class TestHighFreqTerms extends L for (int i = 0; i < highTF; i++) { content += "highTF "; } - doc.add(newField(random, "FIELD_1", content, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(newField(random, "FIELD_1", content, customType)); writer.addDocument(doc); // highTF medium df =5 int medium_df = 5; @@ -235,7 +239,7 @@ public class TestHighFreqTerms extends L for (int j = 0; j < tf; j++) { newcontent += "highTFmedDF "; } - newdoc.add(newField(random, "FIELD_1", newcontent, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO)); + newdoc.add(newField(random, "FIELD_1", newcontent, customType)); writer.addDocument(newdoc); } // add a doc with high tf in field different_field @@ -245,7 +249,7 @@ public class TestHighFreqTerms extends L for (int i = 0; i < targetTF; i++) { content += "TF150 "; } - doc.add(newField(random, "different_field", content, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(newField(random, "different_field", content, customType)); writer.addDocument(doc); writer.close(); Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Mon Jul 11 19:12:59 2011 @@ -20,8 +20,10 @@ package org.apache.lucene.misc; import java.io.IOException; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.FieldNormModifier; import org.apache.lucene.index.IndexReader; @@ -70,16 +72,17 @@ public class TestLengthNormModifier exte for (int i = 0; i < NUM_DOCS; i++) { Document d = new Document(); - d.add(newField("field", "word", - Field.Store.YES, Field.Index.ANALYZED)); - d.add(newField("nonorm", "word", - Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); + d.add(newField("field", "word", customType)); + FieldType customType2 = new FieldType(TextField.TYPE_UNSTORED); + customType2.setStored(true); + customType2.setOmitNorms(true); + d.add(newField("nonorm", "word", customType2)); for (int j = 1; j <= i; j++) { - d.add(newField("field", "crap", - Field.Store.YES, Field.Index.ANALYZED)); - d.add(newField("nonorm", "more words", - Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); + d.add(newField("field", "crap", customType)); + d.add(newField("nonorm", "more words", customType2)); } writer.addDocument(d); } Modified: lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java Mon Jul 11 19:12:59 2011 @@ -21,8 +21,9 @@ import java.io.IOException; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; @@ -61,10 +62,12 @@ public class BooleanFilterTest extends L private void addDoc(RandomIndexWriter writer, String accessRights, String price, String date, String inStock) throws IOException { Document doc=new Document(); - doc.add(newField("accessRights",accessRights,Field.Store.YES,Field.Index.ANALYZED)); - doc.add(newField("price",price,Field.Store.YES,Field.Index.ANALYZED)); - doc.add(newField("date",date,Field.Store.YES,Field.Index.ANALYZED)); - doc.add(newField("inStock",inStock,Field.Store.YES,Field.Index.ANALYZED)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); + doc.add(newField("accessRights",accessRights,customType)); + doc.add(newField("price",price,customType)); + doc.add(newField("date",date,customType)); + doc.add(newField("inStock",inStock,customType)); writer.addDocument(doc); } Modified: lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java Mon Jul 11 19:12:59 2011 @@ -20,8 +20,9 @@ package org.apache.lucene.search; import java.util.Calendar; import java.util.GregorianCalendar; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -62,9 +63,12 @@ public class ChainedFilterTest extends L for (int i = 0; i < MAX; i++) { Document doc = new Document(); - doc.add(newField("key", "" + (i + 1), Field.Store.YES, Field.Index.NOT_ANALYZED)); - doc.add(newField("owner", (i < MAX / 2) ? "bob" : "sue", Field.Store.YES, Field.Index.NOT_ANALYZED)); - doc.add(newField("date", cal.getTime().toString(), Field.Store.YES, Field.Index.NOT_ANALYZED)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); + customType.setTokenized(false); + doc.add(newField("key", "" + (i + 1), customType)); + doc.add(newField("owner", (i < MAX / 2) ? "bob" : "sue", customType)); + doc.add(newField("date", cal.getTime().toString(), customType)); writer.addDocument(doc); cal.add(Calendar.DATE, 1); Modified: lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java Mon Jul 11 19:12:59 2011 @@ -21,8 +21,9 @@ import java.io.IOException; import java.util.HashSet; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; @@ -76,9 +77,12 @@ public class DuplicateFilterTest extends private void addDoc(RandomIndexWriter writer, String url, String text, String date) throws IOException { Document doc=new Document(); - doc.add(newField(KEY_FIELD,url,Field.Store.YES,Field.Index.NOT_ANALYZED)); - doc.add(newField("text",text,Field.Store.YES,Field.Index.ANALYZED)); - doc.add(newField("date",date,Field.Store.YES,Field.Index.ANALYZED)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); + customType.setTokenized(false); + doc.add(newField(KEY_FIELD,url,customType)); + doc.add(newField("text",text,TextField.TYPE_UNSTORED)); + doc.add(newField("date",date,TextField.TYPE_UNSTORED)); writer.addDocument(doc); } @@ -89,7 +93,7 @@ public class DuplicateFilterTest extends ScoreDoc[] hits = searcher.search(tq,df, 1000).scoreDocs; for(int i=0;i0); for(int i=0;i0); for(int i=0;i0); for(int i=0;i0)); - Document doc=searcher.doc(sd[0].doc); + org.apache.lucene.document.Document doc=searcher.doc(sd[0].doc); assertEquals("Should match most similar not most rare variant", "2",doc.get("id")); } //Test multiple input words are having variants produced @@ -101,7 +104,7 @@ public class FuzzyLikeThisQueryTest exte TopDocs topDocs = searcher.search(flt, 1); ScoreDoc[] sd = topDocs.scoreDocs; assertTrue("score docs must match 1 doc", (sd!=null)&&(sd.length>0)); - Document doc=searcher.doc(sd[0].doc); + org.apache.lucene.document.Document doc=searcher.doc(sd[0].doc); assertEquals("Should match most similar when using 2 words", "2",doc.get("id")); } //Test bug found when first query word does not match anything @@ -116,7 +119,7 @@ public class FuzzyLikeThisQueryTest exte TopDocs topDocs = searcher.search(flt, 1); ScoreDoc[] sd = topDocs.scoreDocs; assertTrue("score docs must match 1 doc", (sd!=null)&&(sd.length>0)); - Document doc=searcher.doc(sd[0].doc); + org.apache.lucene.document.Document doc=searcher.doc(sd[0].doc); assertEquals("Should match most similar when using 2 words", "2",doc.get("id")); } Modified: lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java Mon Jul 11 19:12:59 2011 @@ -18,8 +18,9 @@ package org.apache.lucene.search; */ import java.util.HashSet; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; @@ -56,7 +57,10 @@ public class TermsFilterTest extends Luc for (int i = 0; i < 100; i++) { Document doc=new Document(); int term=i*10; //terms are units of 10; - doc.add(newField(fieldName,""+term,Field.Store.YES,Field.Index.NOT_ANALYZED)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); + customType.setTokenized(false); + doc.add(newField(fieldName,""+term,customType)); w.addDocument(doc); } IndexReader reader = new SlowMultiReaderWrapper(w.getReader()); Modified: lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java Mon Jul 11 19:12:59 2011 @@ -4,8 +4,10 @@ import java.io.IOException; import java.text.Collator; import java.util.Locale; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.BooleanClause.Occur; @@ -55,7 +57,11 @@ public class TestSlowCollationMethods ex for (int i = 0; i < numDocs; i++) { Document doc = new Document(); String value = _TestUtil.randomUnicodeString(random); - Field field = newField("field", value, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); + customType.setOmitNorms(true); + customType.setTokenized(false); + Field field = newField("field", value, customType); doc.add(field); iw.addDocument(doc); } Modified: lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java Mon Jul 11 19:12:59 2011 @@ -24,8 +24,9 @@ import org.apache.lucene.index.MultiFiel import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.TextField; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.index.TermsEnum; @@ -47,7 +48,7 @@ public class TestRegexQuery extends Luce directory = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random, directory); Document doc = new Document(); - doc.add(newField(FN, "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.ANALYZED)); + doc.add(newField(FN, "the quick brown fox jumps over the lazy dog", TextField.TYPE_UNSTORED)); writer.addDocument(doc); reader = writer.getReader(); writer.close(); Modified: lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java Mon Jul 11 19:12:59 2011 @@ -20,8 +20,10 @@ package org.apache.lucene.search.regex; import java.io.IOException; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; @@ -62,12 +64,10 @@ public class TestSpanRegexQuery extends // Field.Store.NO, Field.Index.ANALYZED)); // writer.addDocument(doc); // doc = new Document(); - doc.add(newField("field", "auto update", Field.Store.NO, - Field.Index.ANALYZED)); + doc.add(newField("field", "auto update", TextField.TYPE_UNSTORED)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("field", "first auto update", Field.Store.NO, - Field.Index.ANALYZED)); + doc.add(newField("field", "first auto update", TextField.TYPE_UNSTORED)); writer.addDocument(doc); writer.optimize(); writer.close(); @@ -87,13 +87,13 @@ public class TestSpanRegexQuery extends LockObtainFailedException, IOException { // creating a document to store Document lDoc = new Document(); - lDoc.add(newField("field", "a1 b1", Field.Store.NO, - Field.Index.ANALYZED_NO_NORMS)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setOmitNorms(true); + lDoc.add(newField("field", "a1 b1", customType)); // creating a document to store Document lDoc2 = new Document(); - lDoc2.add(newField("field", "a2 b2", Field.Store.NO, - Field.Index.ANALYZED_NO_NORMS)); + lDoc2.add(newField("field", "a2 b2", customType)); // creating first index writer IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig( Modified: lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java Mon Jul 11 19:12:59 2011 @@ -25,8 +25,10 @@ import java.util.Map; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.BooleanClause; @@ -66,7 +68,9 @@ public class TestMoreLikeThis extends Lu private void addDoc(RandomIndexWriter writer, String text) throws IOException { Document doc = new Document(); - doc.add(newField("text", text, Field.Store.YES, Field.Index.ANALYZED)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); + doc.add(newField("text", text, customType)); writer.addDocument(doc); } Modified: lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java Mon Jul 11 19:12:59 2011 @@ -21,8 +21,9 @@ import java.util.HashSet; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.FieldType; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.IndexSearcher; @@ -97,7 +98,7 @@ public class TestComplexPhraseQuery exte TopDocs td = searcher.search(q, 10); ScoreDoc[] sd = td.scoreDocs; for (int i = 0; i < sd.length; i++) { - Document doc = searcher.doc(sd[i].doc); + org.apache.lucene.document.Document doc = searcher.doc(sd[i].doc); String id = doc.get("id"); assertTrue(qString + "matched doc#" + id + " not expected", expecteds .contains(id)); @@ -113,12 +114,12 @@ public class TestComplexPhraseQuery exte super.setUp(); rd = newDirectory(); IndexWriter w = new IndexWriter(rd, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer)); + FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + customType.setStored(true); for (int i = 0; i < docsContent.length; i++) { Document doc = new Document(); - doc.add(newField("name", docsContent[i].name, Field.Store.YES, - Field.Index.ANALYZED)); - doc.add(newField("id", docsContent[i].id, Field.Store.YES, - Field.Index.ANALYZED)); + doc.add(newField("name", docsContent[i].name, customType)); + doc.add(newField("id", docsContent[i].id, customType)); w.addDocument(doc); } w.close(); Modified: lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java Mon Jul 11 19:12:59 2011 @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.queryParser.core.QueryNodeException; import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator; @@ -320,8 +320,7 @@ public class TestMultiFieldQPHelper exte Directory ramDir = newDirectory(); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(newField("body", "blah the footest blah", Field.Store.NO, - Field.Index.ANALYZED)); + doc.add(newField("body", "blah the footest blah", TextField.TYPE_UNSTORED)); iw.addDocument(doc); iw.close(); Modified: lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java Mon Jul 11 19:12:59 2011 @@ -40,8 +40,8 @@ import org.apache.lucene.analysis.tokena import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.document.DateTools; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; @@ -1226,7 +1226,7 @@ public class TestQPHelper extends Lucene Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new CannedAnalyzer())); Document doc = new Document(); - doc.add(newField("field", "", Field.Store.NO, Field.Index.ANALYZED)); + doc.add(newField("field", "", TextField.TYPE_UNSTORED)); w.addDocument(doc); IndexReader r = IndexReader.open(w, true); IndexSearcher s = newSearcher(r); Modified: lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java?rev=1145297&r1=1145296&r2=1145297&view=diff ============================================================================== --- lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java (original) +++ lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java Mon Jul 11 19:12:59 2011 @@ -24,8 +24,9 @@ import org.apache.lucene.store.MockDirec import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.Version; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.document2.Document; +import org.apache.lucene.document2.Field; +import org.apache.lucene.document2.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -44,7 +45,7 @@ public class SingleFieldTestDb { new MockAnalyzer(random))); for (int j = 0; j < docs.length; j++) { Document d = new Document(); - d.add(new Field(fieldName, docs[j], Field.Store.NO, Field.Index.ANALYZED)); + d.add(new Field(fieldName, TextField.TYPE_UNSTORED, docs[j])); writer.addDocument(d); } writer.close();