This is an automated email from the ASF dual-hosted git repository. gaul pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 5111923566a9c5fc37529b5098a9a53806c04c0e Author: Andrew Gaul <g...@apache.org> AuthorDate: Sun Jul 31 20:08:17 2022 +0900 Specify missing DataProviders Uncovered by newer versions of testng. --- .../integration/FilesystemBlobIntegrationTest.java | 9 +++++++++ .../integration/internal/BaseContainerIntegrationTest.java | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java index a4ed63c694..2fa70014a8 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java @@ -17,6 +17,8 @@ package org.jclouds.filesystem.integration; import static org.jclouds.filesystem.util.Utils.isMacOSX; +import static org.jclouds.utils.TestUtils.NO_INVOCATIONS; +import static org.jclouds.utils.TestUtils.SINGLE_NO_ARG_INVOCATION; import java.io.IOException; import java.util.Arrays; @@ -44,6 +46,7 @@ import org.jclouds.filesystem.reference.FilesystemConstants; import org.jclouds.filesystem.utils.TestUtils; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.testng.SkipException; @@ -205,4 +208,10 @@ public class FilesystemBlobIntegrationTest extends BaseBlobIntegrationTest { throw new SkipException("filesystem does not support extended attributes in Mac OSX"); } } + + @DataProvider + public Object[][] ignoreOnMacOSX() { + return isMacOSX() ? NO_INVOCATIONS + : SINGLE_NO_ARG_INVOCATION; + } } diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java index 0c7b50378b..f13ad6ce6c 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java @@ -24,6 +24,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.afterMarker; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.inDirectory; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults; +import static org.jclouds.utils.TestUtils.NO_INVOCATIONS; +import static org.jclouds.utils.TestUtils.SINGLE_NO_ARG_INVOCATION; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -790,4 +792,14 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest { Uninterruptibles.sleepUninterruptibly(AWAIT_CONSISTENCY_TIMEOUT_SECONDS, TimeUnit.SECONDS); } } + + @DataProvider + public Object[][] ignoreOnWindows() { + return isWindowsOs() ? NO_INVOCATIONS + : SINGLE_NO_ARG_INVOCATION; + } + + private static boolean isWindowsOs() { + return System.getProperty("os.name", "").toLowerCase().contains("windows"); + } }