fix tests

Author: ywangd

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/async/AsyncTaskMaintenanceServiceTests.java

@@ -67,7 +67,7 @@ public void testStartStopDuringClusterChanges() {
         final String localNodeId = randomIdentifier();
         final String alternateNodeId = randomIdentifier();
 
-        final Metadata.Builder metadataBuilder = Metadata.builder();
+        final Metadata.Builder metadataBuilder = Metadata.builder(Metadata.EMPTY_METADATA);
         final GlobalRoutingTable.Builder grtBuilder = GlobalRoutingTable.builder();
 
         final ProjectId p1 = ProjectId.fromId("p1");

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/support/QueryableBuiltInRolesSynchronizerTests.java

@@ -330,8 +330,8 @@ public void testSecurityIndexDeleted() {
 
         synchronizer.clusterChanged(event(currentClusterState, previousClusterState));
 
-        verify(previousClusterState, times(1)).metadata();
-        verify(currentClusterState, times(1)).metadata();
+        verify(previousClusterState, times(2)).metadata();
+        verify(currentClusterState, times(2)).metadata();
         verifyNoMoreInteractions(nativeRolesStore, featureService, taskQueue, reservedRolesProvider, threadPool, clusterService);
     }
 

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityIndexManagerTests.java

@@ -95,6 +95,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.oneOf;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
@@ -315,10 +316,13 @@ public void testIndexHealthChangeListeners() {
         final AtomicReference<IndexState> previousState = new AtomicReference<>();
         final AtomicReference<IndexState> currentState = new AtomicReference<>();
         final TriConsumer<ProjectId, IndexState, IndexState> listener = (projId, prevState, state) -> {
-            projectIdRef.set(projId);
-            previousState.set(prevState);
-            currentState.set(state);
-            listenerCalled.set(true);
+            assertThat(projId, oneOf(ProjectId.DEFAULT, projectId));
+            if (projId.equals(projectId)) {
+                projectIdRef.set(projId);
+                previousState.set(prevState);
+                currentState.set(state);
+                listenerCalled.set(true);
+            }
         };
         manager.addStateListener(listener);
 
@@ -573,9 +577,11 @@ public void testIndexOutOfDateListeners() {
         manager.clusterChanged(new ClusterChangedEvent("test-event", clusterState, clusterState));
         AtomicBoolean upToDateChanged = new AtomicBoolean();
         manager.addStateListener((projId, prev, current) -> {
-            assertThat(projId, equalTo(projectId));
-            listenerCalled.set(true);
-            upToDateChanged.set(prev.isIndexUpToDate != current.isIndexUpToDate);
+            assertThat(projId, oneOf(ProjectId.DEFAULT, projectId));
+            if (projId.equals(projectId)) {
+                listenerCalled.set(true);
+                upToDateChanged.set(prev.isIndexUpToDate != current.isIndexUpToDate);
+            }
         });
         assertThat(manager.getProject(projectId).isIndexUpToDate(), is(true));
 
@@ -779,7 +785,7 @@ public void testGetRoleMappingsCleanupMigrationStatus() {
             metadataBuilder.put(builder.build());
 
             // No role mappings in cluster state yet
-            metadataBuilder.putCustom(RoleMappingMetadata.TYPE, new RoleMappingMetadata(Set.of()));
+            metadataBuilder.getProject(projectId).putCustom(RoleMappingMetadata.TYPE, new RoleMappingMetadata(Set.of()));
 
             assertThat(
                 SecurityIndexManager.getRoleMappingsCleanupMigrationStatus(
@@ -803,10 +809,13 @@ public void testGetRoleMappingsCleanupMigrationStatus() {
             metadataBuilder.put(builder.build());
 
             // Role mappings in cluster state with fallback name
-            metadataBuilder.putCustom(
-                RoleMappingMetadata.TYPE,
-                new RoleMappingMetadata(Set.of(new ExpressionRoleMapping(RoleMappingMetadata.FALLBACK_NAME, null, null, null, null, true)))
-            );
+            metadataBuilder.getProject(projectId)
+                .putCustom(
+                    RoleMappingMetadata.TYPE,
+                    new RoleMappingMetadata(
+                        Set.of(new ExpressionRoleMapping(RoleMappingMetadata.FALLBACK_NAME, null, null, null, null, true))
+                    )
+                );
 
             assertThat(
                 SecurityIndexManager.getRoleMappingsCleanupMigrationStatus(
@@ -830,10 +839,11 @@ public void testGetRoleMappingsCleanupMigrationStatus() {
             metadataBuilder.put(builder.build());
 
             // Role mappings in cluster state
-            metadataBuilder.putCustom(
-                RoleMappingMetadata.TYPE,
-                new RoleMappingMetadata(Set.of(new ExpressionRoleMapping("role_mapping_1", null, null, null, null, true)))
-            );
+            metadataBuilder.getProject(projectId)
+                .putCustom(
+                    RoleMappingMetadata.TYPE,
+                    new RoleMappingMetadata(Set.of(new ExpressionRoleMapping("role_mapping_1", null, null, null, null, true)))
+                );
 
             assertThat(
                 SecurityIndexManager.getRoleMappingsCleanupMigrationStatus(
@@ -1090,7 +1100,7 @@ private ClusterState.Builder createClusterState(
         String mappings,
         Map<String, SystemIndexDescriptor.MappingsVersion> compatibilityVersions
     ) {
-        final Metadata metadata = Metadata.builder()
+        final Metadata metadata = Metadata.builder(Metadata.EMPTY_METADATA)
             .put(createProjectMetadata(projectId, indexName, aliasName, format, state, mappings))
             .build();
         final GlobalRoutingTable routingTable = GlobalRoutingTableTestHelper.buildRoutingTable(metadata, RoutingTable.Builder::addAsNew);
@@ -1141,7 +1151,10 @@ public static ClusterState state(ProjectId projectId) {
             .masterNodeId("1")
             .localNodeId("1")
             .build();
-        final Metadata metadata = Metadata.builder().put(ProjectMetadata.builder(projectId)).generateClusterUuidIfNeeded().build();
+        final Metadata metadata = Metadata.builder(Metadata.EMPTY_METADATA)
+            .put(ProjectMetadata.builder(projectId))
+            .generateClusterUuidIfNeeded()
+            .build();
         return ClusterState.builder(CLUSTER_NAME).nodes(nodes).metadata(metadata).build();
     }