updating tests

Author: shubhangi-google

google-cloud-storage/test/google/cloud/storage/bucket_encryption_test.rb

@@ -89,10 +89,14 @@
       bucket_gapi_with_key = bucket_gapi.dup
       bucket_gapi_with_key.encryption = encryption_gapi(key_name: kms_key)
       bucket_with_key = Google::Cloud::Storage::Bucket.from_gapi bucket_gapi_with_key, storage.service
+      patch_bucket_gapi = Google::Apis::StorageV1::Bucket.new encryption: encryption_gapi(key_name: kms_key)
+      patch_bucket_gapi = Google::Apis::StorageV1::Bucket.new(
+        encryption: Google::Apis::StorageV1::Bucket::Encryption.new(
+          default_kms_key_name: nil 
+        )
+      )
       mock = Minitest::Mock.new
-      mock.expect :patch_bucket, bucket_gapi do |name, patch_obj, **args|
-        name == bucket_name && patch_obj.encryption&.default_kms_key_name.nil?
-      end
+      mock.expect :patch_bucket, bucket_gapi, [bucket_name, patch_bucket_gapi], **patch_bucket_args(options: {retries: 0})
 
       bucket_with_key.service.mocked_service = mock
 
@@ -123,9 +127,6 @@
   end
 
   describe "encryption enforcement config" do
-    let(:customer_managed_encryption) { Google::Apis::StorageV1::Bucket::Encryption::CustomerManagedEncryptionEnforcementConfig.new restriction_mode: "NotRestricted" }
-    let(:customer_supplied_encryption) { Google::Apis::StorageV1::Bucket::Encryption::CustomerSuppliedEncryptionEnforcementConfig.new restriction_mode: "FullyRestricted" }
-    let(:google_managed_encryption) { Google::Apis::StorageV1::Bucket::Encryption::GoogleManagedEncryptionEnforcementConfig.new restriction_mode: "NotRestricted" }
     let(:bucket_encryption) do
       Google::Apis::StorageV1::Bucket::Encryption.new(
         customer_managed_encryption_enforcement_config: customer_managed_encryption,
@@ -142,8 +143,8 @@
     end
 
     it "knows its encryption enforcement config" do
-      _(bucket.customer_managed_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
-      _(bucket.customer_supplied_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
+      _(bucket.customer_managed_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
+      _(bucket.customer_supplied_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
       _(bucket.google_managed_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
     end
 
@@ -163,13 +164,13 @@
       mock.expect :patch_bucket, returned_bucket_gapi, [bucket_name, patch_bucket_gapi], **patch_bucket_args(options: { retries: 0 })
 
       bucket.service.mocked_service = mock
-      _(bucket.customer_managed_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
-      _(bucket.customer_supplied_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
+      _(bucket.customer_managed_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
+      _(bucket.customer_supplied_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
       _(bucket.google_managed_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
 
       bucket.update_bucket_encryption_enforcement_config incoming_config
-       _(bucket.customer_managed_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
-      _(bucket.customer_supplied_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
+       _(bucket.customer_managed_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
+      _(bucket.customer_supplied_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
       _(bucket.google_managed_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
 
       mock.verify

google-cloud-storage/test/helper.rb

@@ -244,6 +244,24 @@ def download_http_resp gzip: nil
     OpenStruct.new(header: headers)
   end
 
+  def customer_managed_encryption
+     Google::Apis::StorageV1::Bucket::Encryption::CustomerManagedEncryptionEnforcementConfig.new(
+      restriction_mode: "FullyRestricted"
+     )   
+  end
+
+  def customer_supplied_encryption
+    Google::Apis::StorageV1::Bucket::Encryption::CustomerSuppliedEncryptionEnforcementConfig.new(
+      restriction_mode: "NotRestricted"
+     )
+  end
+
+  def google_managed_encryption
+    Google::Apis::StorageV1::Bucket::Encryption::GoogleManagedEncryptionEnforcementConfig.new(
+      restriction_mode: "NotRestricted"
+     )
+  end
+
   def encryption_gapi(key_name: nil, 
                     customer_managed_config_restriction_mode: nil, 
                     customer_supplied_config_restriction_mode: nil, 
@@ -258,7 +276,7 @@ def encryption_gapi(key_name: nil,
       customer_managed_encryption_enforcement_config: cm_config,
       customer_supplied_encryption_enforcement_config: cs_config,
       google_managed_encryption_enforcement_config: gm_config
-    }.compact # This removes the nil values so the API doesn't get empty configs
+    }.compact
 
     Google::Apis::StorageV1::Bucket::Encryption.new(**params)
   end