Skip to content

Commit

Permalink
Fix backward compat tests in core
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChrisHegarty
ChrisHegarty committed Sep 30, 2024
1 parent f2b2bfc commit cf8c3c4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 19 deletions.
20 changes: 10 additions & 10 deletions lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public void testVersionsOneSegment() throws IOException {
SegmentInfo info =
new SegmentInfo(
dir,
Version.LUCENE_10_0_0,
Version.LUCENE_10_0_0,
Version.LUCENE_11_0_0,
Version.LUCENE_11_0_0,
"_0",
1,
false,
Expand All @@ -90,7 +90,7 @@ public void testVersionsOneSegment() throws IOException {
sis.add(commitInfo);
sis.commit(dir);
sis = SegmentInfos.readLatestCommit(dir);
assertEquals(Version.LUCENE_10_0_0, sis.getMinSegmentLuceneVersion());
assertEquals(Version.LUCENE_11_0_0, sis.getMinSegmentLuceneVersion());
assertEquals(Version.LATEST, sis.getCommitLuceneVersion());
dir.close();
}
Expand All @@ -106,8 +106,8 @@ public void testVersionsTwoSegments() throws IOException {
SegmentInfo info =
new SegmentInfo(
dir,
Version.LUCENE_10_0_0,
Version.LUCENE_10_0_0,
Version.LUCENE_11_0_0,
Version.LUCENE_11_0_0,
"_0",
1,
false,
Expand All @@ -126,8 +126,8 @@ public void testVersionsTwoSegments() throws IOException {
info =
new SegmentInfo(
dir,
Version.LUCENE_10_0_0,
Version.LUCENE_10_0_0,
Version.LUCENE_11_0_0,
Version.LUCENE_11_0_0,
"_1",
1,
false,
Expand All @@ -146,7 +146,7 @@ public void testVersionsTwoSegments() throws IOException {
byte[] commitInfoId0 = sis.info(0).getId();
byte[] commitInfoId1 = sis.info(1).getId();
sis = SegmentInfos.readLatestCommit(dir);
assertEquals(Version.LUCENE_10_0_0, sis.getMinSegmentLuceneVersion());
assertEquals(Version.LUCENE_11_0_0, sis.getMinSegmentLuceneVersion());
assertEquals(Version.LATEST, sis.getCommitLuceneVersion());
assertEquals(
StringHelper.idToString(commitInfoId0), StringHelper.idToString(sis.info(0).getId()));
Expand Down Expand Up @@ -277,8 +277,8 @@ public void testIDChangesOnAdvance() throws IOException {
SegmentInfo info =
new SegmentInfo(
dir,
Version.LUCENE_9_0_0,
Version.LUCENE_9_0_0,
Version.LUCENE_10_0_0,
Version.LUCENE_10_0_0,
"_0",
1,
false,
Expand Down
23 changes: 14 additions & 9 deletions lucene/core/src/test/org/apache/lucene/util/TestVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,27 @@ public void testOnOrAfter() throws Exception {
assertTrue("LATEST must be always onOrAfter(" + v + ")", Version.LATEST.onOrAfter(v));
}
}
assertTrue(Version.LUCENE_10_0_0.onOrAfter(Version.LUCENE_9_0_0));
assertTrue(Version.LUCENE_11_0_0.onOrAfter(Version.fromBits(9, 0, 0)));
assertTrue(Version.LUCENE_11_0_0.onOrAfter(Version.LUCENE_10_0_0));
assertTrue(Version.LUCENE_11_0_0.onOrAfter(Version.LUCENE_10_1_0));
}

public void testToString() {
assertEquals("9.0.0", Version.LUCENE_9_0_0.toString());
assertEquals("9.0.0", Version.fromBits(9, 0, 0).toString());
assertEquals("10.0.0", Version.LUCENE_10_0_0.toString());
assertEquals("10.1.0", Version.LUCENE_10_1_0.toString());
assertEquals("11.0.0", Version.LUCENE_11_0_0.toString());
}

public void testParseLeniently() throws Exception {
assertEquals(Version.LUCENE_11_0_0, Version.parseLeniently("11.0"));
assertEquals(Version.LUCENE_11_0_0, Version.parseLeniently("11.0.0"));
assertEquals(Version.LUCENE_11_0_0, Version.parseLeniently("LUCENE_11_0"));
assertEquals(Version.LUCENE_11_0_0, Version.parseLeniently("LUCENE_11_0_0"));
assertEquals(Version.LUCENE_10_0_0, Version.parseLeniently("10.0"));
assertEquals(Version.LUCENE_10_0_0, Version.parseLeniently("10.0.0"));
assertEquals(Version.LUCENE_10_0_0, Version.parseLeniently("LUCENE_10_0"));
assertEquals(Version.LUCENE_10_0_0, Version.parseLeniently("LUCENE_10_0_0"));
assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("9.0"));
assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("9.0.0"));
assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("LUCENE_90"));
assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("LUCENE_9_0"));
assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("LUCENE_9_0_0"));

assertEquals(Version.LATEST, Version.parseLeniently("LATEST"));
assertEquals(Version.LATEST, Version.parseLeniently("latest"));
Expand Down Expand Up @@ -108,15 +111,17 @@ public void testParseLenientlyOnAllConstants() throws Exception {

public void testParse() throws Exception {
assertEquals(Version.LUCENE_10_0_0, Version.parse("10.0.0"));
assertEquals(Version.LUCENE_9_0_0, Version.parse("9.0.0"));
assertEquals(Version.LUCENE_11_0_0, Version.parse("11.0.0"));

// Version does not pass judgement on the major version:
assertEquals(1, Version.parse("1.0").major);
assertEquals(7, Version.parse("7.0.0").major);
}

public void testForwardsCompatibility() throws Exception {
assertTrue(Version.parse("9.10.20").onOrAfter(Version.LUCENE_9_0_0));
assertTrue(Version.parse("11.10.20").onOrAfter(Version.LUCENE_11_0_0));
assertTrue(Version.parse("10.10.20").onOrAfter(Version.LUCENE_10_0_0));
assertTrue(Version.parse("9.10.20").onOrAfter(Version.fromBits(9, 0, 0)));
}

public void testParseExceptions() {
Expand Down

0 comments on commit cf8c3c4

Please sign in to comment.