Fix tests

Author: alexey-ivanov-es

server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java

@@ -94,6 +94,7 @@
 
 public class ClusterStateTests extends ESTestCase {
     private static final Setting<Integer> PROJECT_SETTING = Setting.intSetting("project.setting", 0, Setting.Property.ProjectScope);
+    private static final Setting<Integer> PROJECT_SETTING2 = Setting.intSetting("project.setting2", 0, Setting.Property.ProjectScope);
 
     public void testSupersedes() {
         final DiscoveryNode node1 = DiscoveryNodeUtils.builder("node1").roles(emptySet()).build();
@@ -791,7 +792,14 @@ public void testToXContentWithMultipleProjects() throws IOException {
                     {
                       "id": "3LftaL7hgfXAsF60Gm6jcD",
                       "settings": {
-                        "project.setting": "42"
+                        "project.setting": "42",
+                        "project.setting2": "43"
+                      }
+                    },
+                    {
+                      "id": "tb5W0bx765nDVIwqJPw92G",
+                      "settings": {
+                        "project.setting": "1"
                       }
                     }
                   ]
@@ -854,6 +862,7 @@ private static BytesReference sortRoutingTableXContent(String jsonContent) throw
 
     private static ClusterState buildMultiProjectClusterState(DiscoveryNode... nodes) {
         ProjectId projectId1 = ProjectId.fromId("3LftaL7hgfXAsF60Gm6jcD");
+        ProjectId projectId2 = ProjectId.fromId("tb5W0bx765nDVIwqJPw92G");
         final Metadata metadata = Metadata.builder()
             .clusterUUID("N8nJxElHSP23swO0bPLOcQ")
             .clusterUUIDCommitted(true)
@@ -880,7 +889,7 @@ private static ClusterState buildMultiProjectClusterState(DiscoveryNode... nodes
                     )
             )
             .put(
-                ProjectMetadata.builder(ProjectId.fromId("tb5W0bx765nDVIwqJPw92G"))
+                ProjectMetadata.builder(projectId2)
                     .put(
                         IndexMetadata.builder("common-index")
                             .settings(
@@ -901,11 +910,12 @@ private static ClusterState buildMultiProjectClusterState(DiscoveryNode... nodes
             .metadata(metadata)
             .nodes(discoveryNodes.build())
             .routingTable(GlobalRoutingTableTestHelper.buildRoutingTable(metadata, RoutingTable.Builder::addAsNew))
-            .putProjectSettings(projectId1, Settings.builder().put(PROJECT_SETTING.getKey(), 42).build())
+            .putProjectSettings(projectId1, Settings.builder().put(PROJECT_SETTING.getKey(), 42).put(PROJECT_SETTING2.getKey(), 43).build())
+            .putProjectSettings(projectId2, Settings.builder().put(PROJECT_SETTING.getKey(), 1).build())
             .blocks(
                 ClusterBlocks.builder()
                     .addGlobalBlock(Metadata.CLUSTER_READ_ONLY_BLOCK)
-                    .addIndexBlock(ProjectId.fromId("tb5W0bx765nDVIwqJPw92G"), "common-index", IndexMetadata.INDEX_METADATA_BLOCK)
+                    .addIndexBlock(projectId2, "common-index", IndexMetadata.INDEX_METADATA_BLOCK)
                     .addIndexBlock(projectId1, "another-index", IndexMetadata.INDEX_READ_ONLY_BLOCK)
             )
             .build();
@@ -2202,6 +2212,14 @@ public static int expectedChunkCount(ToXContent.Params params, ClusterState clus
             }
         }
 
+        // settings
+        if (metrics.contains(ClusterState.Metric.PROJECTS_SETTINGS)) {
+            Map<ProjectId, Settings> projectsSettings = clusterState.projectsSettings();
+            if (projectsSettings.isEmpty() == false) {
+                chunkCount += 2 + projectsSettings.size();
+            }
+        }
+
         return Math.toIntExact(chunkCount);
     }
 }

server/src/test/java/org/elasticsearch/cluster/metadata/ProjectMetadataTests.java

@@ -559,10 +559,7 @@ public void testToXContentMultiProject() throws IOException {
                         },
                         "data_stream_aliases": {}
                       },
-                      "settings": {
-                         "project.setting.value": "43"
-                       },
-                       "reserved_state": {}
+                      "reserved_state": {}
                     }
                     """,
                 IndexVersion.current(),