fixing progress listener tests

Author: ibrandes

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java

@@ -816,12 +816,12 @@ private Mono<Response<BlockBlobItem>> uploadInChunks(BlockBlobAsyncClient blockB
                 })
                     // We only care about the stageBlock insofar as it was successful, but we need to collect the ids.
                     .map(x -> {
-//                        String headerV = x.getHeaders().getValue("test_context_key");
-//                        if (Objects.equals(headerV, "-1")) {
-//                            System.out.println("does not have context key");
-//                        } else {
-//                            System.out.println("has context key: " + headerV);
-//                        }
+                        //                        String headerV = x.getHeaders().getValue("test_context_key");
+                        //                        if (Objects.equals(headerV, "-1")) {
+                        //                            System.out.println("does not have context key");
+                        //                        } else {
+                        //                            System.out.println("has context key: " + headerV);
+                        //                        }
                         return blockId;
                     });
             }, parallelTransferOptions.getMaxConcurrency(), 1)

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/contentValidation/BlobMessageEncoderUploadTests.java

@@ -94,9 +94,9 @@ public void uploadBinaryDataChunkedStructMessProgressListener() {
         byte[] data = getRandomByteArray((int) size);
         long blockSize = (long) Constants.MB * 2;
 
-        Listener uploadListenerChecksum = new Listener(blockSize);
+        Listener uploadListenerChecksum = new Listener();
 
-        Listener uploadListenerNoChecksum = new Listener(blockSize);
+        Listener uploadListenerNoChecksum = new Listener();
 
         BlobParallelUploadOptions optionsChecksum = new BlobParallelUploadOptions(BinaryData.fromBytes(data))
             .setStorageChecksumAlgorithm(StorageChecksumAlgorithm.AUTO)
@@ -106,7 +106,7 @@ public void uploadBinaryDataChunkedStructMessProgressListener() {
                     .setProgressListener(uploadListenerChecksum));
 
         BlobParallelUploadOptions optionsNoChecksum = new BlobParallelUploadOptions(BinaryData.fromBytes(data))
-            .setStorageChecksumAlgorithm(StorageChecksumAlgorithm.AUTO)
+            .setStorageChecksumAlgorithm(StorageChecksumAlgorithm.NONE)
             .setParallelTransferOptions(
                 new ParallelTransferOptions().setMaxSingleUploadSizeLong((long) Constants.MB * 2)
                     .setBlockSizeLong(blockSize)
@@ -118,9 +118,6 @@ public void uploadBinaryDataChunkedStructMessProgressListener() {
         assertTrue(uploadListenerChecksum.getReportingCount() >= (size / blockSize));
         assertTrue(uploadListenerNoChecksum.getReportingCount() >= (size / blockSize));
 
-        assertEquals(uploadListenerNoChecksum.getReportingCount(), uploadListenerChecksum.getReportingCount());
-        assertEquals(uploadListenerNoChecksum.getReportedByteCount(), uploadListenerChecksum.getReportedByteCount());
-
         System.out.println(
             uploadListenerChecksum.getReportingCount() + " " + uploadListenerChecksum.getReportedByteCount() + " "
                 + uploadListenerNoChecksum.getReportingCount() + " " + uploadListenerNoChecksum.getReportedByteCount());
@@ -220,17 +217,14 @@ public void uploadFluxChunkedStructMess() {
     }
 
     static class Listener implements ProgressListener {
-        private final long blockSize;
         private long reportingCount;
         private long reportedByteCount;
 
-        Listener(long blockSize) {
-            this.blockSize = blockSize;
+        Listener() {
         }
 
         @Override
         public void handleProgress(long bytesTransferred) {
-            assertEquals(0, bytesTransferred % blockSize);
             this.reportingCount += 1;
             this.reportedByteCount = bytesTransferred;
         }

sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/structuredmessage/StructuredMessageEncoder.java

@@ -262,12 +262,12 @@ public String getEncodedMessageLength() {
         return String.valueOf(messageLength);
     }
 
-//    /**
-//     * Returns the CRC64 of the message
-//     *
-//     * @return The CRC64 of the message
-//     */
-//    public long getMessageCRC64() {
-//        return messageCRC64;
-//    }
+    //    /**
+    //     * Returns the CRC64 of the message
+    //     *
+    //     * @return The CRC64 of the message
+    //     */
+    //    public long getMessageCRC64() {
+    //        return messageCRC64;
+    //    }
 }

sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/policy/StorageContentValidationPolicy.java

@@ -62,13 +62,13 @@ public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineN
         applyContentValidation(context);
         return next.process();
 
-//        long messageCRC64 = applyContentValidation(context);
-//        return next.process().map(response -> {
-//            if (messageCRC64 != -1) {
-//                response.getHeaders().add("test_context_key", String.valueOf(messageCRC64));
-//            }
-//            return response;
-//        });
+        //        long messageCRC64 = applyContentValidation(context);
+        //        return next.process().map(response -> {
+        //            if (messageCRC64 != -1) {
+        //                response.getHeaders().add("test_context_key", String.valueOf(messageCRC64));
+        //            }
+        //            return response;
+        //        });
     }
 
     private void applyContentValidation(HttpPipelineCallContext context) {