Uncomment search-related tests now that searches are tenant aware

Signed-off-by: Daniel Widdis <[email protected]>

Author: dbwiddis

plugin/src/test/java/org/opensearch/ml/rest/RestMLAgentTenantAwareIT.java

@@ -212,10 +212,8 @@ public void testAgentCRUD() throws Exception {
             assertOK(restResponse);
             SearchResponse searchResponse = searchResponseFromResponse(restResponse);
             if (multiTenancyEnabled) {
-                /*- TODO Currently failing because TransportSearchAgentAction is still using client.search()
                 assertEquals(1, searchResponse.getHits().getTotalHits().value);
                 assertEquals(tenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
-                */
             } else {
                 assertEquals(2, searchResponse.getHits().getTotalHits().value);
                 assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
@@ -229,10 +227,8 @@ public void testAgentCRUD() throws Exception {
             assertOK(restResponse);
             SearchResponse searchResponse = searchResponseFromResponse(restResponse);
             if (multiTenancyEnabled) {
-                /*- TODO Currently failing because TransportSearchAgentAction is still using client.search()
                 assertEquals(1, searchResponse.getHits().getTotalHits().value);
                 assertEquals(otherTenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
-                */
             } else {
                 assertEquals(2, searchResponse.getHits().getTotalHits().value);
                 assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));

plugin/src/test/java/org/opensearch/ml/rest/RestMLModelTenantAwareIT.java

@@ -226,10 +226,8 @@ public void testModelCRUD() throws Exception {
             assertOK(restResponse);
             SearchResponse searchResponse = searchResponseFromResponse(restResponse);
             if (multiTenancyEnabled) {
-                /*- TODO Currently failing because MLSearchHandler is still using client.search()
                 assertEquals(1, searchResponse.getHits().getTotalHits().value);
                 assertEquals(tenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
-                */
             } else {
                 assertEquals(3, searchResponse.getHits().getTotalHits().value);
                 assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
@@ -243,10 +241,8 @@ public void testModelCRUD() throws Exception {
             assertOK(restResponse);
             SearchResponse searchResponse = searchResponseFromResponse(restResponse);
             if (multiTenancyEnabled) {
-                /*- TODO Currently failing because MLSearchHandler is still using client.search()
                 assertEquals(1, searchResponse.getHits().getTotalHits().value);
                 assertEquals(otherTenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
-                */
             } else {
                 assertEquals(3, searchResponse.getHits().getTotalHits().value);
                 assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));