Merge pull request #15191 from iterate-ch/bugfix/MD-20118

Comparison for files in B2

Author: dkocher

backblaze/src/main/java/ch/cyberduck/core/b2/B2Protocol.java

@@ -18,9 +18,9 @@
 import ch.cyberduck.core.AbstractProtocol;
 import ch.cyberduck.core.PathContainerService;
 import ch.cyberduck.core.Scheme;
-import ch.cyberduck.core.synchronization.ChecksumComparisonService;
 import ch.cyberduck.core.synchronization.ComparisonService;
 import ch.cyberduck.core.synchronization.DefaultComparisonService;
+import ch.cyberduck.core.synchronization.VersionIdComparisonService;
 import ch.cyberduck.core.text.DefaultLexicographicOrderComparator;
 
 import java.util.Comparator;
@@ -94,7 +94,7 @@ public <T> T getFeature(final Class<T> type) {
             return (T) new B2PathContainerService();
         }
         if(type == ComparisonService.class) {
-            return (T) new DefaultComparisonService(new ChecksumComparisonService(), ComparisonService.disabled);
+            return (T) new DefaultComparisonService(new VersionIdComparisonService(), ComparisonService.disabled);
         }
         return super.getFeature(type);
     }

backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadServiceTest.java

@@ -21,6 +21,7 @@
 import ch.cyberduck.core.DisabledLoginCallback;
 import ch.cyberduck.core.Local;
 import ch.cyberduck.core.Path;
+import ch.cyberduck.core.PathAttributes;
 import ch.cyberduck.core.exception.AccessDeniedException;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Delete;
@@ -79,7 +80,9 @@ public void testUpload() throws Exception {
 
         upload.upload(test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), new DisabledStreamListener(),
                 status, new DisabledConnectionCallback());
-        assertEquals(checksum, new B2AttributesFinderFeature(session, fileid).find(test).getChecksum());
+        final PathAttributes attr = new B2AttributesFinderFeature(session, fileid).find(test);
+        assertNotEquals(Checksum.NONE, attr.getChecksum());
+        assertEquals(checksum, attr.getChecksum());
         status.validate();
         assertTrue(status.isComplete());
         assertEquals(content.length, status.getResponse().getSize());

backblaze/src/test/java/ch/cyberduck/core/worker/B2SingleTransferWorkerTest.java

@@ -26,6 +26,7 @@
 import ch.cyberduck.core.Local;
 import ch.cyberduck.core.LoginConnectionService;
 import ch.cyberduck.core.Path;
+import ch.cyberduck.core.PathAttributes;
 import ch.cyberduck.core.b2.B2AttributesFinderFeature;
 import ch.cyberduck.core.b2.B2DeleteFeature;
 import ch.cyberduck.core.b2.B2LargeUploadService;
@@ -35,6 +36,7 @@
 import ch.cyberduck.core.b2.B2WriteFeature;
 import ch.cyberduck.core.features.Delete;
 import ch.cyberduck.core.features.Upload;
+import ch.cyberduck.core.io.Checksum;
 import ch.cyberduck.core.notification.DisabledNotificationService;
 import ch.cyberduck.core.ssl.DefaultX509KeyManager;
 import ch.cyberduck.core.ssl.DefaultX509TrustManager;
@@ -65,8 +67,7 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)
 public class B2SingleTransferWorkerTest extends VaultTest {
@@ -95,6 +96,9 @@ public String getProperty(final String key) {
                 if("b2.upload.largeobject.concurrency".equals(key)) {
                     return String.valueOf(5);
                 }
+                if("queue.upload.checksum.calculate".equals(key)) {
+                    return String.valueOf(true);
+                }
                 return super.getProperty(key);
             }
         };
@@ -151,7 +155,9 @@ public TransferAction prompt(final TransferItem file) {
         local.delete();
         assertTrue(t.isComplete());
         final B2VersionIdProvider fileid = new B2VersionIdProvider(session);
-        assertEquals(content.length, new B2AttributesFinderFeature(session, fileid).find(test).getSize());
+        final PathAttributes attr = new B2AttributesFinderFeature(session, fileid).find(test);
+        assertNotEquals(Checksum.NONE, attr.getChecksum());
+        assertEquals(content.length, attr.getSize());
         assertEquals(content.length, counter.getRecv(), 0L);
         assertEquals(content.length, counter.getSent(), 0L);
         assertTrue(failed.get());