Skip to content

Commit 7b73f20

Browse files
idickerson7idickerson7
committed
updated disabled tests
1 parent bee68c6 commit 7b73f20

4 files changed

Lines changed: 23 additions & 75 deletions

File tree

‎sdk/search/azure-search-documents/assets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/search/azure-search-documents",
5-
"Tag": "java/search/azure-search-documents_26148998c0"
5+
"Tag": "java/search/azure-search-documents_27dc2b9d1f"
66
}

‎sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/KnowledgeBaseTests.java‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ protected static void cleanupClass() {
145145
}
146146

147147
@Test
148-
@Disabled("Requires further resource deployment")
149148
public void createKnowledgeBaseSync() {
150149
// Test creating a knowledge knowledgebase.
151150
SearchIndexClient searchIndexClient = getSearchIndexClientBuilder(true).buildClient();
@@ -172,7 +171,6 @@ public void createKnowledgeBaseSync() {
172171
}
173172

174173
@Test
175-
@Disabled("Requires further resource deployment")
176174
public void createKnowledgeBaseAsync() {
177175
// Test creating a knowledge knowledgebase.
178176
SearchIndexAsyncClient searchIndexClient = getSearchIndexClientBuilder(false).buildAsyncClient();
@@ -200,7 +198,6 @@ public void createKnowledgeBaseAsync() {
200198
}
201199

202200
@Test
203-
@Disabled("Requires further resource deployment")
204201
public void getKnowledgeBaseSync() {
205202
// Test getting a knowledge knowledgebase.
206203
SearchIndexClient searchIndexClient = getSearchIndexClientBuilder(true).buildClient();
@@ -228,7 +225,6 @@ public void getKnowledgeBaseSync() {
228225
}
229226

230227
@Test
231-
@Disabled("Requires further resource deployment")
232228
public void getKnowledgeBaseAsync() {
233229
// Test getting a knowledge knowledgebase.
234230
SearchIndexAsyncClient searchIndexClient = getSearchIndexClientBuilder(false).buildAsyncClient();
@@ -259,7 +255,6 @@ public void getKnowledgeBaseAsync() {
259255
}
260256

261257
@Test
262-
@Disabled("Requires further resource deployment")
263258
public void listKnowledgeBasesSync() {
264259
// Test listing knowledge knowledgebases.
265260
SearchIndexClient searchIndexClient = getSearchIndexClientBuilder(true).buildClient();
@@ -282,7 +277,6 @@ public void listKnowledgeBasesSync() {
282277
}
283278

284279
@Test
285-
@Disabled("Requires further resource deployment")
286280
public void listKnowledgeBasesAsync() {
287281
// Test listing knowledge knowledgebases.
288282
SearchIndexAsyncClient searchIndexClient = getSearchIndexClientBuilder(false).buildAsyncClient();
@@ -310,7 +304,6 @@ public void listKnowledgeBasesAsync() {
310304
}
311305

312306
@Test
313-
@Disabled("Requires further resource deployment")
314307
public void deleteKnowledgeBaseSync() {
315308
// Test deleting a knowledge knowledgebase.
316309
SearchIndexClient searchIndexClient = getSearchIndexClientBuilder(true).buildClient();
@@ -324,7 +317,6 @@ public void deleteKnowledgeBaseSync() {
324317
}
325318

326319
@Test
327-
@Disabled("Requires further resource deployment")
328320
public void deleteKnowledgeBaseAsync() {
329321
// Test deleting a knowledge base.
330322
SearchIndexAsyncClient searchIndexClient = getSearchIndexClientBuilder(false).buildAsyncClient();
@@ -345,7 +337,6 @@ public void deleteKnowledgeBaseAsync() {
345337
}
346338

347339
@Test
348-
@Disabled("Requires further resource deployment")
349340
public void updateKnowledgeBaseSync() {
350341
// Test updating a knowledge base.
351342
SearchIndexClient searchIndexClient = getSearchIndexClientBuilder(true).buildClient();
@@ -354,13 +345,12 @@ public void updateKnowledgeBaseSync() {
354345
searchIndexClient.createKnowledgeBase(knowledgeBase);
355346
String newDescription = "Updated description";
356347
knowledgeBase.setDescription(newDescription);
357-
searchIndexClient.createKnowledgeBase(knowledgeBase);
348+
searchIndexClient.createOrUpdateKnowledgeBase(knowledgeBase);
358349
KnowledgeBase retrieved = searchIndexClient.getKnowledgeBase(knowledgeBase.getName());
359350
assertEquals(newDescription, retrieved.getDescription());
360351
}
361352

362353
@Test
363-
@Disabled("Requires further resource deployment")
364354
public void updateKnowledgeBaseAsync() {
365355
// Test updating a knowledge base.
366356
SearchIndexAsyncClient searchIndexClient = getSearchIndexClientBuilder(false).buildAsyncClient();
@@ -369,7 +359,11 @@ public void updateKnowledgeBaseAsync() {
369359
String newDescription = "Updated description";
370360

371361
Mono<KnowledgeBase> createUpdateAndGetMono = searchIndexClient.createKnowledgeBase(knowledgeBase)
372-
.flatMap(created -> searchIndexClient.createKnowledgeBase(created.setDescription(newDescription)))
362+
.flatMap(created -> searchIndexClient.deleteKnowledgeBase(created.getName())
363+
.then(searchIndexClient
364+
.createKnowledgeBase(new KnowledgeBase(knowledgeBase.getName(), KNOWLEDGE_SOURCE_REFERENCE)
365+
.setModels(KNOWLEDGE_BASE_MODEL)
366+
.setDescription(newDescription))))
373367
.flatMap(updated -> searchIndexClient.getKnowledgeBase(updated.getName()));
374368

375369
StepVerifier.create(createUpdateAndGetMono)
@@ -378,26 +372,25 @@ public void updateKnowledgeBaseAsync() {
378372
}
379373

380374
@Test
381-
@Disabled("Requires further resource deployment")
382375
public void basicRetrievalSync() {
383376
// Test knowledge base retrieval functionality.
384377
SearchIndexClient searchIndexClient = getSearchIndexClientBuilder(true).buildClient();
385378
KnowledgeBase knowledgeBase
386379
= new KnowledgeBase(randomKnowledgeBaseName(), KNOWLEDGE_SOURCE_REFERENCE).setModels(KNOWLEDGE_BASE_MODEL);
387380
searchIndexClient.createKnowledgeBase(knowledgeBase);
388381

389-
KnowledgeBaseRetrievalClient knowledgeBaseClient = getKnowledgeBaseRetrievalClientBuilder(true).buildClient();
382+
KnowledgeBaseRetrievalClient knowledgeBaseClient
383+
= getKnowledgeBaseRetrievalClientBuilder(true).knowledgeBaseName(knowledgeBase.getName()).buildClient();
390384

391385
KnowledgeBaseRetrievalOptions retrievalRequest = new KnowledgeBaseRetrievalOptions()
392386
.setIntents(new KnowledgeRetrievalSemanticIntent("What are the pet policies at the hotel?"));
393387

394-
KnowledgeBaseRetrievalResult response = knowledgeBaseClient.retrieve(knowledgeBase.getName(), retrievalRequest);
388+
KnowledgeBaseRetrievalResult response = knowledgeBaseClient.retrieve(retrievalRequest);
395389
assertNotNull(response);
396390
assertNotNull(response.getResponse());
397391
}
398392

399393
@Test
400-
@Disabled("Requires further resource deployment")
401394
public void basicRetrievalAsync() {
402395
// Test knowledge base retrieval functionality.
403396
SearchIndexAsyncClient searchIndexClient = getSearchIndexClientBuilder(false).buildAsyncClient();
@@ -407,12 +400,13 @@ public void basicRetrievalAsync() {
407400
Mono<KnowledgeBaseRetrievalResult> createAndRetrieveMono
408401
= searchIndexClient.createKnowledgeBase(knowledgeBase).flatMap(created -> {
409402
KnowledgeBaseRetrievalAsyncClient knowledgeBaseClient
410-
= getKnowledgeBaseRetrievalClientBuilder(false).buildAsyncClient();
403+
= getKnowledgeBaseRetrievalClientBuilder(false).knowledgeBaseName(created.getName())
404+
.buildAsyncClient();
411405

412406
KnowledgeBaseRetrievalOptions retrievalRequest = new KnowledgeBaseRetrievalOptions()
413407
.setIntents(new KnowledgeRetrievalSemanticIntent("What are the pet policies at the hotel?"));
414408

415-
return knowledgeBaseClient.retrieve(created.getName(), retrievalRequest);
409+
return knowledgeBaseClient.retrieve(retrievalRequest);
416410
});
417411

418412
StepVerifier.create(createAndRetrieveMono).assertNext(response -> {
@@ -422,27 +416,26 @@ public void basicRetrievalAsync() {
422416
}
423417

424418
@Test
425-
@Disabled("Requires further resource deployment")
426419
public void basicRetrievalWithReasoningEffortSync() {
427420
// Test knowledge base retrieval functionality.
428421
SearchIndexClient searchIndexClient = getSearchIndexClientBuilder(true).buildClient();
429422
KnowledgeBase knowledgeBase
430423
= new KnowledgeBase(randomKnowledgeBaseName(), KNOWLEDGE_SOURCE_REFERENCE).setModels(KNOWLEDGE_BASE_MODEL);
431424
searchIndexClient.createKnowledgeBase(knowledgeBase);
432425

433-
KnowledgeBaseRetrievalClient knowledgeBaseClient = getKnowledgeBaseRetrievalClientBuilder(true).buildClient();
426+
KnowledgeBaseRetrievalClient knowledgeBaseClient
427+
= getKnowledgeBaseRetrievalClientBuilder(true).knowledgeBaseName(knowledgeBase.getName()).buildClient();
434428

435429
KnowledgeBaseRetrievalOptions retrievalRequest = new KnowledgeBaseRetrievalOptions()
436430
.setIntents(new KnowledgeRetrievalSemanticIntent("What are the pet policies at the hotel?"));
437431
// .setRetrievalReasoningEffort(KnowledgeRetrievalReasoningEffortKind.MEDIUM); // TODO: Missing enum
438432

439-
KnowledgeBaseRetrievalResult response = knowledgeBaseClient.retrieve(knowledgeBase.getName(), retrievalRequest);
433+
KnowledgeBaseRetrievalResult response = knowledgeBaseClient.retrieve(retrievalRequest);
440434
assertNotNull(response);
441435
assertNotNull(response.getResponse());
442436
}
443437

444438
@Test
445-
@Disabled("Requires further resource deployment")
446439
public void basicRetrievalWithReasoningEffortAsync() {
447440
// Test knowledge base retrieval functionality.
448441
SearchIndexAsyncClient searchIndexClient = getSearchIndexClientBuilder(false).buildAsyncClient();
@@ -452,13 +445,14 @@ public void basicRetrievalWithReasoningEffortAsync() {
452445
Mono<KnowledgeBaseRetrievalResult> createAndRetrieveMono
453446
= searchIndexClient.createKnowledgeBase(knowledgeBase).flatMap(created -> {
454447
KnowledgeBaseRetrievalAsyncClient knowledgeBaseClient
455-
= getKnowledgeBaseRetrievalClientBuilder(false).buildAsyncClient();
448+
= getKnowledgeBaseRetrievalClientBuilder(false).knowledgeBaseName(created.getName())
449+
.buildAsyncClient();
456450

457451
KnowledgeBaseRetrievalOptions retrievalRequest = new KnowledgeBaseRetrievalOptions()
458452
.setIntents(new KnowledgeRetrievalSemanticIntent("What are the pet policies at the hotel?"));
459453
// .setRetrievalReasoningEffort(KnowledgeRetrievalReasoningEffortKind.MEDIUM); // TODO: Missing enum
460454

461-
return knowledgeBaseClient.retrieve(created.getName(), retrievalRequest);
455+
return knowledgeBaseClient.retrieve(retrievalRequest);
462456
});
463457

464458
StepVerifier.create(createAndRetrieveMono).assertNext(response -> {
@@ -480,7 +474,6 @@ public void answerSynthesisRetrievalAsync() {
480474
}
481475

482476
@Test
483-
@Disabled("Requires further resource deployment")
484477
public void knowledgeBaseObjectHasNoAgentReferences() throws IOException {
485478
SearchIndexClient searchIndexClient = getSearchIndexClientBuilder(true).buildClient();
486479
KnowledgeBase knowledgeBase
@@ -498,7 +491,6 @@ public void knowledgeBaseObjectHasNoAgentReferences() throws IOException {
498491
}
499492

500493
@Test
501-
@Disabled("Requires further resource deployment")
502494
public void knowledgeBaseEndpointsUseKnowledgeBasesPath() {
503495
SearchIndexClient client = getSearchIndexClientBuilder(true)
504496
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
@@ -540,7 +532,6 @@ public void legacyKnowledgeAgentsListedAsKnowledgeBases() {
540532
}
541533

542534
@Test
543-
@Disabled("Requires further resource deployment")
544535
public void knowledgeSourcesEndpointUnchanged() {
545536
SearchIndexClient client = getSearchIndexClientBuilder(true).buildClient();
546537

@@ -559,7 +550,6 @@ public void knowledgeSourcesEndpointUnchanged() {
559550
}
560551

561552
@Test
562-
@Disabled("Requires further resource deployment")
563553
public void knowledgeBaseTypeNamesContainNoAgentReferences() {
564554
SearchIndexClient client = getSearchIndexClientBuilder(true).buildClient();
565555

‎sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/SearchAliasTests.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@
2424
import static org.junit.jupiter.api.Assertions.assertThrows;
2525
import static org.junit.jupiter.api.Assertions.assertTrue;
2626

27-
/**
28-
* Tests {@link SearchAlias}-based operations.
29-
*
30-
* NOTE: All tests are currently disabled because SearchAlias functionality requires
31-
* API version 2026-04-01 which is not yet generally available.
32-
* TODO: Remove @Disabled annotations when 2026-04-01 becomes GA.
33-
*/
3427
public class SearchAliasTests extends SearchTestBase {
3528
private static final String HOTEL_INDEX_NAME1 = "search-alias-shared-hotel-instance-one";
3629
private static final String HOTEL_INDEX_NAME2 = "search-alias-shared-hotel-instance-two";
@@ -93,7 +86,6 @@ protected void afterTest() {
9386
}
9487

9588
@Test
96-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
9789
public void canCreateAndGetAliasSync() {
9890
SearchAlias expectedAlias = new SearchAlias(testResourceNamer.randomName("my-alias", 32), HOTEL_INDEX_NAME1);
9991
SearchAlias searchAlias = indexClient.createAlias(expectedAlias);
@@ -109,7 +101,6 @@ public void canCreateAndGetAliasSync() {
109101
}
110102

111103
@Test
112-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
113104
public void canCreateAliasAsync() {
114105
SearchAlias expectedAlias = new SearchAlias(testResourceNamer.randomName("my-alias", 32), HOTEL_INDEX_NAME1);
115106

@@ -126,35 +117,30 @@ public void canCreateAliasAsync() {
126117
}
127118

128119
@Test
129-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
130120
public void cannotCreateAliasOnNonExistentIndexSync() {
131121
assertThrows(HttpResponseException.class,
132122
() -> indexClient.createAlias(new SearchAlias("my-alias", "index-that-does-not-exist")));
133123
}
134124

135125
@Test
136-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
137126
public void cannotCreateAliasOnNonExistentIndexAsync() {
138127
StepVerifier.create(indexAsyncClient.createAlias(new SearchAlias("my-alias", "index-that-does-not-exist")))
139128
.verifyError(HttpResponseException.class);
140129
}
141130

142131
@Test
143-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
144132
public void cannotCreateAliasWithInvalidNameSync() {
145133
assertThrows(HttpResponseException.class,
146134
() -> indexClient.createAlias(new SearchAlias("--invalid--alias-name", HOTEL_INDEX_NAME1)));
147135
}
148136

149137
@Test
150-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
151138
public void cannotCreateAliasWithInvalidNameAsync() {
152139
StepVerifier.create(indexAsyncClient.createAlias(new SearchAlias("--invalid--alias-name", HOTEL_INDEX_NAME1)))
153140
.verifyError(HttpResponseException.class);
154141
}
155142

156143
@Test
157-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
158144
public void cannotCreateMultipleAliasesWithTheSameNameSync() {
159145
SearchAlias expectedAlias = new SearchAlias(testResourceNamer.randomName("my-alias", 32), HOTEL_INDEX_NAME1);
160146
SearchAlias searchAlias = indexClient.createAlias(expectedAlias);
@@ -168,7 +154,6 @@ public void cannotCreateMultipleAliasesWithTheSameNameSync() {
168154
}
169155

170156
@Test
171-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
172157
public void cannotCreateMultipleAliasesWithTheSameNameAsync() {
173158
SearchAlias expectedAlias = new SearchAlias(testResourceNamer.randomName("my-alias", 32), HOTEL_INDEX_NAME1);
174159

@@ -183,22 +168,19 @@ public void cannotCreateMultipleAliasesWithTheSameNameAsync() {
183168
}
184169

185170
@Test
186-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
187171
public void cannotCreateAliasWithMultipleIndexesSync() {
188172
assertThrows(HttpResponseException.class,
189173
() -> indexClient.createAlias(new SearchAlias("my-alias", HOTEL_INDEX_NAME1, HOTEL_INDEX_NAME2)));
190174
}
191175

192176
@Test
193-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
194177
public void cannotCreateAliasWithMultipleIndexesAsync() {
195178
StepVerifier
196179
.create(indexAsyncClient.createAlias(new SearchAlias("my-alias", HOTEL_INDEX_NAME1, HOTEL_INDEX_NAME2)))
197180
.verifyError(HttpResponseException.class);
198181
}
199182

200183
@Test
201-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
202184
public void canCreateMultipleAliasesReferencingTheSameIndexSync() {
203185
SearchAlias firstExpectedAlias
204186
= new SearchAlias(testResourceNamer.randomName("my-alias", 32), HOTEL_INDEX_NAME1);
@@ -218,7 +200,6 @@ public void canCreateMultipleAliasesReferencingTheSameIndexSync() {
218200
}
219201

220202
@Test
221-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
222203
public void canCreateMultipleAliasesReferencingTheSameIndexAsync() {
223204
SearchAlias firstExpectedAlias
224205
= new SearchAlias(testResourceNamer.randomName("my-alias", 32), HOTEL_INDEX_NAME1);
@@ -240,7 +221,6 @@ public void canCreateMultipleAliasesReferencingTheSameIndexAsync() {
240221
}
241222

242223
@Test
243-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
244224
public void canUpdateAliasAfterCreationSync() {
245225
String aliasName = testResourceNamer.randomName("my-alias", 32);
246226
indexClient.createAlias(new SearchAlias(aliasName, HOTEL_INDEX_NAME1));
@@ -254,7 +234,6 @@ public void canUpdateAliasAfterCreationSync() {
254234
}
255235

256236
@Test
257-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
258237
public void canUpdateAliasAfterCreationAsync() {
259238
String aliasName = testResourceNamer.randomName("my-alias", 32);
260239
indexAsyncClient.createAlias(new SearchAlias(aliasName, HOTEL_INDEX_NAME1)).block();
@@ -269,7 +248,6 @@ public void canUpdateAliasAfterCreationAsync() {
269248
}
270249

271250
@Test
272-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
273251
public void canDeleteAliasSync() {
274252
String aliasName = testResourceNamer.randomName("my-alias", 32);
275253
indexClient.createAlias(new SearchAlias(aliasName, HOTEL_INDEX_NAME1));
@@ -283,7 +261,6 @@ public void canDeleteAliasSync() {
283261
}
284262

285263
@Test
286-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
287264
public void canDeleteAliasAsync() {
288265
String aliasName = testResourceNamer.randomName("my-alias", 32);
289266
indexAsyncClient.createAlias(new SearchAlias(aliasName, HOTEL_INDEX_NAME1)).block();
@@ -297,7 +274,6 @@ public void canDeleteAliasAsync() {
297274
}
298275

299276
@Test
300-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
301277
public void cannotDeleteIndexWithAliasSyncAndAsync() {
302278
String aliasName = testResourceNamer.randomName("my-alias", 32);
303279
indexClient.createAlias(new SearchAlias(aliasName, HOTEL_INDEX_NAME1));
@@ -315,7 +291,6 @@ public void cannotDeleteIndexWithAliasSyncAndAsync() {
315291
}
316292

317293
@Test
318-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
319294
public void canListAliasesSyncAndAsync() {
320295
String firstAliasName = testResourceNamer.randomName("my-alias", 32);
321296
indexClient.createAlias(new SearchAlias(firstAliasName, HOTEL_INDEX_NAME1));
@@ -344,7 +319,6 @@ public void canListAliasesSyncAndAsync() {
344319
}
345320

346321
@Test
347-
@Disabled("SearchAlias requires API version 2026-04-01 which is not yet available. TODO: Remove when 2026-04-01 becomes GA.")
348322
public void canInspectAliasUsageInServiceStatisticsSyncAndAsync() {
349323
aliasesToDelete.add(
350324
indexClient.createAlias(new SearchAlias(testResourceNamer.randomName("my-alias", 32), HOTEL_INDEX_NAME1))

0 commit comments

Comments
 (0)