avoid OID <-> object_id ambiguity in test

jruby · Jan 11, 2016 · 34ca695 · 34ca695
1 parent ef7a170
commit 34ca695
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/test/ruby/pkcs7/test_pkcs7.rb b/src/test/ruby/pkcs7/test_pkcs7.rb
@@ -739,7 +739,7 @@ def test_pem_read_pkcs7_bio
       assert_equal 0, env.version
       enc_data = env.enc_data
       assert_equal ASN1Registry::NID_pkcs7_data, enc_data.content_type
-      assert_equal ASN1Registry::NID_aes_128_cbc, ASN1Registry::oid2nid(enc_data.algorithm.object_id)
+      assert_equal ASN1Registry::NID_aes_128_cbc, ASN1Registry::oid2nid(alg_oid(enc_data.algorithm))
       assert_equal PKCS7_PEM_CONTENTS, String.from_java_bytes(enc_data.enc_data.octets)
 
       ris = env.recipient_info
@@ -766,15 +766,17 @@ def test_pem_read_pkcs7_bio
       assert_equal "DC=org,DC=ruby-lang,CN=CA", first.issuer_and_serial.name.to_s
       assert_equal "DC=org,DC=ruby-lang,CN=CA", second.issuer_and_serial.name.to_s
 
-      assert_equal ASN1Registry::NID_rsaEncryption, ASN1Registry::oid2nid(first.key_enc_algor.object_id)
-      assert_equal ASN1Registry::NID_rsaEncryption, ASN1Registry::oid2nid(second.key_enc_algor.object_id)
+      assert_equal ASN1Registry::NID_rsaEncryption, ASN1Registry::oid2nid(alg_oid(first.key_enc_algor))
+      assert_equal ASN1Registry::NID_rsaEncryption, ASN1Registry::oid2nid(alg_oid(second.key_enc_algor))
 
       assert_equal PKCS7_PEM_FIRST_KEY, String.from_java_bytes(first.enc_key.octets)
       assert_equal PKCS7_PEM_SECOND_KEY, String.from_java_bytes(second.enc_key.octets)
     end
 
     private
 
+    def alg_oid(alg); return alg.getAlgorithm end
+
     def assert_raise_pkcs7_exception
       begin
         yield