Refactor Content Understanding Samples to Use Updated Environment Variables and Improve Test Patterns

Changjian Wang · Changjian Wang · commit 92711c710e3b · 2025-12-05T18:44:54.000+08:00
- Updated environment variable names from "ENDPOINT" and "CONTENTUNDERSTANDING_API_KEY" to "CONTENTUNDERSTANDING_ENDPOINT" and "AZURE_CONTENT_UNDERSTANDING_KEY" across multiple sample test files.
- Modified sample tests to load local files instead of using publicly accessible URLs for document analysis.
- Enhanced assertions and logging for better clarity and debugging.
- Improved API usage patterns in tests for creating, copying, and deleting analyzers, including async patterns.
- Added model mappings for analyzers in relevant samples to demonstrate configuration capabilities.
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample00_ConfigureDefaults.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample00_ConfigureDefaults.java
@@ -28,7 +28,7 @@ public void testConfigureDefaults() {
         // Create the Content Understanding client
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
-                .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT"))
+                .endpoint(Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT"))
                 .buildClient();
 
         // Step 1: Get current defaults
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample01_AnalyzeBinary.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample01_AnalyzeBinary.java
@@ -41,7 +41,7 @@ public class Sample01_AnalyzeBinary {
     @Test
     public void testAnalyzeBinaryAsync() throws IOException {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample02_AnalyzeUrl.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample02_AnalyzeUrl.java
@@ -37,7 +37,7 @@ public class Sample02_AnalyzeUrl {
     @Test
     public void testAnalyzeUrlAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample03_AnalyzeInvoice.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample03_AnalyzeInvoice.java
@@ -40,7 +40,7 @@ public class Sample03_AnalyzeInvoice {
     @Test
     public void testAnalyzeInvoiceAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample04_CreateAnalyzer.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample04_CreateAnalyzer.java
@@ -51,7 +51,7 @@ public class Sample04_CreateAnalyzer {
     public void cleanup() {
         if (createdAnalyzerId != null) {
             try {
-                String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+                String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
                 ContentUnderstandingClient client
                     = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                         .endpoint(endpoint)
@@ -67,7 +67,7 @@ public void cleanup() {
     @Test
     public void testCreateAnalyzerAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
@@ -271,7 +271,7 @@ public void testCreateAnalyzerAsync() {
     @Test
     public void testUseCustomAnalyzerAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample05_CreateClassifier.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample05_CreateClassifier.java
@@ -39,7 +39,7 @@ public class Sample05_CreateClassifier {
     public void cleanup() {
         if (createdAnalyzerId != null) {
             try {
-                String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+                String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
                 ContentUnderstandingClient client
                     = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                         .endpoint(endpoint)
@@ -55,7 +55,7 @@ public void cleanup() {
     @Test
     public void testCreateClassifierAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample06_GetAnalyzer.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample06_GetAnalyzer.java
@@ -25,7 +25,7 @@ public class Sample06_GetAnalyzer {
     @Test
     public void testGetAnalyzerAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
@@ -130,7 +130,7 @@ public void testGetAnalyzerAsync() {
     @Test
     public void testGetPrebuiltDocumentAnalyzerAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample07_ListAnalyzers.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample07_ListAnalyzers.java
@@ -26,7 +26,7 @@ public class Sample07_ListAnalyzers {
     @Test
     public void testListAnalyzersAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
@@ -129,7 +129,7 @@ public void testListAnalyzersAsync() {
     @Test
     public void testListReadyAnalyzersAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample08_UpdateAnalyzer.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample08_UpdateAnalyzer.java
@@ -39,7 +39,7 @@ public class Sample08_UpdateAnalyzer {
 
     @BeforeEach
     public void setup() {
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         client = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
             .endpoint(endpoint)
             .buildClient();
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample09_DeleteAnalyzer.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample09_DeleteAnalyzer.java
@@ -34,7 +34,7 @@ public class Sample09_DeleteAnalyzer {
     @Test
     public void testDeleteAnalyzerAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
@@ -111,7 +111,7 @@ public void testDeleteAnalyzerAsync() {
     @Test
     public void testDeleteNonExistentAnalyzerAsync() {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample10_AnalyzeConfigs.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample10_AnalyzeConfigs.java
@@ -42,20 +42,20 @@ public class Sample10_AnalyzeConfigs {
     @Test
     public void testAnalyzeConfigsAsync() throws IOException {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
                 .buildClient();
 
         // BEGIN:ContentUnderstandingAnalyzeWithConfigs
-        // Using a publicly accessible sample file from Azure-Samples GitHub repository
-        String documentUrl
-            = "https://raw.githubusercontent.com/Azure-Samples/azure-ai-content-understanding-dotnet/main/ContentUnderstanding.Common/data/sample_invoice.pdf";
+        // Load local test file
+        Path filePath = Paths.get("src/test/resources/sample_document_features.pdf");
+        byte[] fileBytes = Files.readAllBytes(filePath);
 
         com.azure.ai.contentunderstanding.models.AnalyzeInput input
             = new com.azure.ai.contentunderstanding.models.AnalyzeInput();
-        input.setUrl(documentUrl);
+        input.setData(fileBytes);
 
         // Analyze with prebuilt-documentSearch which has formulas, layout, and OCR enabled
         // These configs enable extraction of charts, annotations, hyperlinks, and formulas
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample11_AnalyzeReturnRawJson.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample11_AnalyzeReturnRawJson.java
@@ -38,19 +38,21 @@ public class Sample11_AnalyzeReturnRawJson {
     @Test
     public void testAnalyzeReturnRawJsonAsync() throws IOException {
         // Create the Content Understanding client
-        String endpoint = Configuration.getGlobalConfiguration().get("ENDPOINT");
+        String endpoint = Configuration.getGlobalConfiguration().get("CONTENTUNDERSTANDING_ENDPOINT");
         ContentUnderstandingClient client
             = new ContentUnderstandingClientBuilder().credential(new DefaultAzureCredentialBuilder().build())
                 .endpoint(endpoint)
                 .buildClient();
 
         // BEGIN:ContentUnderstandingAnalyzeReturnRawJson
-        // Using a publicly accessible sample file from Azure-Samples GitHub repository
-        String documentUrl
-            = "https://raw.githubusercontent.com/Azure-Samples/azure-ai-content-understanding-dotnet/main/ContentUnderstanding.Common/data/sample_invoice.pdf";
-
-        // Prepare request as JSON
-        String requestJson = String.format("{\"inputs\": [{\"url\": \"%s\"}]}", documentUrl);
+        // Load local test file
+        Path filePath = Paths.get("src/test/resources/sample_invoice.pdf");
+        byte[] fileBytes = Files.readAllBytes(filePath);
+
+        // Prepare request body with binary data using JSON format
+        // Note: The API expects a JSON request with "inputs" array containing document data
+        String base64Data = java.util.Base64.getEncoder().encodeToString(fileBytes);
+        String requestJson = String.format("{\"inputs\": [{\"data\": \"%s\"}]}", base64Data);
         BinaryData requestBody = BinaryData.fromString(requestJson);
 
         // Use protocol method to get raw JSON response
@@ -63,9 +65,9 @@ public void testAnalyzeReturnRawJsonAsync() throws IOException {
         // END:ContentUnderstandingAnalyzeReturnRawJson
 
         // BEGIN:Assertion_ContentUnderstandingAnalyzeReturnRawJson
-        Assertions.assertNotNull(documentUrl, "Document URL should not be null");
-        Assertions.assertFalse(documentUrl.isEmpty(), "Document URL should not be empty");
-        System.out.println("Document URL: " + documentUrl);
+        Assertions.assertTrue(Files.exists(filePath), "Sample file should exist at " + filePath);
+        Assertions.assertTrue(fileBytes.length > 0, "File should not be empty");
+        System.out.println("File loaded: " + filePath + " (" + String.format("%,d", fileBytes.length) + " bytes)");
 
         Assertions.assertNotNull(operation, "Analysis operation should not be null");
         Assertions.assertTrue(operation.waitForCompletion().getStatus().isComplete(), "Operation should be completed");
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample12_GetResultFile.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample12_GetResultFile.java
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample13_DeleteResult.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample13_DeleteResult.java
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample14_CopyAnalyzer.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample14_CopyAnalyzer.java
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample15_GrantCopyAuth.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample15_GrantCopyAuth.java
diff --git a/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample16_CreateAnalyzerWithLabels.java b/sdk/contentunderstanding/azure-ai-contentunderstanding/src/test/java/com/azure/ai/contentunderstanding/generated/Sample16_CreateAnalyzerWithLabels.java
