[Rename] client/test

client/rest/src/test/java/org/elasticsearch/client/DeadHostStateTests.java

@@ -19,6 +19,8 @@
 
 package org.elasticsearch.client;
 
+import org.opensearch.client.RestClientTestCase;
+
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 

client/rest/src/test/java/org/elasticsearch/client/FailureTrackingResponseListenerTests.java

@@ -27,6 +27,7 @@
 import org.apache.http.message.BasicHttpResponse;
 import org.apache.http.message.BasicRequestLine;
 import org.apache.http.message.BasicStatusLine;
+import org.opensearch.client.RestClientTestCase;
 
 import java.util.concurrent.atomic.AtomicReference;
 

client/rest/src/test/java/org/elasticsearch/client/HasAttributeNodeSelectorTests.java

@@ -21,6 +21,7 @@
 
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.Node.Roles;
+import org.opensearch.client.RestClientTestCase;
 
 import java.util.ArrayList;
 import java.util.Arrays;

client/rest/src/test/java/org/elasticsearch/client/HeapBufferedAsyncResponseConsumerTests.java

@@ -32,6 +32,7 @@
 import org.apache.http.nio.IOControl;
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
 import org.apache.http.protocol.HttpContext;
+import org.opensearch.client.RestClientTestCase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

client/rest/src/test/java/org/elasticsearch/client/NodeSelectorTests.java

@@ -21,6 +21,7 @@
 
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.Node.Roles;
+import org.opensearch.client.RestClientTestCase;
 
 import java.util.ArrayList;
 import java.util.Collections;

client/rest/src/test/java/org/elasticsearch/client/NodeTests.java

@@ -21,6 +21,7 @@
 
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.Node.Roles;
+import org.opensearch.client.RestClientTestCase;
 
 import java.util.Arrays;
 import java.util.Collections;

client/rest/src/test/java/org/elasticsearch/client/PreferHasAttributeNodeSelectorTests.java

@@ -21,6 +21,7 @@
 
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.Node.Roles;
+import org.opensearch.client.RestClientTestCase;
 
 import java.util.ArrayList;
 import java.util.Arrays;

client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java

@@ -40,6 +40,7 @@
 import org.apache.http.nio.entity.NByteArrayEntity;
 import org.apache.http.nio.entity.NStringEntity;
 import org.apache.http.util.EntityUtils;
+import org.opensearch.client.RestClientTestCase;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

client/rest/src/test/java/org/elasticsearch/client/RequestOptionsTests.java

@@ -22,6 +22,7 @@
 import org.apache.http.Header;
 import org.apache.http.client.config.RequestConfig;
 import org.elasticsearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory;
+import org.opensearch.client.RestClientTestCase;
 
 import java.util.ArrayList;
 import java.util.Collections;

client/rest/src/test/java/org/elasticsearch/client/RequestTests.java

@@ -25,6 +25,7 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.nio.entity.NStringEntity;
 import org.elasticsearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory;
+import org.opensearch.client.RestClientTestCase;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

client/rest/src/test/java/org/elasticsearch/client/ResponseExceptionTests.java

@@ -32,6 +32,7 @@
 import org.apache.http.message.BasicRequestLine;
 import org.apache.http.message.BasicStatusLine;
 import org.apache.http.util.EntityUtils;
+import org.opensearch.client.RestClientTestCase;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java

@@ -27,6 +27,7 @@
 import org.elasticsearch.mocksocket.MockHttpServer;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.opensearch.client.RestClientTestCase;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;

client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java

@@ -24,6 +24,7 @@
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.apache.http.message.BasicHeader;
+import org.opensearch.client.RestClientTestCase;
 
 import java.io.IOException;
 import java.util.Base64;
@@ -163,9 +164,9 @@ public RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder reques
 
     public void testBuildCloudId() throws IOException {
         String host = "us-east-1.aws.found.io";
-        String esId = "elasticsearch";
-        String kibanaId = "kibana";
-        String toEncode = host + "$" + esId + "$" + kibanaId;
+        String opensearchId = "opensearch";
+        String dashboardsId = "dashboards";
+        String toEncode = host + "$" + opensearchId + "$" + dashboardsId;
         String encodedId = Base64.getEncoder().encodeToString(toEncode.getBytes(UTF8));
         assertNotNull(RestClient.builder(encodedId));
         assertNotNull(RestClient.builder("humanReadable:" + encodedId));
@@ -187,28 +188,28 @@ public void testBuildCloudId() throws IOException {
 
         RestClient client = RestClient.builder(encodedId).build();
         assertThat(client.getNodes().size(), equalTo(1));
-        assertThat(client.getNodes().get(0).getHost().getHostName(), equalTo(esId + "." + host));
+        assertThat(client.getNodes().get(0).getHost().getHostName(), equalTo(opensearchId + "." + host));
         assertThat(client.getNodes().get(0).getHost().getPort(), equalTo(443));
         assertThat(client.getNodes().get(0).getHost().getSchemeName(), equalTo("https"));
         client.close();
     }
 
     public void testBuildCloudIdWithPort() throws IOException {
         String host = "us-east-1.aws.found.io";
-        String esId = "elasticsearch";
-        String kibanaId = "kibana";
+        String opensearchId = "opensearch";
+        String dashboardsId = "dashboards";
         String port = "9443";
-        String toEncode = host + ":" + port + "$" + esId + "$" + kibanaId;
+        String toEncode = host + ":" + port + "$" + opensearchId + "$" + dashboardsId;
         String encodedId = Base64.getEncoder().encodeToString(toEncode.getBytes(UTF8));
 
         RestClient client = RestClient.builder("humanReadable:" + encodedId).build();
         assertThat(client.getNodes().size(), equalTo(1));
         assertThat(client.getNodes().get(0).getHost().getPort(), equalTo(9443));
-        assertThat(client.getNodes().get(0).getHost().getHostName(), equalTo(esId + "." + host));
+        assertThat(client.getNodes().get(0).getHost().getHostName(), equalTo(opensearchId + "." + host));
         assertThat(client.getNodes().get(0).getHost().getSchemeName(), equalTo("https"));
         client.close();
 
-        toEncode = host + ":" + "123:foo" + "$" + esId + "$" + kibanaId;
+        toEncode = host + ":" + "123:foo" + "$" + opensearchId + "$" + dashboardsId;
         encodedId = Base64.getEncoder().encodeToString(toEncode.getBytes(UTF8));
 
         try {

client/rest/src/test/java/org/elasticsearch/client/RestClientGzipCompressionTests.java

@@ -30,6 +30,7 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.opensearch.client.RestClientTestCase;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsIntegTests.java

@@ -28,6 +28,8 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.opensearch.client.RestClientTestCase;
+import org.opensearch.client.RestClientTestUtil;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -41,9 +43,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.client.RestClientTestUtil.getAllStatusCodes;
-import static org.elasticsearch.client.RestClientTestUtil.randomErrorNoRetryStatusCode;
-import static org.elasticsearch.client.RestClientTestUtil.randomOkStatusCode;
+import static org.opensearch.client.RestClientTestUtil.getAllStatusCodes;
+import static org.opensearch.client.RestClientTestUtil.randomErrorNoRetryStatusCode;
+import static org.opensearch.client.RestClientTestUtil.randomOkStatusCode;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;

client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java

@@ -24,6 +24,7 @@
 import org.apache.http.HttpHost;
 import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
 import org.junit.After;
+import org.opensearch.client.RestClientTestCase;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -37,10 +38,10 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static org.elasticsearch.client.RestClientTestUtil.randomErrorNoRetryStatusCode;
-import static org.elasticsearch.client.RestClientTestUtil.randomErrorRetryStatusCode;
-import static org.elasticsearch.client.RestClientTestUtil.randomHttpMethod;
-import static org.elasticsearch.client.RestClientTestUtil.randomOkStatusCode;
+import static org.opensearch.client.RestClientTestUtil.randomErrorNoRetryStatusCode;
+import static org.opensearch.client.RestClientTestUtil.randomErrorRetryStatusCode;
+import static org.opensearch.client.RestClientTestUtil.randomHttpMethod;
+import static org.opensearch.client.RestClientTestUtil.randomOkStatusCode;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertEquals;

client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostIntegTests.java

@@ -42,6 +42,8 @@
 import org.elasticsearch.mocksocket.MockHttpServer;
 import org.junit.After;
 import org.junit.Before;
+import org.opensearch.client.RestClientTestCase;
+import org.opensearch.client.RestClientTestUtil;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -60,10 +62,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.elasticsearch.client.RestClientTestUtil.getAllStatusCodes;
-import static org.elasticsearch.client.RestClientTestUtil.getHttpMethods;
-import static org.elasticsearch.client.RestClientTestUtil.randomHttpMethod;
-import static org.elasticsearch.client.RestClientTestUtil.randomStatusCode;
+import static org.opensearch.client.RestClientTestUtil.getAllStatusCodes;
+import static org.opensearch.client.RestClientTestUtil.getHttpMethods;
+import static org.opensearch.client.RestClientTestUtil.randomHttpMethod;
+import static org.opensearch.client.RestClientTestUtil.randomStatusCode;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;

client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java

@@ -53,6 +53,8 @@
 import org.junit.Before;
 import org.mockito.ArgumentCaptor;
 import org.mockito.stubbing.Answer;
+import org.opensearch.client.RestClientTestCase;
+import org.opensearch.client.RestClientTestUtil;
 
 import javax.net.ssl.SSLHandshakeException;
 import java.io.IOException;
@@ -74,10 +76,10 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static java.util.Collections.singletonList;
-import static org.elasticsearch.client.RestClientTestUtil.getAllErrorStatusCodes;
-import static org.elasticsearch.client.RestClientTestUtil.getHttpMethods;
-import static org.elasticsearch.client.RestClientTestUtil.getOkStatusCodes;
-import static org.elasticsearch.client.RestClientTestUtil.randomStatusCode;
+import static org.opensearch.client.RestClientTestUtil.getAllErrorStatusCodes;
+import static org.opensearch.client.RestClientTestUtil.getHttpMethods;
+import static org.opensearch.client.RestClientTestUtil.getOkStatusCodes;
+import static org.opensearch.client.RestClientTestUtil.randomStatusCode;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -519,7 +521,7 @@ private void assertDeprecationWarnings(List<String> warningHeaderTexts, List<Str
     }
 
     /**
-     * Emulates Elasticsearch's HeaderWarningLogger.formatWarning in simple
+     * Emulates OpenSearch's HeaderWarningLogger.formatWarning in simple
      * cases. We don't have that available because we're testing against 1.7.
      */
     private static String formatWarningWithoutDate(String warningBody) {

client/rest/src/test/java/org/elasticsearch/client/RestClientTests.java

@@ -26,6 +26,7 @@
 import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
 import org.elasticsearch.client.RestClient.NodeTuple;
+import org.opensearch.client.RestClientTestCase;
 
 import java.io.IOException;
 import java.net.URI;

client/sniffer/src/test/java/org/elasticsearch/client/sniff/ElasticsearchNodesSnifferParseTests.java

@@ -26,7 +26,7 @@
 import org.apache.http.entity.InputStreamEntity;
 import org.elasticsearch.client.Node;
 import org.elasticsearch.client.Node.Roles;
-import org.elasticsearch.client.RestClientTestCase;
+import org.opensearch.client.RestClientTestCase;
 import org.elasticsearch.client.sniff.ElasticsearchNodesSniffer.Scheme;
 
 import java.io.IOException;
@@ -46,7 +46,7 @@
 
 /**
  * Test parsing the response from the {@code /_nodes/http} API from fixed
- * versions of Elasticsearch.
+ * versions of OpenSearch.
  */
 public class ElasticsearchNodesSnifferParseTests extends RestClientTestCase {
 

client/sniffer/src/test/java/org/elasticsearch/client/sniff/ElasticsearchNodesSnifferTests.java

@@ -34,7 +34,7 @@
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientTestCase;
+import org.opensearch.client.RestClientTestCase;
 import org.elasticsearch.mocksocket.MockHttpServer;
 import org.junit.After;
 import org.junit.Before;
@@ -179,7 +179,7 @@ private static SniffResponse buildSniffResponse(ElasticsearchNodesSniffer.Scheme
         JsonGenerator generator = jsonFactory.createGenerator(writer);
         generator.writeStartObject();
         if (getRandom().nextBoolean()) {
-            generator.writeStringField("cluster_name", "elasticsearch");
+            generator.writeStringField("cluster_name", "opensearch");
         }
         if (getRandom().nextBoolean()) {
             generator.writeObjectFieldStart("bogus_object");

client/sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java

@@ -22,7 +22,7 @@
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.Node;
 import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientTestCase;
+import org.opensearch.client.RestClientTestCase;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

client/sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java

@@ -22,7 +22,7 @@
 import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientTestCase;
+import org.opensearch.client.RestClientTestCase;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

client/sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferTests.java

@@ -22,7 +22,7 @@
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.Node;
 import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientTestCase;
+import org.opensearch.client.RestClientTestCase;
 import org.elasticsearch.client.sniff.Sniffer.DefaultScheduler;
 import org.elasticsearch.client.sniff.Sniffer.Scheduler;
 import org.mockito.invocation.InvocationOnMock;

client/test/build.gradle

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.build'
+apply plugin: 'opensearch.build'
 
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -44,7 +44,7 @@ tasks.named('forbiddenApisTest').configure {
 }
 
 // JarHell is part of es server, which we don't want to pull in
-// TODO: Not anymore. Now in :libs:elasticsearch-core
+// TODO: Not anymore. Now in :libs:opensearch-core
 jarHell.enabled = false
 
 // TODO: should we have licenses for our test deps?

client/test/src/main/java/org/elasticsearch/client/RestClientTestCase.java → client/test/src/main/java/org/opensearch/client/RestClientTestCase.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client;
+package org.opensearch.client;
 
 import com.carrotsearch.randomizedtesting.JUnit3MethodProvider;
 import com.carrotsearch.randomizedtesting.MixWithSuiteName;

client/test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java → client/test/src/main/java/org/opensearch/client/RestClientTestUtil.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client;
+package org.opensearch.client;
 
 import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;