WIP: open types support

1 files changed, 4 insertions, 18 deletions

diff --git a/tests/test_rfc2315.py b/tests/test_rfc2315.py
index b451ed1..ba92801 100644
--- a/tests/test_rfc2315.py
+++ b/tests/test_rfc2315.py
@@ -148,29 +148,15 @@ Kv0xuR3b3Le+ZqolT8wQELd5Mmw5JPofZ+O2cGNvet8tYwOKFjEA
         assert asn1Object.prettyPrint()
         assert der_encoder.encode(asn1Object) == substrate
 
-        contentType = asn1Object['contentType']
-        substrate = asn1Object['content']
+    def testDerCodecDecodeOpenTypes(self):
 
-        contentInfoMap = {
-            (1, 2, 840, 113549, 1, 7, 1): rfc2315.Data(),
-            (1, 2, 840, 113549, 1, 7, 2): rfc2315.SignedData(),
-            (1, 2, 840, 113549, 1, 7, 3): rfc2315.EnvelopedData(),
-            (1, 2, 840, 113549, 1, 7, 4): rfc2315.SignedAndEnvelopedData(),
-            (1, 2, 840, 113549, 1, 7, 5): rfc2315.DigestedData(),
-            (1, 2, 840, 113549, 1, 7, 6): rfc2315.EncryptedData()
-        }
-
-        innerAsn1Object, rest = der_decoder.decode(
-            substrate, asn1Spec=contentInfoMap[contentType]
-        )
-
-        asn1Object['content'] = der_encoder.encode(innerAsn1Object)
+        substrate = pem.readBase64fromText(self.pem_text_unordered)
 
-        substrate = pem.readBase64fromText(self.pem_text_reordered)
+        asn1Object, rest = der_decoder.decode(substrate, asn1Spec=self.asn1Spec, decodeOpenTypes=True)
 
         assert not rest
         assert asn1Object.prettyPrint()
-        assert der_encoder.encode(asn1Object) == substrate
+        assert der_encoder.encode(asn1Object, decodeOpenTypes=True) == substrate
 
 
 suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])