Address review comment. Move tests to SegmentReplicationIndexShardTests

Signed-off-by: Suraj Singh <surajrider@gmail.com>
opensearch-project · Aug 8, 2022 · 12a200f · 12a200f
1 parent a1baa7a
commit 12a200f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java b/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java
@@ -139,7 +139,6 @@
 import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache;
 import org.opensearch.indices.recovery.RecoveryState;
 import org.opensearch.indices.recovery.RecoveryTarget;
-import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
 import org.opensearch.indices.replication.checkpoint.SegmentReplicationCheckpointPublisher;
 import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
 import org.opensearch.indices.replication.common.ReplicationType;
@@ -3501,27 +3500,6 @@ public void testReadSnapshotConcurrently() throws IOException, InterruptedExcept
         closeShards(newShard);
     }
 
-    /**
-     *  Test that latestReplicationCheckpoint returns null only for docrep enabled indices
-     */
-    public void testReplicationCheckpointNullForDocRep() throws IOException {
-        Settings indexSettings = Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, "DOCUMENT").put(Settings.EMPTY).build();
-        final IndexShard indexShard = newStartedShard(false, indexSettings);
-        assertNull(indexShard.getLatestReplicationCheckpoint());
-        closeShards(indexShard);
-    }
-
-    /**
-     *  Test that latestReplicationCheckpoint returns ReplicationCheckpoint for segrep enabled indices
-     */
-    public void testReplicationCheckpointNotNullForSegReb() throws IOException {
-        Settings indexSettings = Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, "SEGMENT").put(Settings.EMPTY).build();
-        final IndexShard indexShard = newStartedShard(indexSettings);
-        final ReplicationCheckpoint replicationCheckpoint = indexShard.getLatestReplicationCheckpoint();
-        assertNotNull(replicationCheckpoint);
-        closeShards(indexShard);
-    }
-
     /**
      * here we are mocking a SegmentReplicationcheckpointPublisher and testing on index shard if CheckpointRefreshListener is added to the InternalrefreshListerners List
      */

diff --git a/server/src/test/java/org/opensearch/index/shard/SegmentReplicationIndexShardTests.java b/server/src/test/java/org/opensearch/index/shard/SegmentReplicationIndexShardTests.java
@@ -14,14 +14,38 @@
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.engine.NRTReplicationEngineFactory;
 import org.opensearch.index.replication.OpenSearchIndexLevelReplicationTestCase;
+import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
 import org.opensearch.indices.replication.common.ReplicationType;
 
+import java.io.IOException;
+
 public class SegmentReplicationIndexShardTests extends OpenSearchIndexLevelReplicationTestCase {
 
     private static final Settings settings = Settings.builder()
         .put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT)
         .build();
 
+    /**
+     *  Test that latestReplicationCheckpoint returns null only for docrep enabled indices
+     */
+    public void testReplicationCheckpointNullForDocRep() throws IOException {
+        Settings indexSettings = Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, "DOCUMENT").put(Settings.EMPTY).build();
+        final IndexShard indexShard = newStartedShard(false, indexSettings);
+        assertNull(indexShard.getLatestReplicationCheckpoint());
+        closeShards(indexShard);
+    }
+
+    /**
+     *  Test that latestReplicationCheckpoint returns ReplicationCheckpoint for segrep enabled indices
+     */
+    public void testReplicationCheckpointNotNullForSegReb() throws IOException {
+        Settings indexSettings = Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, "SEGMENT").put(Settings.EMPTY).build();
+        final IndexShard indexShard = newStartedShard(indexSettings);
+        final ReplicationCheckpoint replicationCheckpoint = indexShard.getLatestReplicationCheckpoint();
+        assertNotNull(replicationCheckpoint);
+        closeShards(indexShard);
+    }
+
     public void testIgnoreShardIdle() throws Exception {
         try (ReplicationGroup shards = createGroup(1, settings, new NRTReplicationEngineFactory())) {
             shards.startAll();