Prefer failBecauseExceptionWasNotThrown over fail

pull/210/head
Andrew Gaul 2017-04-18 11:53:09 -07:00
rodzic 9ddcc5b2e6
commit d005f452de
1 zmienionych plików z 9 dodań i 6 usunięć

Wyświetl plik

@ -16,14 +16,13 @@
package org.gaul.s3proxy; package org.gaul.s3proxy;
import static org.testng.Assert.fail;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import com.google.common.util.concurrent.Uninterruptibles; import com.google.common.util.concurrent.Uninterruptibles;
import org.assertj.core.api.Fail;
import org.jclouds.Constants; import org.jclouds.Constants;
import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.s3.blobstore.integration.S3BlobSignerLiveTest; import org.jclouds.s3.blobstore.integration.S3BlobSignerLiveTest;
@ -82,7 +81,8 @@ public final class JcloudsS3BlobSignerLiveTest extends S3BlobSignerLiveTest {
throws InterruptedException, IOException { throws InterruptedException, IOException {
try { try {
super.testSignGetUrlWithTime(); super.testSignGetUrlWithTime();
fail(); Fail.failBecauseExceptionWasNotThrown(
UnsupportedOperationException.class);
} catch (UnsupportedOperationException uoe) { } catch (UnsupportedOperationException uoe) {
throw new SkipException("not supported by jclouds S3 signer"); throw new SkipException("not supported by jclouds S3 signer");
} }
@ -93,7 +93,8 @@ public final class JcloudsS3BlobSignerLiveTest extends S3BlobSignerLiveTest {
throws InterruptedException, IOException { throws InterruptedException, IOException {
try { try {
super.testSignGetUrlWithTimeExpired(); super.testSignGetUrlWithTimeExpired();
fail(); Fail.failBecauseExceptionWasNotThrown(
UnsupportedOperationException.class);
} catch (UnsupportedOperationException uoe) { } catch (UnsupportedOperationException uoe) {
throw new SkipException("not supported by jclouds S3 signer"); throw new SkipException("not supported by jclouds S3 signer");
} }
@ -103,7 +104,8 @@ public final class JcloudsS3BlobSignerLiveTest extends S3BlobSignerLiveTest {
public void testSignPutUrlWithTime() throws Exception { public void testSignPutUrlWithTime() throws Exception {
try { try {
super.testSignPutUrlWithTime(); super.testSignPutUrlWithTime();
fail(); Fail.failBecauseExceptionWasNotThrown(
UnsupportedOperationException.class);
} catch (UnsupportedOperationException uoe) { } catch (UnsupportedOperationException uoe) {
throw new SkipException("not supported by jclouds S3 signer"); throw new SkipException("not supported by jclouds S3 signer");
} }
@ -113,7 +115,8 @@ public final class JcloudsS3BlobSignerLiveTest extends S3BlobSignerLiveTest {
public void testSignPutUrlWithTimeExpired() throws Exception { public void testSignPutUrlWithTimeExpired() throws Exception {
try { try {
super.testSignPutUrlWithTimeExpired(); super.testSignPutUrlWithTimeExpired();
fail(); Fail.failBecauseExceptionWasNotThrown(
UnsupportedOperationException.class);
} catch (UnsupportedOperationException uoe) { } catch (UnsupportedOperationException uoe) {
throw new SkipException("not supported by jclouds S3 signer"); throw new SkipException("not supported by jclouds S3 signer");
} }