diff options
author | Alexander Kurtakov | 2020-01-16 12:46:23 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2020-01-23 09:21:45 +0000 |
commit | 1b53703fa8a7afffc77d5bf226284721b734d649 (patch) | |
tree | 2419011f827e532ba86c3b1918577392268085e4 | |
parent | 643e7946a1391eb6c5330f588faef7894b11db42 (diff) | |
download | eclipse.platform.ua-1b53703fa8a7afffc77d5bf226284721b734d649.tar.gz eclipse.platform.ua-1b53703fa8a7afffc77d5bf226284721b734d649.tar.xz eclipse.platform.ua-1b53703fa8a7afffc77d5bf226284721b734d649.zip |
Bug 559252 - Update platform.ua to Lucene 8.4.1I20200123-0525I20200123-0430
Adjust code as needed.
Drop tests for ancient index versions - if major differs they are
treated equally so there is no point in keeping them.
Change-Id: I2d4b98ad90505a67c1329fb293da1fbb11a89d55
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
39 files changed, 33 insertions, 187 deletions
diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF index df5419795..f87dba7d4 100644 --- a/org.eclipse.help.base/META-INF/MANIFEST.MF +++ b/org.eclipse.help.base/META-INF/MANIFEST.MF @@ -44,9 +44,9 @@ Require-Bundle: org.eclipse.ant.core;bundle-version="[3.2.200,4.0.0)";resolution org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)", org.eclipse.core.net;bundle-version="[1.2.200,2.0.0]", - org.apache.lucene.analyzers-common;bundle-version="[8.0.0,9.0.0)", - org.apache.lucene.core;bundle-version="[8.0.0,9.0.0)", - org.apache.lucene.analyzers-smartcn;bundle-version="[8.0.0,9.0.0)" + org.apache.lucene.analyzers-common;bundle-version="[8.4.1,9.0.0)", + org.apache.lucene.core;bundle-version="[8.4.1,9.0.0)", + org.apache.lucene.analyzers-smartcn;bundle-version="[8.4.1,9.0.0)" Import-Package: com.ibm.icu.text, org.eclipse.equinox.http.jetty;resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java index 7ef713c96..983a5f17b 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java @@ -154,7 +154,7 @@ public class PluginIndex { .getProperty(SearchIndex.DEPENDENCIES_KEY_ANALYZER); if (!targetIndex.isLuceneCompatible(lucene) || !targetIndex.isAnalyzerCompatible(analyzer)) { String message = "Unable to consume Lucene index from bundle '" + bundle.toString() //$NON-NLS-1$ - + "'. The index should be rebuilt with Lucene 8.0.0"; //$NON-NLS-1$ + + "'. The index should be rebuilt with Lucene 8.4.1"; //$NON-NLS-1$ Status warningStatus = new Status(IStatus.WARNING, HelpBasePlugin.PLUGIN_ID, IStatus.OK, message, null); HelpBasePlugin.logStatus(warningStatus); return false; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java index 4d148bf6f..f5e0216ea 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java @@ -758,9 +758,9 @@ public class SearchIndex implements IHelpSearchIndex { } Version luceneVersion = new Version(luceneVersionString); Version indexVersion = new Version(indexVersionString); - Version v800 = new Version(8, 0, 0); - if (indexVersion.compareTo(v800) < 0) { - // index is older than Lucene 8.0.0 + Version v840 = new Version(8, 4, 0); + if (indexVersion.compareTo(v840) < 0) { + // index is older than Lucene 8.4.0 return false; } if ( luceneVersion.compareTo(indexVersion) >= 0 ) { diff --git a/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/org.eclipse.ua.tests/META-INF/MANIFEST.MF index f4041aec3..62f58fde5 100644 --- a/org.eclipse.ua.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.ua.tests/META-INF/MANIFEST.MF @@ -20,9 +20,9 @@ Require-Bundle: org.junit, org.eclipse.ui.browser;bundle-version="3.2.300", org.eclipse.equinox.jsp.jasper;bundle-version="1.0.200", org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100", - org.apache.lucene.analyzers-common;bundle-version="8.0.0", - org.apache.lucene.analyzers-smartcn;bundle-version="8.0.0", - org.apache.lucene.core;bundle-version="8.0.0" + org.apache.lucene.analyzers-common;bundle-version="8.4.1", + org.apache.lucene.analyzers-smartcn;bundle-version="8.4.1", + org.apache.lucene.core;bundle-version="8.4.1" Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse.org Import-Package: javax.servlet;version="3.1.0", diff --git a/org.eclipse.ua.tests/data/help/searchindex/index191/_2.cfs b/org.eclipse.ua.tests/data/help/searchindex/index191/_2.cfs Binary files differdeleted file mode 100644 index 38270b7ca..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index191/_2.cfs +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index191/deletable b/org.eclipse.ua.tests/data/help/searchindex/index191/deletable Binary files differdeleted file mode 100644 index 593f4708d..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index191/deletable +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_contributions b/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_contributions deleted file mode 100644 index 86bdbc280..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_contributions +++ /dev/null @@ -1,3 +0,0 @@ -#This is a generated file; do not edit. -#Mon Jan 31 14:18:32 PST 2011 -temp.preindex=temp.preindex\n1.0.0.qualifier diff --git a/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_dependencies b/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_dependencies deleted file mode 100644 index 9a0bed7d0..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_dependencies +++ /dev/null @@ -1,4 +0,0 @@ -#This is a generated file; do not edit. -#Mon Jan 31 14:18:32 PST 2011 -lucene=1.9.1.v20100518-1140 -analyzer=org.eclipse.help.base\#3.5.0.v201006080911?locale\=en diff --git a/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_docs b/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_docs deleted file mode 100644 index 519ba18e6..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index191/indexed_docs +++ /dev/null @@ -1,4 +0,0 @@ -#This is a generated file; do not edit. -#Mon Jan 31 14:18:32 PST 2011 -/temp.preindex/html/toc.html=0 -/temp.preindex/html/maintopic.html=0 diff --git a/org.eclipse.ua.tests/data/help/searchindex/index191/segments b/org.eclipse.ua.tests/data/help/searchindex/index191/segments Binary files differdeleted file mode 100644 index 3e2faebfa..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index191/segments +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index291/_0.cfs b/org.eclipse.ua.tests/data/help/searchindex/index291/_0.cfs Binary files differdeleted file mode 100644 index 50268681f..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index291/_0.cfs +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index291/_0.cfx b/org.eclipse.ua.tests/data/help/searchindex/index291/_0.cfx Binary files differdeleted file mode 100644 index b543bbbfb..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index291/_0.cfx +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_contributions b/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_contributions deleted file mode 100644 index b0d658226..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_contributions +++ /dev/null @@ -1,3 +0,0 @@ -#This is a generated file; do not edit. -#Mon Jan 31 12:37:00 PST 2011 -org.eclipse.ua.tests.preindex=org.eclipse.ua.tests.preindex\n1.0.0.qualifier diff --git a/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_dependencies b/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_dependencies deleted file mode 100644 index 3b3874eaf..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_dependencies +++ /dev/null @@ -1,4 +0,0 @@ -#This is a generated file; do not edit. -#Mon Jan 31 12:37:00 PST 2011 -lucene=2.9.1.v201101211721 -analyzer=org.eclipse.help.base\#3.6.0.v201101272034?locale\=en diff --git a/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_docs b/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_docs deleted file mode 100644 index bb7771b9b..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index291/indexed_docs +++ /dev/null @@ -1,4 +0,0 @@ -#This is a generated file; do not edit. -#Mon Jan 31 12:37:00 PST 2011 -/org.eclipse.ua.tests.preindex/html/maintopic.html=0 -/org.eclipse.ua.tests.preindex/html/toc.html=0 diff --git a/org.eclipse.ua.tests/data/help/searchindex/index291/segments.gen b/org.eclipse.ua.tests/data/help/searchindex/index291/segments.gen Binary files differdeleted file mode 100644 index 225a55b3c..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index291/segments.gen +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index291/segments_2 b/org.eclipse.ua.tests/data/help/searchindex/index291/segments_2 Binary files differdeleted file mode 100644 index 653504e66..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index291/segments_2 +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fdt b/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fdt Binary files differdeleted file mode 100644 index 2aec54b38..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fdt +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fdx b/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fdx Binary files differdeleted file mode 100644 index b8ee80957..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fdx +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fnm b/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fnm deleted file mode 100644 index 77f69b39f..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.fnm +++ /dev/null @@ -1,2 +0,0 @@ -ýÿÿÿ name -index_pathcontentsexact_contentstitleexact_title raw_titlesummaryfilters
\ No newline at end of file diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.frq b/org.eclipse.ua.tests/data/help/searchindex/index350/_0.frq Binary files differdeleted file mode 100644 index 80d4026c3..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.frq +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.nrm b/org.eclipse.ua.tests/data/help/searchindex/index350/_0.nrm deleted file mode 100644 index cb4b65c94..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.nrm +++ /dev/null @@ -1 +0,0 @@ -NRMÿ||qpyy
\ No newline at end of file diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.prx b/org.eclipse.ua.tests/data/help/searchindex/index350/_0.prx Binary files differdeleted file mode 100644 index cb29e1904..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.prx +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.tii b/org.eclipse.ua.tests/data/help/searchindex/index350/_0.tii Binary files differdeleted file mode 100644 index 509d02d09..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.tii +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.tis b/org.eclipse.ua.tests/data/help/searchindex/index350/_0.tis Binary files differdeleted file mode 100644 index 08336d954..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/_0.tis +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_contributions b/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_contributions deleted file mode 100644 index e1c62a015..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_contributions +++ /dev/null @@ -1,20 +0,0 @@ -#This is a generated file; do not edit. -#Mon Nov 07 13:53:04 CET 2016 -org.eclipse.ua.tests=org.eclipse.ua.tests\n3.3.800.qualifier -org.eclipse.help.base=org.eclipse.help.base\n4.2.0.qualifier -org.eclipse.jdt=org.eclipse.jdt\n3.13.0.N20161102-2000 -org.eclipse.jdt.doc.user=org.eclipse.jdt.doc.user\n3.13.0.N20161102-2000 -org.eclipse.egit.doc=org.eclipse.egit.doc\n4.4.1.201607150455-r -org.eclipse.jdt.doc.isv=org.eclipse.jdt.doc.isv\n3.13.0.N20161102-2000 -org.eclipse.ui.cheatsheets=org.eclipse.ui.cheatsheets\n3.5.0.qualifier -org.eclipse.cvs=org.eclipse.cvs\n1.4.300.N20161102-2000 -org.eclipse.ui.intro=org.eclipse.ui.intro\n3.5.100.qualifier -org.eclipse.help=org.eclipse.help\n3.8.0.qualifier -org.eclipse.platform.doc.isv=org.eclipse.platform.doc.isv\n4.7.0.N20161102-2000 -org.eclipse.wst.jsdt.doc=org.eclipse.wst.jsdt.doc\n1.4.101.v201507140011 -org.eclipse.pde.doc.user=org.eclipse.pde.doc.user\n3.13.0.N20161102-2000 -org.eclipse.ui.intro.solstice.examples=org.eclipse.ui.intro.solstice.examples\n1.0.0.qualifier -org.eclipse.platform=org.eclipse.platform\n4.7.0.N20161102-2000 -org.eclipse.pde=org.eclipse.pde\n3.13.0.N20161102-2000 -org.eclipse.platform.doc.user=org.eclipse.platform.doc.user\n4.7.0.N20161102-2000 -org.eclipse.ui.intro.universal=org.eclipse.ui.intro.universal\n3.3.100.qualifier diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_dependencies b/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_dependencies deleted file mode 100644 index 84c7a1c95..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_dependencies +++ /dev/null @@ -1,4 +0,0 @@ -#This is a generated file; do not edit. -#Mon Nov 07 13:53:04 CET 2016 -lucene=3.5.0.v20120725-1805 -analyzer=org.eclipse.help.base\#4.2.0.qualifier?locale\=en diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_docs b/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_docs deleted file mode 100644 index ecb9dec48..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/indexed_docs +++ /dev/null @@ -1,3 +0,0 @@ -#This is a generated file; do not edit. -#Mon Nov 07 13:53:04 CET 2016 -test=true diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/segments.gen b/org.eclipse.ua.tests/data/help/searchindex/index350/segments.gen Binary files differdeleted file mode 100644 index 63a7ec9a3..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/segments.gen +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index350/segments_1 b/org.eclipse.ua.tests/data/help/searchindex/index350/segments_1 Binary files differdeleted file mode 100644 index f04b57694..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index350/segments_1 +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index610/_0.cfe b/org.eclipse.ua.tests/data/help/searchindex/index610/_0.cfe Binary files differdeleted file mode 100644 index 67880cdc5..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index610/_0.cfe +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index610/_0.cfs b/org.eclipse.ua.tests/data/help/searchindex/index610/_0.cfs Binary files differdeleted file mode 100644 index ebe7cc658..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index610/_0.cfs +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index610/_0.si b/org.eclipse.ua.tests/data/help/searchindex/index610/_0.si Binary files differdeleted file mode 100644 index bf72cd5e8..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index610/_0.si +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_contributions b/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_contributions deleted file mode 100644 index b421b5b07..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_contributions +++ /dev/null @@ -1,20 +0,0 @@ -#This is a generated file; do not edit. -#Mon Nov 07 13:22:27 CET 2016 -org.eclipse.ua.tests=org.eclipse.ua.tests\n3.3.800.qualifier -org.eclipse.help.base=org.eclipse.help.base\n4.2.0.qualifier -org.eclipse.jdt=org.eclipse.jdt\n3.13.0.N20161102-2000 -org.eclipse.jdt.doc.user=org.eclipse.jdt.doc.user\n3.13.0.N20161102-2000 -org.eclipse.egit.doc=org.eclipse.egit.doc\n4.4.1.201607150455-r -org.eclipse.jdt.doc.isv=org.eclipse.jdt.doc.isv\n3.13.0.N20161102-2000 -org.eclipse.ui.cheatsheets=org.eclipse.ui.cheatsheets\n3.5.0.qualifier -org.eclipse.cvs=org.eclipse.cvs\n1.4.300.N20161102-2000 -org.eclipse.ui.intro=org.eclipse.ui.intro\n3.5.100.qualifier -org.eclipse.help=org.eclipse.help\n3.8.0.qualifier -org.eclipse.platform.doc.isv=org.eclipse.platform.doc.isv\n4.7.0.N20161102-2000 -org.eclipse.wst.jsdt.doc=org.eclipse.wst.jsdt.doc\n1.4.101.v201507140011 -org.eclipse.pde.doc.user=org.eclipse.pde.doc.user\n3.13.0.N20161102-2000 -org.eclipse.ui.intro.solstice.examples=org.eclipse.ui.intro.solstice.examples\n1.0.0.qualifier -org.eclipse.platform=org.eclipse.platform\n4.7.0.N20161102-2000 -org.eclipse.pde=org.eclipse.pde\n3.13.0.N20161102-2000 -org.eclipse.platform.doc.user=org.eclipse.platform.doc.user\n4.7.0.N20161102-2000 -org.eclipse.ui.intro.universal=org.eclipse.ui.intro.universal\n3.3.100.qualifier diff --git a/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_dependencies b/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_dependencies deleted file mode 100644 index 2add532e1..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_dependencies +++ /dev/null @@ -1,4 +0,0 @@ -#This is a generated file; do not edit. -#Mon Nov 07 13:22:27 CET 2016 -lucene=6.1.0.v20161101-1942 -analyzer=org.eclipse.help.base\#4.2.0.qualifier?locale\=en diff --git a/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_docs b/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_docs deleted file mode 100644 index deac8bd82..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index610/indexed_docs +++ /dev/null @@ -1,3 +0,0 @@ -#This is a generated file; do not edit. -#Mon Nov 07 13:22:27 CET 2016 -test=true diff --git a/org.eclipse.ua.tests/data/help/searchindex/index610/segments_1 b/org.eclipse.ua.tests/data/help/searchindex/index610/segments_1 Binary files differdeleted file mode 100644 index 6cc099836..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index610/segments_1 +++ /dev/null diff --git a/org.eclipse.ua.tests/data/help/searchindex/index610/write.lock b/org.eclipse.ua.tests/data/help/searchindex/index610/write.lock deleted file mode 100644 index e69de29bb..000000000 --- a/org.eclipse.ua.tests/data/help/searchindex/index610/write.lock +++ /dev/null diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java index e701dbb17..ba3e20b66 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2019 IBM Corporation and others. + * Copyright (c) 2011, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -60,38 +60,6 @@ import org.osgi.framework.Bundle; public class PrebuiltIndexCompatibility { /** - * Test index built with Lucene 1.9.1 - */ - @Test(expected = IndexFormatTooOldException.class) - public void test1_9_1_IndexUnReadable() throws Exception { - checkReadable("data/help/searchindex/index191"); - } - - /** - * Test index built with Lucene 2.9.1 - */ - @Test(expected = IndexFormatTooOldException.class) - public void test2_9_1_IndexUnReadable() throws Exception { - checkReadable("data/help/searchindex/index291"); - } - - /** - * Test index built with Lucene 3.5.0 - */ - @Test(expected = IndexFormatTooOldException.class) - public void test3_5_0_IndexUnReadable() throws Exception { - checkReadable("data/help/searchindex/index350"); - } - - /** - * Test index built with Lucene 6.1.0 - */ - @Test(expected = IndexFormatTooOldException.class) - public void test6_1_0_IndexUnReadable() throws Exception { - checkReadable("data/help/searchindex/index610"); - } - - /** * Test index built with Lucene 7.0.0 */ @Test(expected = IndexFormatTooOldException.class) @@ -100,45 +68,20 @@ public class PrebuiltIndexCompatibility { } /** - * Test index built with Lucene 8.0.0 + * Test index built with Lucene 8.0.0 IllegalArgumentException with message + * proposing to add lucene-backward-codecs */ - @Test - public void test8_0_0_IndexReadable() throws Exception { + @Test(expected = IllegalArgumentException.class) + public void test8_0_0_IndexUnReadable() throws Exception { checkReadable("data/help/searchindex/index800"); } /** - ** Test compatibility of Lucene 1.9.1 index with current Lucene - */ - @Test - public void test1_9_1Compatible() - { - checkCompatible("data/help/searchindex/index191", false); - } - - /** - ** Test compatibility of Lucene 2.9.1 index with current Lucene + * Test index built with Lucene 8.4.1 */ @Test - public void test2_9_1Compatible() - { - checkCompatible("data/help/searchindex/index291", false); - } - - /** - ** Test compatibility of Lucene 3.5.0 index with current Lucene - */ - @Test - public void test3_5_0Compatible() { - checkCompatible("data/help/searchindex/index350", false); - } - - /** - ** Test compatibility of Lucene 6.1.0 index with current Lucene - */ - @Test - public void test6_1_0Compatible() { - checkCompatible("data/help/searchindex/index610", false); + public void test8_4_1_IndexReadable() throws Exception { + checkReadable("data/help/searchindex/index841"); } /** @@ -150,31 +93,8 @@ public class PrebuiltIndexCompatibility { } @Test - public void test1_9_1LuceneCompatible() - { - checkLuceneCompatible("1.9.1", false); - } - - @Test - public void test1_4_103NotLuceneCompatible() - { - checkLuceneCompatible("1.4.103", false); - } - - @Test - public void test2_9_1LuceneCompatible() - { - checkLuceneCompatible("2.9.1", false); - } - - @Test - public void test3_5_0LuceneCompatible() { - checkLuceneCompatible("3.5.0", false); - } - - @Test - public void test6_1_0LuceneCompatible() { - checkLuceneCompatible("6.1.0", false); + public void test8_0_0Compatible() { + checkCompatible("data/help/searchindex/index800", false); } @Test @@ -184,12 +104,17 @@ public class PrebuiltIndexCompatibility { @Test public void test8_0_0LuceneCompatible() { - checkLuceneCompatible("8.0.0", true); + checkLuceneCompatible("8.0.0", false); + } + + @Test + public void test8_4_1LuceneCompatible() { + checkLuceneCompatible("8.4.1", true); } @Test public void testPluginIndexEqualToItself() { - PluginIndex index = createPluginIndex("data/help/searchindex/index610"); + PluginIndex index = createPluginIndex("data/help/searchindex/index841"); assertTrue(index.equals(index)); } @@ -198,8 +123,8 @@ public class PrebuiltIndexCompatibility { */ @Test public void testPluginIndexEquality() { - PluginIndex index1a = createPluginIndex("data/help/searchindex/index610"); - PluginIndex index1b = createPluginIndex("data/help/searchindex/index610"); + PluginIndex index1a = createPluginIndex("data/help/searchindex/index841"); + PluginIndex index1b = createPluginIndex("data/help/searchindex/index841"); assertTrue(index1a.equals(index1b)); } @@ -208,8 +133,8 @@ public class PrebuiltIndexCompatibility { */ @Test public void testPluginIndexHash() { - PluginIndex index1a = createPluginIndex("data/help/searchindex/index610"); - PluginIndex index1b = createPluginIndex("data/help/searchindex/index610"); + PluginIndex index1a = createPluginIndex("data/help/searchindex/index841"); + PluginIndex index1b = createPluginIndex("data/help/searchindex/index841"); assertEquals(index1a.hashCode(), index1b.hashCode()); } @@ -218,8 +143,8 @@ public class PrebuiltIndexCompatibility { */ @Test public void testPluginIndexInequality() { - PluginIndex index1 = createPluginIndex("data/help/searchindex/index610"); - PluginIndex index2 = createPluginIndex("data/help/searchindex/index350"); + PluginIndex index1 = createPluginIndex("data/help/searchindex/index841"); + PluginIndex index2 = createPluginIndex("data/help/searchindex/index800"); assertFalse(index1.equals(index2)); } |