test: cleanup/re-enable some ignored tests (#1828)

* ITOptionRegressionTest#bucket_BucketSourceOption_userProject_String * ITBlobReadMastTest[ACL] * ITBlobReadMastTest[ETAG] * ITBucketReadMastTest[ACL] * ITBucketReadMastTest[ETAG]
googleapis · Dec 28, 2022 · a3b46cf · a3b46cf
1 parent d71bae5
commit a3b46cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBlobReadMaskTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBlobReadMaskTest.java
@@ -114,7 +114,7 @@ public static final class BlobReadMaskTestParameters implements Parameterized.Pa
     public ImmutableList<?> parameters() {
       ImmutableList<Args<BlobField, BlobInfo>> args =
           ImmutableList.of(
-              new Args<>(BlobField.ACL, LazyAssertion.skip("Waiting for b/217922398 to be fixed")),
+              new Args<>(BlobField.ACL, LazyAssertion.equal()),
               new Args<>(BlobField.BUCKET, LazyAssertion.equal()),
               new Args<>(
                   BlobField.CACHE_CONTROL,
@@ -155,7 +155,7 @@ public ImmutableList<?> parameters() {
               new Args<>(BlobField.CRC32C, LazyAssertion.equal()),
               new Args<>(BlobField.CUSTOMER_ENCRYPTION, LazyAssertion.equal()),
               new Args<>(BlobField.CUSTOM_TIME, LazyAssertion.equal()),
-              new Args<>(BlobField.ETAG, LazyAssertion.skip("Waiting for b/217922398 to be fixed")),
+              new Args<>(BlobField.ETAG, LazyAssertion.equal()),
               new Args<>(
                   BlobField.EVENT_BASED_HOLD,
                   LazyAssertion.apiaryNullGrpcDefault(false, BlobInfo::getEventBasedHold)),

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBucketReadMaskTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBucketReadMaskTest.java
@@ -97,8 +97,7 @@ public static final class BucketReadMaskTestParameters implements ParametersProv
     public ImmutableList<?> parameters() {
       ImmutableList<Args<BucketField, BucketInfo>> args =
           ImmutableList.of(
-              new Args<>(
-                  BucketField.ACL, LazyAssertion.skip("Waiting for b/217922398 to be fixed")),
+              new Args<>(BucketField.ACL, LazyAssertion.equal()),
               new Args<>(BucketField.AUTOCLASS, LazyAssertion.equal()),
               new Args<>(BucketField.BILLING, LazyAssertion.equal()),
               new Args<>(BucketField.CORS, LazyAssertion.equal()),
@@ -116,8 +115,7 @@ public ImmutableList<?> parameters() {
                     assertThat(grpcT.getDefaultAcl()).isNull(); // workaround for b/261771961
                   }),
               new Args<>(BucketField.ENCRYPTION, LazyAssertion.equal()),
-              new Args<>(
-                  BucketField.ETAG, LazyAssertion.skip("Waiting for b/217922398 to be fixed")),
+              new Args<>(BucketField.ETAG, LazyAssertion.equal()),
               new Args<>(BucketField.IAMCONFIGURATION, LazyAssertion.equal()),
               new Args<>(BucketField.ID, LazyAssertion.equal()),
               new Args<>(BucketField.LABELS, LazyAssertion.equal()),

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITOptionRegressionTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITOptionRegressionTest.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.storage.it;
 
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.Truth.assertThat;
 
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.storage.Blob;
@@ -929,7 +929,10 @@ public void bucket_BucketSourceOption_metagenerationNotMatch_() {
 
   @Test
   public void bucket_BucketSourceOption_userProject_String() {
-    assumeTrue(false);
+    // attempt to delete a bucket that doesn't exist
+    boolean delete = s.delete(bucketName(), BucketSourceOption.userProject("proj"));
+    assertThat(delete).isFalse();
+    requestAuditing.assertQueryParam("userProject", "proj");
   }
 
   @Test