Skip to content

Commit 97cfe9f

Browse files
dkocherdkocher
committed
Fix tests.
1 parent f7864f6 commit 97cfe9f

23 files changed

+73
-83
lines changed

‎backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import ch.cyberduck.core.b2.B2FindFeature;
2828
import ch.cyberduck.core.b2.B2VersionIdProvider;
2929
import ch.cyberduck.core.cryptomator.features.CryptoAttributesFeature;
30-
import ch.cyberduck.core.cryptomator.features.CryptoFindV6Feature;
3130
import ch.cyberduck.core.features.Delete;
3231
import ch.cyberduck.core.features.Directory;
3332
import ch.cyberduck.core.features.Find;
@@ -68,7 +67,7 @@ public void testMakeDirectoryEncrypted() throws Exception {
6867
final String versionId = test.attributes().getVersionId();
6968
assertNotNull(versionId);
7069
// Assert both filename and file id matches
71-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(test));
70+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test));
7271
assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test));
7372
assertEquals(versionId, new CryptoAttributesFeature(session, new B2AttributesFinderFeature(session, fileid), cryptomator).find(test).getVersionId());
7473
// Placeholder returned in list service with no file info

‎backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
import ch.cyberduck.core.b2.B2WriteFeature;
3434
import ch.cyberduck.core.cryptomator.features.CryptoAttributesFeature;
3535
import ch.cyberduck.core.cryptomator.features.CryptoBulkFeature;
36-
import ch.cyberduck.core.cryptomator.features.CryptoFindV6Feature;
3736
import ch.cyberduck.core.cryptomator.features.CryptoReadFeature;
3837
import ch.cyberduck.core.cryptomator.features.CryptoUploadFeature;
3938
import ch.cyberduck.core.features.Delete;
39+
import ch.cyberduck.core.features.Find;
4040
import ch.cyberduck.core.io.BandwidthThrottle;
4141
import ch.cyberduck.core.io.StreamCopier;
4242
import ch.cyberduck.core.shared.DisabledBulkFeature;
@@ -93,7 +93,7 @@ public void testWrite() throws Exception {
9393
m.upload(test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), counter, writeStatus, null);
9494
assertEquals(content.length, counter.getSent());
9595
assertTrue(writeStatus.isComplete());
96-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(test));
96+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test));
9797
assertEquals(content.length, new CryptoAttributesFeature(session, new B2AttributesFinderFeature(session, fileid), cryptomator).find(test).getSize());
9898
final ByteArrayOutputStream buffer = new ByteArrayOutputStream(content.length);
9999
final TransferStatus readStatus = new TransferStatus().withLength(content.length);
@@ -129,7 +129,7 @@ public void testUploadWithBulk() throws Exception {
129129
m.upload(test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), counter, writeStatus, null);
130130
assertEquals(content.length, counter.getSent());
131131
assertTrue(writeStatus.isComplete());
132-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(test));
132+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test));
133133
assertEquals(content.length, new CryptoAttributesFeature(session, new B2AttributesFinderFeature(session, fileid), cryptomator).find(test).getSize());
134134
final ByteArrayOutputStream buffer = new ByteArrayOutputStream(content.length);
135135
final TransferStatus readStatus = new TransferStatus().withLength(content.length);

‎backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import ch.cyberduck.core.b2.B2LargeUploadWriteFeature;
2828
import ch.cyberduck.core.b2.B2ReadFeature;
2929
import ch.cyberduck.core.b2.B2VersionIdProvider;
30-
import ch.cyberduck.core.cryptomator.features.CryptoFindV6Feature;
3130
import ch.cyberduck.core.cryptomator.features.CryptoReadFeature;
3231
import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature;
3332
import ch.cyberduck.core.cryptomator.random.RandomNonceGenerator;
3433
import ch.cyberduck.core.features.Delete;
34+
import ch.cyberduck.core.features.Find;
3535
import ch.cyberduck.core.io.StreamCopier;
3636
import ch.cyberduck.core.transfer.TransferStatus;
3737
import ch.cyberduck.core.vault.DefaultVaultRegistry;
@@ -79,7 +79,7 @@ public void testWrite() throws Exception {
7979
final ByteArrayInputStream in = new ByteArrayInputStream(content);
8080
final TransferStatus progress = new TransferStatus();
8181
new StreamCopier(new TransferStatus(), progress).transfer(in, out);
82-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(test));
82+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test));
8383
final byte[] compare = new byte[content.length];
8484
final InputStream stream = new CryptoReadFeature(session, new B2ReadFeature(session, fileid), cryptomator).read(test, new TransferStatus().withLength(content.length), new DisabledConnectionCallback());
8585
IOUtils.readFully(stream, compare);

‎backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import ch.cyberduck.core.b2.B2VersionIdProvider;
2929
import ch.cyberduck.core.b2.B2WriteFeature;
3030
import ch.cyberduck.core.cryptomator.features.CryptoAttributesFeature;
31-
import ch.cyberduck.core.cryptomator.features.CryptoFindV6Feature;
3231
import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature;
3332
import ch.cyberduck.core.features.Delete;
3433
import ch.cyberduck.core.features.Find;
@@ -69,7 +68,7 @@ public void testTouchEncrypted() throws Exception {
6968
assertEquals(0L, test.attributes().getSize());
7069
assertEquals(0L, status.getResponse().getSize());
7170
assertNotNull(test.attributes().getVersionId());
72-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(test));
71+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test));
7372
assertEquals(test.attributes(), new CryptoAttributesFeature(session, new B2AttributesFinderFeature(session, fileid), cryptomator).find(test));
7473
cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback());
7574
}
@@ -88,7 +87,7 @@ public void testTouchLongFilenameEncrypted() throws Exception {
8887
new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)), status);
8988
assertEquals(0L, test.attributes().getSize());
9089
assertEquals(0L, status.getResponse().getSize());
91-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(test));
90+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test));
9291
cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback());
9392
}
9493

‎backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
import ch.cyberduck.core.b2.B2VersionIdProvider;
3131
import ch.cyberduck.core.b2.B2WriteFeature;
3232
import ch.cyberduck.core.cryptomator.features.CryptoAttributesFeature;
33-
import ch.cyberduck.core.cryptomator.features.CryptoFindV6Feature;
3433
import ch.cyberduck.core.cryptomator.features.CryptoReadFeature;
3534
import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature;
3635
import ch.cyberduck.core.cryptomator.random.RotatingNonceGenerator;
3736
import ch.cyberduck.core.features.Delete;
37+
import ch.cyberduck.core.features.Find;
3838
import ch.cyberduck.core.io.StreamCopier;
3939
import ch.cyberduck.core.transfer.TransferStatus;
4040
import ch.cyberduck.core.vault.DefaultVaultRegistry;
@@ -76,7 +76,7 @@ public void testWrite() throws Exception {
7676
final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
7777
session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordStore(), new DisabledPasswordCallback(), cryptomator));
7878
final B2VersionIdProvider fileid = new B2VersionIdProvider(session);
79-
final CryptoWriteFeature<BaseB2Response> writer = new CryptoWriteFeature<BaseB2Response>(session, new B2WriteFeature(session, fileid), cryptomator);
79+
final CryptoWriteFeature<BaseB2Response> writer = new CryptoWriteFeature<>(session, new B2WriteFeature(session, fileid), cryptomator);
8080
final FileHeader header = cryptomator.getFileHeaderCryptor().create();
8181
status.setHeader(cryptomator.getFileHeaderCryptor().encryptHeader(header));
8282
status.setNonces(new RotatingNonceGenerator(cryptomator.getNonceSize(), cryptomator.numberOfChunks(content.length)));
@@ -85,7 +85,7 @@ public void testWrite() throws Exception {
8585
assertNotNull(out);
8686
new StreamCopier(status, status).transfer(new ByteArrayInputStream(content), out);
8787
out.close();
88-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(test));
88+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test));
8989
final PathAttributes attributes = new CryptoAttributesFeature(session, new B2AttributesFinderFeature(session, fileid), cryptomator).find(test);
9090
assertEquals(content.length, attributes.getSize());
9191
assertEquals(content.length, writer.append(test, status.withRemote(attributes)).size, 0L);

‎backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import ch.cyberduck.core.b2.B2VersionIdProvider;
3333
import ch.cyberduck.core.b2.B2WriteFeature;
3434
import ch.cyberduck.core.cryptomator.features.CryptoBulkFeature;
35-
import ch.cyberduck.core.cryptomator.features.CryptoFindV6Feature;
3635
import ch.cyberduck.core.cryptomator.features.CryptoReadFeature;
3736
import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature;
3837
import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature;
@@ -90,8 +89,8 @@ public void testCopyFile() throws Exception {
9089
assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source));
9190
final CopyWorker worker = new CopyWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), new DisabledProgressListener(), new DisabledConnectionCallback());
9291
worker.run(session);
93-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(source));
94-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(target));
92+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(source));
93+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(target));
9594
final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length);
9695
assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new B2ReadFeature(session, fileid), cryptomator).read(target, new TransferStatus().withLength(content.length), new DisabledConnectionCallback()), out));
9796
assertArrayEquals(content, out.toByteArray());
@@ -168,13 +167,13 @@ public void testCopyFolder() throws Exception {
168167
// copy file
169168
final Path fileRenamed = new Path(folder, "f1", EnumSet.of(Path.Type.file));
170169
new CopyWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), new DisabledProgressListener(), new DisabledConnectionCallback()).run(session);
171-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(file));
172-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(fileRenamed));
170+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(file));
171+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(fileRenamed));
173172
// copy folder
174173
final Path folderRenamed = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory));
175174
new CopyWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), new DisabledProgressListener(), new DisabledConnectionCallback()).run(session);
176-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(folder));
177-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(folderRenamed));
175+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(folder));
176+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(folderRenamed));
178177
final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file));
179178
assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder));
180179
registry.clear();
@@ -201,7 +200,7 @@ public void testCopyFileIntoVault() throws Exception {
201200
final CopyWorker worker = new CopyWorker(Collections.singletonMap(cleartextFile, encryptedFile), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), new DisabledProgressListener(), new DisabledConnectionCallback());
202201
worker.run(session);
203202
assertTrue(new B2FindFeature(session, fileid).find(cleartextFile));
204-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(encryptedFile));
203+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(encryptedFile));
205204
registry.clear();
206205
new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), new DisabledProgressListener()).run(session);
207206
}
@@ -256,7 +255,7 @@ public void testCopyFileOutsideVault() throws Exception {
256255
final Path cleartextFile = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
257256
final CopyWorker worker = new CopyWorker(Collections.singletonMap(encryptedFile, cleartextFile), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), new DisabledProgressListener(), new DisabledConnectionCallback());
258257
worker.run(session);
259-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(encryptedFile));
258+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(encryptedFile));
260259
assertTrue(new B2FindFeature(session, fileid).find(cleartextFile));
261260
registry.clear();
262261
new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), new DisabledProgressListener()).run(session);
@@ -282,8 +281,8 @@ public void testCopyDirectoryOutsideVault() throws Exception {
282281
final Path cleartextFolder = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory));
283282
final CopyWorker worker = new CopyWorker(Collections.singletonMap(encryptedFolder, cleartextFolder), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), new DisabledProgressListener(), new DisabledConnectionCallback());
284283
worker.run(session);
285-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(encryptedFolder));
286-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(encryptedFile));
284+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(encryptedFolder));
285+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(encryptedFile));
287286
assertTrue(new B2FindFeature(session, fileid).find(cleartextFolder));
288287
final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file));
289288
assertTrue(new B2FindFeature(session, fileid).find(fileRenamed));

‎backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import ch.cyberduck.core.b2.B2ReadFeature;
3434
import ch.cyberduck.core.b2.B2VersionIdProvider;
3535
import ch.cyberduck.core.cryptomator.features.CryptoAttributesFeature;
36-
import ch.cyberduck.core.cryptomator.features.CryptoFindV6Feature;
3736
import ch.cyberduck.core.cryptomator.features.CryptoReadFeature;
3837
import ch.cyberduck.core.features.Delete;
38+
import ch.cyberduck.core.features.Find;
3939
import ch.cyberduck.core.io.DisabledStreamListener;
4040
import ch.cyberduck.core.io.StreamCopier;
4141
import ch.cyberduck.core.local.DefaultLocalDirectoryFeature;
@@ -106,7 +106,7 @@ public TransferAction prompt(final TransferItem file) {
106106

107107
}.run(session));
108108
final B2VersionIdProvider fileid = new B2VersionIdProvider(session);
109-
assertTrue(new CryptoFindV6Feature(session, new B2FindFeature(session, fileid), cryptomator).find(dir1));
109+
assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(dir1));
110110
assertEquals(content.length, new CryptoAttributesFeature(session, new B2AttributesFinderFeature(session, fileid), cryptomator).find(file1).getSize());
111111
{
112112
final ByteArrayOutputStream buffer = new ByteArrayOutputStream(content.length);

‎box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import ch.cyberduck.core.box.BoxThresholdWriteFeature;
3636
import ch.cyberduck.core.cryptomator.features.CryptoAttributesFeature;
3737
import ch.cyberduck.core.cryptomator.features.CryptoBulkFeature;
38-
import ch.cyberduck.core.cryptomator.features.CryptoFindV6Feature;
3938
import ch.cyberduck.core.cryptomator.features.CryptoReadFeature;
4039
import ch.cyberduck.core.cryptomator.features.CryptoUploadFeature;
4140
import ch.cyberduck.core.features.Delete;
41+
import ch.cyberduck.core.features.Find;
4242
import ch.cyberduck.core.io.BandwidthThrottle;
4343
import ch.cyberduck.core.io.StreamCopier;
4444
import ch.cyberduck.core.shared.DisabledBulkFeature;
@@ -97,7 +97,7 @@ public void testUploadVaultWithBulkFeature() throws Exception {
9797
feature.upload(test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), count, writeStatus, new DisabledConnectionCallback());
9898
assertEquals(content.length, count.getSent());
9999
assertTrue(writeStatus.isComplete());
100-
assertTrue(new CryptoFindV6Feature(session, new BoxFindFeature(session, fileid), cryptomator).find(test));
100+
assertTrue(cryptomator.getFeature(session, Find.class, new BoxFindFeature(session, fileid)).find(test));
101101
assertEquals(content.length, new CryptoAttributesFeature(session, new BoxAttributesFinderFeature(session, fileid), cryptomator).find(test).getSize());
102102
final ByteArrayOutputStream buffer = new ByteArrayOutputStream(content.length);
103103
final TransferStatus readStatus = new TransferStatus().withLength(content.length);

0 commit comments

Comments
 (0)