Moved test data classes to .data package

nibix · nibix · commit 0f6517b2a875 · 2025-10-07T13:19:15.000+02:00
Signed-off-by: Nils Bandener &lt;nils.bandener@eliatra.com&gt;
diff --git a/src/integrationTest/java/org/opensearch/security/http/ServiceAccountAuthenticationTest.java b/src/integrationTest/java/org/opensearch/security/http/ServiceAccountAuthenticationTest.java
@@ -20,11 +20,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.opensearch.test.framework.TestIndex;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.cluster.ClusterManager;
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
+import org.opensearch.test.framework.data.TestIndex;
 
 import static org.opensearch.security.support.ConfigConstants.SECURITY_RESTAPI_ROLES_ENABLED;
 import static org.opensearch.security.support.ConfigConstants.SECURITY_SYSTEM_INDICES_ENABLED_KEY;
diff --git a/src/integrationTest/java/org/opensearch/security/privileges/PrivilegesEvaluatorTest.java b/src/integrationTest/java/org/opensearch/security/privileges/PrivilegesEvaluatorTest.java
@@ -19,12 +19,12 @@
 
 import org.opensearch.script.mustache.MustacheModulePlugin;
 import org.opensearch.script.mustache.RenderSearchTemplateAction;
-import org.opensearch.test.framework.TestIndex;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.TestSecurityConfig.Role;
 import org.opensearch.test.framework.cluster.ClusterManager;
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
+import org.opensearch.test.framework.data.TestIndex;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
diff --git a/src/integrationTest/java/org/opensearch/security/privileges/dlsfls/FlsFmIntegrationTests.java b/src/integrationTest/java/org/opensearch/security/privileges/dlsfls/FlsFmIntegrationTests.java
@@ -28,12 +28,12 @@
 import org.bouncycastle.util.encoders.Hex;
 
 import org.opensearch.plugin.mapper.MapperSizePlugin;
-import org.opensearch.test.framework.TestData;
-import org.opensearch.test.framework.TestIndex;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.cluster.ClusterManager;
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
+import org.opensearch.test.framework.data.TestData;
+import org.opensearch.test.framework.data.TestIndex;
 
 import com.rfksystems.blake2b.Blake2b;
 
diff --git a/src/integrationTest/java/org/opensearch/security/privileges/int_tests/DataStreamAuthorizationReadOnlyIntTests.java b/src/integrationTest/java/org/opensearch/security/privileges/int_tests/DataStreamAuthorizationReadOnlyIntTests.java
@@ -21,20 +21,20 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.opensearch.test.framework.TestComponentTemplate;
-import org.opensearch.test.framework.TestDataStream;
-import org.opensearch.test.framework.TestIndex;
-import org.opensearch.test.framework.TestIndexOrAliasOrDatastream;
-import org.opensearch.test.framework.TestIndexTemplate;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
+import org.opensearch.test.framework.data.TestComponentTemplate;
+import org.opensearch.test.framework.data.TestDataStream;
+import org.opensearch.test.framework.data.TestIndex;
+import org.opensearch.test.framework.data.TestIndexOrAliasOrDatastream;
+import org.opensearch.test.framework.data.TestIndexTemplate;
 import org.opensearch.test.framework.matcher.RestIndexMatchers;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.opensearch.test.framework.TestIndex.openSearchSecurityConfigIndex;
 import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
+import static org.opensearch.test.framework.data.TestIndex.openSearchSecurityConfigIndex;
 import static org.opensearch.test.framework.matcher.RestIndexMatchers.OnResponseIndexMatcher.containsExactly;
 import static org.opensearch.test.framework.matcher.RestIndexMatchers.OnUserIndexMatcher.limitedTo;
 import static org.opensearch.test.framework.matcher.RestIndexMatchers.OnUserIndexMatcher.limitedToNone;
@@ -523,9 +523,7 @@ public void search_termsAggregation_index() throws Exception {
             if (user == SUPER_UNLIMITED_USER || user == UNLIMITED_USER) {
                 assertThat(
                     httpResponse,
-                    containsExactly(ALL_INDICES).at("aggregations.indices.buckets[*].key")
-                        .reducedBy(user.reference(READ))
-                        .whenEmpty(isOk())
+                    containsExactly(ALL_INDICES).at("aggregations.indices.buckets[*].key").reducedBy(user.reference(READ)).whenEmpty(isOk())
                 );
             } else {
                 // Users without full privileges will not see hidden indices here; thus on a cluster with only data streams, the result is
@@ -587,8 +585,7 @@ public void getDataStream_all() throws Exception {
             // The legacy mode does not support dnfof for indices:admin/data_stream/get
             assertThat(
                 httpResponse,
-                containsExactly(ALL_DATA_STREAMS).at("$.data_streams[*].name")
-                    .butForbiddenIfIncomplete(user.reference(READ))
+                containsExactly(ALL_DATA_STREAMS).at("$.data_streams[*].name").butForbiddenIfIncomplete(user.reference(READ))
             );
         }
     }
@@ -600,8 +597,7 @@ public void getDataStream_wildcard() throws Exception {
             // The legacy mode does not support dnfof for indices:admin/data_stream/get
             assertThat(
                 httpResponse,
-                containsExactly(ALL_DATA_STREAMS).at("$.data_streams[*].name")
-                    .butForbiddenIfIncomplete(user.reference(READ))
+                containsExactly(ALL_DATA_STREAMS).at("$.data_streams[*].name").butForbiddenIfIncomplete(user.reference(READ))
             );
         }
     }
@@ -648,8 +644,7 @@ public void getDataStreamStats_all() throws Exception {
             // The legacy mode does not support dnfof for indices:monitor/data_stream/stats
             assertThat(
                 httpResponse,
-                containsExactly(ALL_DATA_STREAMS).at("$.data_streams[*].data_stream")
-                    .butForbiddenIfIncomplete(user.reference(READ))
+                containsExactly(ALL_DATA_STREAMS).at("$.data_streams[*].data_stream").butForbiddenIfIncomplete(user.reference(READ))
             );
         }
     }
@@ -661,8 +656,7 @@ public void getDataStreamStats_wildcard() throws Exception {
             // The legacy mode does not support dnfof for indices:monitor/data_stream/stats
             assertThat(
                 httpResponse,
-                containsExactly(ALL_DATA_STREAMS).at("$.data_streams[*].data_stream")
-                    .butForbiddenIfIncomplete(user.reference(READ))
+                containsExactly(ALL_DATA_STREAMS).at("$.data_streams[*].data_stream").butForbiddenIfIncomplete(user.reference(READ))
             );
         }
     }
diff --git a/src/integrationTest/java/org/opensearch/security/privileges/int_tests/DataStreamAuthorizationReadWriteIntTests.java b/src/integrationTest/java/org/opensearch/security/privileges/int_tests/DataStreamAuthorizationReadWriteIntTests.java
@@ -26,16 +26,16 @@
 import org.junit.runner.RunWith;
 
 import org.opensearch.action.admin.indices.refresh.RefreshRequest;
-import org.opensearch.test.framework.TestComponentTemplate;
-import org.opensearch.test.framework.TestDataStream;
-import org.opensearch.test.framework.TestIndex;
-import org.opensearch.test.framework.TestIndexOrAliasOrDatastream;
-import org.opensearch.test.framework.TestIndexTemplate;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.TestSecurityConfig.Role;
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
 import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
+import org.opensearch.test.framework.data.TestComponentTemplate;
+import org.opensearch.test.framework.data.TestDataStream;
+import org.opensearch.test.framework.data.TestIndex;
+import org.opensearch.test.framework.data.TestIndexOrAliasOrDatastream;
+import org.opensearch.test.framework.data.TestIndexTemplate;
 import org.opensearch.test.framework.matcher.RestIndexMatchers;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/src/integrationTest/java/org/opensearch/security/privileges/int_tests/IndexAuthorizationReadOnlyIntTests.java b/src/integrationTest/java/org/opensearch/security/privileges/int_tests/IndexAuthorizationReadOnlyIntTests.java
@@ -30,21 +30,21 @@
 import org.opensearch.plugins.Plugin;
 import org.opensearch.plugins.SystemIndexPlugin;
 import org.opensearch.script.mustache.MustacheModulePlugin;
-import org.opensearch.test.framework.TestAlias;
-import org.opensearch.test.framework.TestData;
-import org.opensearch.test.framework.TestIndex;
-import org.opensearch.test.framework.TestIndexOrAliasOrDatastream;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
+import org.opensearch.test.framework.data.TestAlias;
+import org.opensearch.test.framework.data.TestData;
+import org.opensearch.test.framework.data.TestIndex;
+import org.opensearch.test.framework.data.TestIndexOrAliasOrDatastream;
 import org.opensearch.test.framework.matcher.RestIndexMatchers;
 
 import static java.util.stream.Collectors.joining;
 import static org.apache.commons.lang3.StringEscapeUtils.escapeJson;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.opensearch.test.framework.TestIndex.openSearchSecurityConfigIndex;
 import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
 import static org.opensearch.test.framework.cluster.TestRestClient.json;
+import static org.opensearch.test.framework.data.TestIndex.openSearchSecurityConfigIndex;
 import static org.opensearch.test.framework.matcher.RestIndexMatchers.IndexMatcher;
 import static org.opensearch.test.framework.matcher.RestIndexMatchers.OnResponseIndexMatcher.containsExactly;
 import static org.opensearch.test.framework.matcher.RestIndexMatchers.OnUserIndexMatcher.limitedTo;
@@ -697,9 +697,7 @@ public void search_staticIndices_systemIndex_alias() throws Exception {
             } else if (clusterConfig == ClusterConfig.LEGACY_PRIVILEGES_EVALUATION_SYSTEM_INDEX_PERMISSION) {
                 assertThat(
                     httpResponse,
-                    containsExactly(system_index_plugin).at("hits.hits[*]._index")
-                        .reducedBy(user.reference(READ))
-                        .whenEmpty(isForbidden())
+                    containsExactly(system_index_plugin).at("hits.hits[*]._index").reducedBy(user.reference(READ)).whenEmpty(isForbidden())
                 );
             } else {
                 if (user.reference(READ).covers(alias_with_system_index)) {
diff --git a/src/integrationTest/java/org/opensearch/security/privileges/int_tests/IndexAuthorizationReadWriteIntTests.java b/src/integrationTest/java/org/opensearch/security/privileges/int_tests/IndexAuthorizationReadWriteIntTests.java
@@ -28,14 +28,14 @@
 import org.opensearch.action.admin.indices.refresh.RefreshRequest;
 import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.test.framework.TestAlias;
-import org.opensearch.test.framework.TestIndex;
-import org.opensearch.test.framework.TestIndexOrAliasOrDatastream;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.TestSecurityConfig.Role;
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
 import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
+import org.opensearch.test.framework.data.TestAlias;
+import org.opensearch.test.framework.data.TestIndex;
+import org.opensearch.test.framework.data.TestIndexOrAliasOrDatastream;
 import org.opensearch.test.framework.matcher.RestIndexMatchers;
 import org.opensearch.transport.client.Client;
 
diff --git a/src/integrationTest/java/org/opensearch/security/privileges/int_tests/SnapshotAuthorizationIntTests.java b/src/integrationTest/java/org/opensearch/security/privileges/int_tests/SnapshotAuthorizationIntTests.java
@@ -25,11 +25,11 @@
 import org.junit.runner.RunWith;
 
 import org.opensearch.action.admin.indices.refresh.RefreshRequest;
-import org.opensearch.test.framework.TestIndex;
-import org.opensearch.test.framework.TestIndexOrAliasOrDatastream;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
+import org.opensearch.test.framework.data.TestIndex;
+import org.opensearch.test.framework.data.TestIndexOrAliasOrDatastream;
 import org.opensearch.test.framework.matcher.RestIndexMatchers;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/src/integrationTest/java/org/opensearch/test/framework/TestSecurityConfig.java b/src/integrationTest/java/org/opensearch/test/framework/TestSecurityConfig.java
@@ -72,6 +72,7 @@
 import org.opensearch.security.securityconf.impl.v7.RoleV7;
 import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.test.framework.cluster.OpenSearchClientProvider.UserCredentialsHolder;
+import org.opensearch.test.framework.data.TestIndex;
 import org.opensearch.test.framework.matcher.RestIndexMatchers;
 import org.opensearch.transport.client.Client;
 
diff --git a/src/integrationTest/java/org/opensearch/test/framework/cluster/LocalCluster.java b/src/integrationTest/java/org/opensearch/test/framework/cluster/LocalCluster.java
@@ -58,17 +58,17 @@
 import org.opensearch.test.framework.AuthFailureListeners;
 import org.opensearch.test.framework.AuthzDomain;
 import org.opensearch.test.framework.OnBehalfOfConfig;
-import org.opensearch.test.framework.TestAlias;
-import org.opensearch.test.framework.TestComponentTemplate;
-import org.opensearch.test.framework.TestDataStream;
-import org.opensearch.test.framework.TestIndex;
-import org.opensearch.test.framework.TestIndexTemplate;
 import org.opensearch.test.framework.TestSecurityConfig;
 import org.opensearch.test.framework.TestSecurityConfig.Role;
 import org.opensearch.test.framework.XffConfig;
 import org.opensearch.test.framework.audit.TestRuleAuditLogSink;
 import org.opensearch.test.framework.certificate.CertificateData;
 import org.opensearch.test.framework.certificate.TestCertificates;
+import org.opensearch.test.framework.data.TestAlias;
+import org.opensearch.test.framework.data.TestComponentTemplate;
+import org.opensearch.test.framework.data.TestDataStream;
+import org.opensearch.test.framework.data.TestIndex;
+import org.opensearch.test.framework.data.TestIndexTemplate;
 import org.opensearch.transport.client.Client;
 
 /**
diff --git a/src/integrationTest/java/org/opensearch/test/framework/data/TestAlias.java b/src/integrationTest/java/org/opensearch/test/framework/data/TestAlias.java
@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.test.framework;
+package org.opensearch.test.framework.data;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/integrationTest/java/org/opensearch/test/framework/data/TestComponentTemplate.java b/src/integrationTest/java/org/opensearch/test/framework/data/TestComponentTemplate.java
@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.test.framework;
+package org.opensearch.test.framework.data;
 
 import java.util.Map;
 
diff --git a/src/integrationTest/java/org/opensearch/test/framework/data/TestData.java b/src/integrationTest/java/org/opensearch/test/framework/data/TestData.java
@@ -8,7 +8,7 @@
  * Modifications Copyright OpenSearch Contributors. See
  * GitHub history for details.
  */
-package org.opensearch.test.framework;
+package org.opensearch.test.framework.data;
 
 import java.nio.ByteBuffer;
 import java.time.Instant;
@@ -146,6 +146,8 @@ public void createIndex(Client client, String name, Settings settings) {
                 + refreshAfter
         );
 
+        Random random = new Random(subRandomSeed);
+        long start = System.currentTimeMillis();
         String mapping = """
             {
               "_doc": {
@@ -178,18 +180,35 @@ public void createIndex(Client client, String name, Settings settings) {
             """;
 
         client.admin().indices().create(new CreateIndexRequest(name).settings(settings).mapping(mapping)).actionGet();
+        int nextRefresh = (int) Math.floor((random.nextGaussian() * 0.5 + 0.5) * refreshAfter);
+        int i = 0;
 
-        this.putDocuments(client, name, -1);
+        for (Map.Entry<String, TestDocument> entry : allDocuments.entrySet()) {
+            String id = entry.getKey();
+            TestDocument document = entry.getValue();
+
+            client.index(new IndexRequest(name).source(document.content, XContentType.JSON).id(id)).actionGet();
+
+            if (i > nextRefresh) {
+                client.admin().indices().refresh(new RefreshRequest(name)).actionGet();
+                double g = random.nextGaussian();
+
+                nextRefresh = (int) Math.floor((g * 0.5 + 1) * refreshAfter) + i + 1;
+            }
+
+            i++;
+        }
+
+        client.admin().indices().refresh(new RefreshRequest(name)).actionGet();
+
+        for (String id : deletedDocuments) {
+            client.delete(new DeleteRequest(name, id)).actionGet();
+        }
+
+        client.admin().indices().refresh(new RefreshRequest(name)).actionGet();
+        log.info("Test index creation finished after " + (System.currentTimeMillis() - start) + " ms");
     }
 
-    /**
-     * Writes the documents from this TestData instance to the given index.
-     *
-     * @param client the client to be used
-     * @param name the name of the target index
-     * @param rolloverAfter if this is not -1, a rollover operation will be executed for every n documents. This is useful
-     *                      for creating several generations of data stream backing indices.
-     */
     public void putDocuments(Client client, String name, int rolloverAfter) {
         try {
             Random random = new Random(subRandomSeed);
@@ -209,12 +228,15 @@ public void putDocuments(Client client, String name, int rolloverAfter) {
 
                 if (i > nextRefresh) {
                     client.admin().indices().refresh(new RefreshRequest(name)).actionGet();
-                    nextRefresh = (int) Math.floor((random.nextGaussian() * 0.5 + 1) * refreshAfter) + i + 1;
+                    double g = random.nextGaussian();
+
+                    nextRefresh = (int) Math.floor((g * 0.5 + 1) * refreshAfter) + i + 1;
+                    log.debug("refresh at " + i + " " + g + " " + (g * 0.5 + 1));
                 }
 
                 if (i > nextRollover) {
-                    // By using rollover, we make sure that we get several generations of backing indices
                     client.admin().indices().rolloverIndex(new RolloverRequest(name, null));
+
                     nextRollover += rolloverAfter;
                 }
 
diff --git a/src/integrationTest/java/org/opensearch/test/framework/data/TestDataStream.java b/src/integrationTest/java/org/opensearch/test/framework/data/TestDataStream.java
@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.test.framework;
+package org.opensearch.test.framework.data;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/src/integrationTest/java/org/opensearch/test/framework/data/TestIndex.java b/src/integrationTest/java/org/opensearch/test/framework/data/TestIndex.java
diff --git a/src/integrationTest/java/org/opensearch/test/framework/data/TestIndexOrAliasOrDatastream.java b/src/integrationTest/java/org/opensearch/test/framework/data/TestIndexOrAliasOrDatastream.java
diff --git a/src/integrationTest/java/org/opensearch/test/framework/data/TestIndexTemplate.java b/src/integrationTest/java/org/opensearch/test/framework/data/TestIndexTemplate.java
diff --git a/src/integrationTest/java/org/opensearch/test/framework/data/TestMapping.java b/src/integrationTest/java/org/opensearch/test/framework/data/TestMapping.java
diff --git a/src/integrationTest/java/org/opensearch/test/framework/matcher/RestDocumentMatchers.java b/src/integrationTest/java/org/opensearch/test/framework/matcher/RestDocumentMatchers.java
diff --git a/src/integrationTest/java/org/opensearch/test/framework/matcher/RestIndexMatchers.java b/src/integrationTest/java/org/opensearch/test/framework/matcher/RestIndexMatchers.java
