Update test for metadata

Signed-off-by: Andre Kurait <[email protected]>
AndreKurait · Dec 10, 2024 · 3511cad · 3511cad
1 parent 9a2edba
commit 3511cad
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/...sFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java b/...sFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java
@@ -85,13 +85,13 @@ private void migrationDocumentsWithClusters(
             // So we explicitly set it.
             String body = String.format(
                 "{" +
-                    "  \"settings\": {" +
-                    "    \"index\": {" +
-                    "      \"number_of_shards\": %d," +
-                    "      \"number_of_replicas\": 0" +
-                    "    }" +
-                    "  }" +
-                    "}",
+                "  \"settings\": {" +
+                "    \"index\": {" +
+                "      \"number_of_shards\": %d," +
+                "      \"number_of_replicas\": 0" +
+                "    }" +
+                "  }" +
+                "}",
                 numberOfShards
             );
             sourceClusterOperations.createIndex(indexName, body);

diff --git a/...Migration/src/test/java/org/opensearch/migrations/MultiTypeMappingTransformationTest.java b/...Migration/src/test/java/org/opensearch/migrations/MultiTypeMappingTransformationTest.java
@@ -146,8 +146,9 @@ public void es5_doesNotAllow_multiTypeConflicts() {
                     "    }" +
                     "  }" +
                     "}";
-            var res = clusterOperations.attemptCreateIndex(originalIndexName, body);
-            assertThat(res, containsString("mapper [field1] cannot be changed from type [long] to [float]"));
+            var res = clusterOperations.put("/" + originalIndexName, body);
+            assertThat(res.getKey(), equalTo(400));
+            assertThat(res.getValue(), containsString("mapper [field1] cannot be changed from type [long] to [float]"));
         }
     }
 }
diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java
@@ -125,13 +125,15 @@ public void createIndex(final String index, final String body) {
     }
 
     @SneakyThrows
-    public String attemptCreateIndex(final String index, final String body) {
-        var createIndexRequest = new HttpPut(clusterUrl + "/" + index);
-        createIndexRequest.setEntity(new StringEntity(body));
-        createIndexRequest.setHeader("Content-Type", "application/json");
-
-        try (var response = httpClient.execute(createIndexRequest)) {
-            return EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+    public Map.Entry<Integer, String> put(final String path, final String body) {
+        final var putRequest = new HttpPut(clusterUrl + path);
+        if (body != null) {
+            putRequest.setEntity(new StringEntity(body));
+            putRequest.setHeader("Content-Type", "application/json");
+        }
+        try (var response = httpClient.execute(putRequest)) {
+            var responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            return Map.entry(response.getCode(), responseBody);
         }
     }