From a8f5401f6c0103f044441f8423a705f0e8d47c5a Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Fri, 17 Apr 2015 17:18:28 -0700 Subject: [PATCH] Enable filesystem service tests --- .../internal/FilesystemStorageStrategyImpl.java | 8 ++++++-- ....java => FilesystemServiceIntegrationTest.java} | 4 ++-- .../FilesystemStorageStrategyImplTest.java | 14 +++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) rename apis/filesystem/src/test/java/org/jclouds/filesystem/integration/{FilesystemServiceIntegrationTestDisabled.java => FilesystemServiceIntegrationTest.java} (91%) diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index 91750d5c9a..5cab5912df 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -73,6 +73,7 @@ import org.jclouds.logging.Logger; import org.jclouds.rest.annotations.ParamValidators; import com.google.common.base.Function; +import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -116,19 +117,22 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy { protected final boolean autoDetectContentType; protected final FilesystemContainerNameValidator filesystemContainerNameValidator; protected final FilesystemBlobKeyValidator filesystemBlobKeyValidator; + private final Supplier defaultLocation; @Inject protected FilesystemStorageStrategyImpl(Provider blobBuilders, @Named(FilesystemConstants.PROPERTY_BASEDIR) String baseDir, @Named(FilesystemConstants.PROPERTY_AUTO_DETECT_CONTENT_TYPE) boolean autoDetectContentType, FilesystemContainerNameValidator filesystemContainerNameValidator, - FilesystemBlobKeyValidator filesystemBlobKeyValidator) { + FilesystemBlobKeyValidator filesystemBlobKeyValidator, + Supplier defaultLocation) { this.blobBuilders = checkNotNull(blobBuilders, "filesystem storage strategy blobBuilders"); this.baseDirectory = checkNotNull(baseDir, "filesystem storage strategy base directory"); this.autoDetectContentType = autoDetectContentType; this.filesystemContainerNameValidator = checkNotNull(filesystemContainerNameValidator, "filesystem container name validator"); this.filesystemBlobKeyValidator = checkNotNull(filesystemBlobKeyValidator, "filesystem blob key validator"); + this.defaultLocation = defaultLocation; } @Override @@ -597,7 +601,7 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy { @Override public Location getLocation(final String containerName) { - return null; + return defaultLocation.get(); } @Override diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemServiceIntegrationTestDisabled.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemServiceIntegrationTest.java similarity index 91% rename from apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemServiceIntegrationTestDisabled.java rename to apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemServiceIntegrationTest.java index 73c846950d..1913248fed 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemServiceIntegrationTestDisabled.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemServiceIntegrationTest.java @@ -25,8 +25,8 @@ import org.jclouds.filesystem.utils.TestUtils; import org.testng.annotations.Test; @Test(groups = { "integration", "live" }, testName = "blobstore.FilesystemServiceIntegrationTest") -public class FilesystemServiceIntegrationTestDisabled extends BaseServiceIntegrationTest { - public FilesystemServiceIntegrationTestDisabled() { +public class FilesystemServiceIntegrationTest extends BaseServiceIntegrationTest { + public FilesystemServiceIntegrationTest() { provider = "filesystem"; BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true; } diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java index 61f08fce83..2540e427a9 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java @@ -40,6 +40,7 @@ import org.jclouds.blobstore.domain.BlobBuilder; import org.jclouds.blobstore.domain.ContainerAccess; import org.jclouds.blobstore.domain.internal.BlobBuilderImpl; import org.jclouds.blobstore.options.ListContainerOptions; +import org.jclouds.domain.Location; import org.jclouds.filesystem.predicates.validators.internal.FilesystemBlobKeyValidatorImpl; import org.jclouds.filesystem.predicates.validators.internal.FilesystemContainerNameValidatorImpl; import org.jclouds.filesystem.utils.TestUtils; @@ -51,6 +52,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -72,6 +74,12 @@ public class FilesystemStorageStrategyImplTest { private static final String LOGGING_CONFIG_VALUE = "src/main/resources/logging.properties"; private static final String FS = File.separator; + private static final Supplier defaultLocation = new Supplier() { + @Override + public Location get() { + return null; + } + }; static { System.setProperty(LOGGING_CONFIG_KEY, LOGGING_CONFIG_VALUE); @@ -87,7 +95,7 @@ public class FilesystemStorageStrategyImplTest { return new BlobBuilderImpl(); } - }, TestUtils.TARGET_BASE_DIR, false, new FilesystemContainerNameValidatorImpl(), new FilesystemBlobKeyValidatorImpl()); + }, TestUtils.TARGET_BASE_DIR, false, new FilesystemContainerNameValidatorImpl(), new FilesystemBlobKeyValidatorImpl(), defaultLocation); TestUtils.cleanDirectoryContent(TestUtils.TARGET_BASE_DIR); TestUtils.createResources(); } @@ -386,7 +394,7 @@ public class FilesystemStorageStrategyImplTest { public BlobBuilder get() { return new BlobBuilderImpl(); } - }, TestUtils.TARGET_BASE_DIR, true, new FilesystemContainerNameValidatorImpl(), new FilesystemBlobKeyValidatorImpl()); + }, TestUtils.TARGET_BASE_DIR, true, new FilesystemContainerNameValidatorImpl(), new FilesystemBlobKeyValidatorImpl(), defaultLocation); String blobKey = TestUtils.createRandomBlobKey("file-", ".jpg"); TestUtils.createBlobsInContainer(CONTAINER_NAME, blobKey); @@ -521,7 +529,7 @@ public class FilesystemStorageStrategyImplTest { public BlobBuilder get() { return new BlobBuilderImpl(); } - }, absoluteBasePath, false, new FilesystemContainerNameValidatorImpl(), new FilesystemBlobKeyValidatorImpl()); + }, absoluteBasePath, false, new FilesystemContainerNameValidatorImpl(), new FilesystemBlobKeyValidatorImpl(), defaultLocation); TestUtils.cleanDirectoryContent(absoluteContainerPath); String blobKey;