disable assertions since too many tests add/remove default project

Author: ywangd

server/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java

@@ -363,8 +363,9 @@ private static ProjectsDelta calculateProjectDelta(Metadata previousMetadata, Me
         final Set<ProjectId> removed = Collections.unmodifiableSet(
             Sets.difference(previousMetadata.projects().keySet(), currentMetadata.projects().keySet())
         );
-        assert added.contains(ProjectId.DEFAULT) == false;
-        assert removed.contains(ProjectId.DEFAULT) == false;
+        // TODO: Enable the following assertions once tests no longer add or remove default projects
+        // assert added.contains(ProjectId.DEFAULT) == false;
+        // assert removed.contains(ProjectId.DEFAULT) == false;
         return new ProjectsDelta(added, removed);
     }
 

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(Metadata.EMPTY_METADATA);
+        final Metadata.Builder metadataBuilder = Metadata.builder();
         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(2)).metadata();
-        verify(currentClusterState, times(2)).metadata();
+        verify(previousClusterState, times(1)).metadata();
+        verify(currentClusterState, times(1)).metadata();
         verifyNoMoreInteractions(nativeRolesStore, featureService, taskQueue, reservedRolesProvider, threadPool, clusterService);
     }
 

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

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