Create IndexClient from ServiceClient UT (Azure#232)

* SearchClient generate IndexClient UT * codestyle fix
navalev · Nov 7, 2019 · 7df18a0 · 7df18a0
1 parent f385821
commit 7df18a0
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 9 deletions.
diff --git a/...e/search/SearchServiceSubclientTests.java → ...e/search/SearchServiceSubClientTests.java b/...e/search/SearchServiceSubclientTests.java → ...e/search/SearchServiceSubClientTests.java
@@ -6,14 +6,12 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class SearchServiceSubclientTests {
+public class SearchServiceSubClientTests extends SearchServiceTestBase {
+
 
     @Test
     public void canGetIndexClientFromSearchClient() {
-        SearchServiceClient serviceClient = new SearchServiceClientBuilder()
-            .endpoint("https://test1.search.windows.net")
-            .credential(new ApiKeyCredentials("api-key"))
-            .buildClient();
+        SearchServiceClient serviceClient = getSearchService();
 
         SearchIndexClient indexClient = serviceClient.getIndexClient("hotels");
 
@@ -36,10 +34,8 @@ public void canGetIndexClientFromSearchClient() {
 
     @Test
     public void canGetIndexAsyncClientFromSearchClient() {
-        SearchServiceAsyncClient serviceClient = new SearchServiceClientBuilder()
-            .endpoint("https://test1.search.windows.net")
-            .credential(new ApiKeyCredentials("api-key"))
-            .buildAsyncClient();
+        SearchServiceAsyncClient serviceClient = getAsyncSearchService();
+
         SearchIndexAsyncClient indexClient = serviceClient.getIndexClient("hotels");
 
         // Validate the client was created
@@ -58,4 +54,48 @@ public void canGetIndexAsyncClientFromSearchClient() {
         // Validate that the client uses the specified index
         Assert.assertEquals("hotels", indexClient.getIndexName());
     }
+
+    @Test
+    public void canGetIndexClientAfterUsingServiceClient() {
+        SearchServiceClient serviceClient = getSearchService();
+        try {
+            // this is expected to fail
+            serviceClient.deleteIndex("thisindexdoesnotexist");
+        } catch (Exception e) {
+            // deleting the index should fail as it does not exist
+        }
+
+        // This should not fail
+        SearchIndexClient indexClient = serviceClient.getIndexClient("hotels");
+        Assert.assertEquals("hotels", indexClient.getIndexName());
+    }
+
+    @Test
+    public void canGetIndexAsyncClientAfterUsingServiceClient() {
+        SearchServiceAsyncClient serviceClient = getAsyncSearchService();
+        try {
+            // this is expected to fail
+            serviceClient.deleteIndex("thisindexdoesnotexist");
+        } catch (Exception e) {
+            // deleting the index should fail as it does not exist
+        }
+
+        // This should not fail
+        SearchIndexAsyncClient indexClient = serviceClient.getIndexClient("hotels");
+        Assert.assertEquals("hotels", indexClient.getIndexName());
+    }
+
+    private SearchServiceClient getSearchService() {
+        return new SearchServiceClientBuilder()
+            .endpoint("https://test1.search.windows.net")
+            .credential(new ApiKeyCredentials("api-key"))
+            .buildClient();
+    }
+
+    private SearchServiceAsyncClient getAsyncSearchService() {
+        return new SearchServiceClientBuilder()
+            .endpoint("https://test1.search.windows.net")
+            .credential(new ApiKeyCredentials("api-key"))
+            .buildAsyncClient();
+    }
 }
diff --git a/...rch/src/test/resources/session-records/canGetIndexAsyncClientAfterUsingServiceClient.json b/...rch/src/test/resources/session-records/canGetIndexAsyncClientAfterUsingServiceClient.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
diff --git a/...ure-search/src/test/resources/session-records/canGetIndexAsyncClientFromSearchClient.json b/...ure-search/src/test/resources/session-records/canGetIndexAsyncClientFromSearchClient.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
diff --git a/...e-search/src/test/resources/session-records/canGetIndexClientAfterUsingServiceClient.json b/...e-search/src/test/resources/session-records/canGetIndexClientAfterUsingServiceClient.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
diff --git a/...ch/azure-search/src/test/resources/session-records/canGetIndexClientFromSearchClient.json b/...ch/azure-search/src/test/resources/session-records/canGetIndexClientFromSearchClient.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}