Added FolderChildrenTests and FolderTests

* implemented some testcases * fixed some issues
cryptomator · Jan 15, 2016 · 20e7f4a · 20e7f4a
1 parent 18cf257
commit 20e7f4a
Show file tree

Hide file tree

Showing 16 changed files with 386 additions and 64 deletions.
diff --git a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/Deleter.java b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/Deleter.java
@@ -0,0 +1,15 @@
+package org.cryptomator.filesystem;
+
+public class Deleter {
+
+	/**
+	 * Deletes all and only the content of a given {@link Folder} but <b>not</b> the folder itself.
+	 */
+	public static void deleteContent(Folder folder) {
+		if (folder.exists()) {
+			folder.folders().forEach(Folder::delete);
+			folder.files().forEach(File::delete);
+		}
+	}
+
+}
diff --git a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/File.java b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/File.java
@@ -75,4 +75,10 @@ default void moveTo(File destination) {
 		Mover.move(this, destination);
 	}
 
+	default void delete() {
+		try (WritableFile writableFile = openWritable()) {
+			writableFile.delete();
+		}
+	}
+
 }
diff --git a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/Folder.java b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/Folder.java
@@ -31,7 +31,7 @@ public interface Folder extends Node {
 	 * @return the created {@code Stream}
 	 * @throws UncheckedIOException
 	 *             if an {@link IOException} occurs while initializing the
-	 *             stream
+	 *             stream or the {@code Folder} does not exist
 	 */
 	Stream<? extends Node> children() throws UncheckedIOException;
 

diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystem.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystem.java
@@ -44,6 +44,7 @@ public CryptoFileSystem(Folder physicalRoot, Cryptor cryptor, CharSequence passp
 		assert masterkeyFile.exists() : "A CryptoFileSystem can not exist without a masterkey file.";
 		final File backupFile = physicalRoot.file(MASTERKEY_BACKUP_FILENAME);
 		masterkeyFile.copyTo(backupFile);
+		create();
 	}
 
 	private static boolean decryptMasterKeyFile(Cryptor cryptor, File masterkeyFile, CharSequence passphrase) {

diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFolder.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFolder.java
@@ -25,6 +25,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.cryptomator.common.WeakValuedCache;
 import org.cryptomator.crypto.engine.Cryptor;
+import org.cryptomator.filesystem.Deleter;
 import org.cryptomator.filesystem.File;
 import org.cryptomator.filesystem.Folder;
 import org.cryptomator.filesystem.Node;
@@ -159,8 +160,12 @@ private void moveToInternal(CryptoFolder target) {
 
 	@Override
 	public void delete() {
-		// TODO Auto-generated method stub
-
+		if (!exists()) {
+			return;
+		}
+		Deleter.deleteContent(this);
+		physicalFile().delete();
+		physicalFolder().delete();
 	}
 
 	@Override

diff --git a/...lesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemTest.java b/...lesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemTest.java
@@ -50,13 +50,9 @@ public void testVaultStructureInitialization() throws UncheckedIOException, IOEx
 		Assert.assertTrue(masterkeyBkupFile.exists());
 		fs.create();
 		Assert.assertTrue(physicalDataRoot.exists());
-		Assert.assertEquals(3, physicalFs.children().count()); // d +
-																// masterkey.cryptomator
-																// +
-																// masterkey.cryptomator.bkup
+		Assert.assertEquals(3, physicalFs.children().count()); // d + masterkey.cryptomator + masterkey.cryptomator.bkup
 		Assert.assertEquals(1, physicalDataRoot.files().count()); // ROOT file
-		Assert.assertEquals(1, physicalDataRoot.folders().count()); // ROOT
-																	// directory
+		Assert.assertEquals(1, physicalDataRoot.folders().count()); // ROOT directory
 	}
 
 	@Test(timeout = 1000)

diff --git a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFolder.java b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFolder.java
@@ -8,6 +8,9 @@
  *******************************************************************************/
 package org.cryptomator.filesystem.inmem;
 
+import static java.lang.String.format;
+
+import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.time.Instant;
 import java.util.Iterator;
@@ -32,7 +35,11 @@ public InMemoryFolder(InMemoryFolder parent, String name, Instant lastModified,
 
 	@Override
 	public Stream<InMemoryNode> children() {
-		return existingChildren.values().stream();
+		if (exists()) {
+			return existingChildren.values().stream();
+		} else {
+			throw new UncheckedIOException(new IOException(format("Folder %s does not exist", this)));
+		}
 	}
 
 	@Override
@@ -76,11 +83,11 @@ public void moveTo(Folder target) {
 		if (target.exists()) {
 			target.delete();
 		}
-		assert!target.exists();
+		assert !target.exists();
 		target.create();
 		this.copyTo(target);
 		this.delete();
-		assert!this.exists();
+		assert !this.exists();
 	}
 
 	@Override
@@ -102,7 +109,7 @@ public void delete() {
 				subFolder.delete();
 			}
 		}
-		assert!this.exists();
+		assert !this.exists();
 	}
 
 	@Override

diff --git a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryNode.java b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryNode.java
@@ -41,7 +41,7 @@ public Optional<InMemoryFolder> parent() {
 
 	@Override
 	public boolean exists() {
-		return parent.children().anyMatch(node -> node.equals(this));
+		return parent.exists() && parent.children().anyMatch(node -> node.equals(this));
 	}
 
 	@Override

diff --git a/...riants-tests/src/test/java/org/cryptomator/filesystem/invariants/FileSystemFactories.java b/...riants-tests/src/test/java/org/cryptomator/filesystem/invariants/FileSystemFactories.java
@@ -14,11 +14,10 @@
 import org.cryptomator.filesystem.FileSystem;
 import org.cryptomator.filesystem.crypto.CryptoFileSystem;
 import org.cryptomator.filesystem.inmem.InMemoryFileSystem;
+import org.cryptomator.filesystem.invariants.FileSystemFactories.FileSystemFactory;
 import org.cryptomator.filesystem.nio.NioFileSystem;
 
-import com.google.common.base.Supplier;
-
-class FileSystemFactories implements Iterable<Supplier<FileSystem>> {
+class FileSystemFactories implements Iterable<FileSystemFactory> {
 
 	private static final SecureRandom RANDOM_MOCK = new SecureRandom() {
 		@Override
@@ -27,13 +26,13 @@ public void nextBytes(byte[] bytes) {
 		}
 	};
 
-	private final List<Supplier<FileSystem>> factories = new ArrayList<>();
+	private final List<FileSystemFactory> factories = new ArrayList<>();
 
 	public FileSystemFactories() {
 		add("NioFileSystem", this::createNioFileSystem);
 		add("InMemoryFileSystem", this::createInMemoryFileSystem);
+		add("CryptoFileSystem(NioFileSystem)", this::createCryptoFileSystemNio);
 		add("CryptoFileSystem(InMemoryFileSystem)", this::createCryptoFileSystemInMemory);
-		// FIXME fails add("CryptoFileSystem(NioFileSystem)", this::createCryptoFileSystemNio);
 	}
 
 	private FileSystem createNioFileSystem() {
@@ -56,11 +55,11 @@ private FileSystem createCryptoFileSystemNio() {
 		return new CryptoFileSystem(createNioFileSystem(), new CryptorImpl(RANDOM_MOCK), "aPassphrase");
 	}
 
-	private void add(String name, Supplier<FileSystem> fileSystemSupplier) {
-		factories.add(new Supplier<FileSystem>() {
+	private void add(String name, FileSystemFactory factory) {
+		factories.add(new FileSystemFactory() {
 			@Override
-			public FileSystem get() {
-				return fileSystemSupplier.get();
+			public FileSystem create() {
+				return factory.create();
 			}
 
 			@Override
@@ -71,8 +70,14 @@ public String toString() {
 	}
 
 	@Override
-	public Iterator<Supplier<FileSystem>> iterator() {
+	public Iterator<FileSystemFactory> iterator() {
 		return factories.iterator();
 	}
 
+	public interface FileSystemFactory {
+
+		FileSystem create();
+
+	}
+
 }
diff --git a/...invariants-tests/src/test/java/org/cryptomator/filesystem/invariants/FileSystemTests.java b/...invariants-tests/src/test/java/org/cryptomator/filesystem/invariants/FileSystemTests.java
@@ -6,84 +6,83 @@
 import java.util.Optional;
 
 import org.cryptomator.filesystem.FileSystem;
+import org.cryptomator.filesystem.invariants.FileSystemFactories.FileSystemFactory;
 import org.junit.Rule;
 import org.junit.experimental.theories.DataPoints;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 
-import com.google.common.base.Supplier;
-
 @RunWith(Theories.class)
 public class FileSystemTests {
 
 	@DataPoints
-	public static final Iterable<Supplier<FileSystem>> FILE_SYSTEM_FACTORIES = new FileSystemFactories();
+	public static final Iterable<FileSystemFactory> FILE_SYSTEM_FACTORIES = new FileSystemFactories();
 
 	@Rule
 	public final ExpectedException thrown = ExpectedException.none();
 
 	@Theory
-	public void testFileSystemHasNoParent(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
+	public void testFileSystemHasNoParent(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
 
 		assertThat(inTest.parent(), is(Optional.empty()));
 	}
 
 	@Theory
-	public void testFileSystemExists(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
+	public void testFileSystemExists(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
 
 		assertThat(inTest.exists(), is(true));
 	}
 
 	@Theory
-	public void testFileSystemHasNoChildren(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
+	public void testFileSystemHasNoChildren(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
 
 		assertThat(inTest.children().count(), is(0L));
 	}
 
 	@Theory
-	public void testFileSystemHasNoFiles(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
+	public void testFileSystemHasNoFiles(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
 
 		assertThat(inTest.files().count(), is(0L));
 	}
 
 	@Theory
-	public void testFileSystemHasNoFolders(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
+	public void testFileSystemHasNoFolders(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
 
 		assertThat(inTest.folders().count(), is(0L));
 	}
 
 	@Theory
-	public void testFileSystemsFileSystemIsItself(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
+	public void testFileSystemsFileSystemIsItself(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
 
 		assertThat(inTest.fileSystem(), is(inTest));
 	}
 
 	@Theory
-	public void testFileSystemBelongsToSameFilesystemWhenCheckingItself(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
+	public void testFileSystemBelongsToSameFilesystemWhenCheckingItself(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
 
 		assertThat(inTest.belongsToSameFilesystem(inTest), is(true));
 	}
 
 	@Theory
-	public void testFileSystemDoesNotBelongToSameFilesystemWhenCheckingOtherInstance(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
-		FileSystem otherInstance = factory.get();
+	public void testFileSystemDoesNotBelongToSameFilesystemWhenCheckingOtherInstance(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
+		FileSystem otherInstance = factory.create();
 
 		assertThat(inTest.belongsToSameFilesystem(otherInstance), is(false));
 	}
 
 	@Theory
-	public void testFileSystemIsNoAncestorOfItself(Supplier<FileSystem> factory) {
-		FileSystem inTest = factory.get();
+	public void testFileSystemIsNoAncestorOfItself(FileSystemFactory factory) {
+		FileSystem inTest = factory.create();
 
 		assertThat(inTest.isAncestorOf(inTest), is(false));
 	}