Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable more filesystem integration tests 

Other tests will require Java 7 xattr support.
This commit is contained in:
Andrew Gaul 2014-07-16 16:23:20 -07:00
parent dd3dc9790e
commit 370194b2be
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java
View File

@ -121,13 +121,17 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
@Override @Override
public void clearContainer(String container, ListContainerOptions options) { public void clearContainer(String container, ListContainerOptions options) {
filesystemContainerNameValidator.validate(container); filesystemContainerNameValidator.validate(container);
// TODO implement options if (options.getDir() != null) {
container += denormalize("/" + options.getDir());
}
try { try {
File containerFile = openFolder(container); File containerFile = openFolder(container);
File[] children = containerFile.listFiles(); File[] children = containerFile.listFiles();
if (null != children) { if (null != children) {
for (File child : children) for (File child : children)
Utils.deleteRecursively(child); if (options.isRecursive() || child.isFile()) {
Utils.deleteRecursively(child);
}
} }
} catch (IOException e) { } catch (IOException e) {
logger.error(e, "An error occurred while clearing container %s", container); logger.error(e, "An error occurred while clearing container %s", container);

11
apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java
View File

@ -60,21 +60,16 @@ public class FilesystemBlobIntegrationTest extends BaseBlobIntegrationTest {
@Override @Override
public void testCreateBlobWithExpiry() throws InterruptedException { public void testCreateBlobWithExpiry() throws InterruptedException {
throw new SkipException("not yet implemented"); throw new SkipException("requires Java 7 xattr support");
} }
@Override @Override
public void testGetIfModifiedSince() throws InterruptedException { public void testGetIfModifiedSince() throws InterruptedException {
throw new SkipException("not yet implemented"); throw new SkipException("requires Java 7 xattr support");
} }
@Override @Override
public void testGetIfUnmodifiedSince() throws InterruptedException { public void testGetIfUnmodifiedSince() throws InterruptedException {
throw new SkipException("not yet implemented"); throw new SkipException("requires Java 7 xattr support");
}
@Override
public void testPutObjectStream() throws InterruptedException, IOException, ExecutionException {
throw new SkipException("not yet implemented");
} }
} }

12
apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java
View File

@ -82,19 +82,9 @@ public class FilesystemContainerIntegrationTest extends BaseContainerIntegration
} }
} }
@Override
public void testClearWhenContentsUnderPath() throws InterruptedException {
throw new SkipException("not yet implemented");
}
@Override
public void testDirectory() throws InterruptedException {
throw new SkipException("not yet implemented");
}
@Override @Override
public void testWithDetails() throws InterruptedException, IOException { public void testWithDetails() throws InterruptedException, IOException {
throw new SkipException("not yet implemented"); throw new SkipException("requires Java 7 xattr support");
} }
@Override @Override