Author: tommaso
Date: Thu Nov 2 15:16:11 2017
New Revision: 1814091
URL: http://svn.apache.org/viewvc?rev=1814091&view=rev
Log:
OAK-6710 - removed lucene-testframework dep, adapted test
Modified:
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicyTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1814091&r1=1814090&r2=1814091&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Thu Nov 2 15:16:11 2017
@@ -399,11 +399,6 @@
<version>2.8.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${lucene.version}</version>
- <scope>test</scope>
- </dependency>
+
</dependencies>
</project>
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicyTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicyTest.java?rev=1814091&r1=1814090&r2=1814091&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicyTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/CommitMitigatingTieredMergePolicyTest.java
Thu Nov 2 15:16:11 2017
@@ -16,16 +16,27 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene.writer;
-import org.apache.lucene.index.BaseMergePolicyTestCase;
import org.apache.lucene.index.MergePolicy;
+import org.apache.lucene.index.MergePolicy.MergeTrigger;
+import org.apache.lucene.index.SegmentCommitInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.mock;
/**
* Tests for {@link CommitMitigatingTieredMergePolicy}
*/
-public class CommitMitigatingTieredMergePolicyTest extends
BaseMergePolicyTestCase {
+public class CommitMitigatingTieredMergePolicyTest {
+
+ @Test
+ public void testMergeWithNoSegments() throws Exception {
+ CommitMitigatingTieredMergePolicy mergePolicy = new
CommitMitigatingTieredMergePolicy();
- @Override
- protected MergePolicy mergePolicy() {
- return new CommitMitigatingTieredMergePolicy();
+ SegmentInfos infos = new SegmentInfos();
+ MergePolicy.MergeSpecification merges =
mergePolicy.findMerges(MergeTrigger.SEGMENT_FLUSH, infos);
+ assertNull(merges);
}
+
}
\ No newline at end of file
