From be2aa42af31100403f6ed35ab7beef657fd5906e Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Tue, 3 Aug 2010 22:20:55 +0200 Subject: [PATCH] Updated to work with the new schema modules --- tests/test_00_xmldsig.py | 53 +++++++++++++++++++------------------- tests/test_05_md.py | 4 +-- tests/test_20_assertion.py | 13 ---------- tests/test_30_metadata.py | 28 ++++++++++---------- 4 files changed, 43 insertions(+), 55 deletions(-) diff --git a/tests/test_00_xmldsig.py b/tests/test_00_xmldsig.py index f57e60a..2883848 100644 --- a/tests/test_00_xmldsig.py +++ b/tests/test_00_xmldsig.py @@ -161,49 +161,50 @@ class TestX509Data: """Test for X509Data accessors""" st = ds.x509_issuer_serial_from_string(ds_data.TEST_X509_ISSUER_SERIAL) print st - self.x509_data.x509_issuer_serial.append(st) - self.x509_data.x509_ski.append(ds.X509SKI(text="x509 ski")) - self.x509_data.x509_subject_name.append(ds.X509SubjectName( - text="x509 subject name")) - self.x509_data.x509_certificate.append(ds.X509Certificate( - text="x509 certificate")) - self.x509_data.x509_crl.append(ds.X509CRL(text="x509 crl")) + self.x509_data.x509_issuer_serial= st + self.x509_data.x509_ski = ds.X509SKI(text="x509 ski") + self.x509_data.x509_subject_name = ds.X509SubjectName( + text="x509 subject name") + self.x509_data.x509_certificate = ds.X509Certificate( + text="x509 certificate") + self.x509_data.x509_crl = ds.X509CRL(text="x509 crl") + new_x509_data = ds.x509_data_from_string(self.x509_data.to_string()) print new_x509_data.keyswv() print new_x509_data.__dict__.keys() - print len(new_x509_data.x509_issuer_serial) - assert isinstance(new_x509_data.x509_issuer_serial[0], + assert new_x509_data.x509_issuer_serial + assert isinstance(new_x509_data.x509_issuer_serial, ds.X509IssuerSerialType) - assert new_x509_data.x509_ski[0].text.strip() == "x509 ski" - assert isinstance(new_x509_data.x509_ski[0], ds.X509SKI) - assert new_x509_data.x509_subject_name[0].text.strip() == \ + assert new_x509_data.x509_ski.text.strip() == "x509 ski" + assert isinstance(new_x509_data.x509_ski, ds.X509SKI) + assert new_x509_data.x509_subject_name.text.strip() == \ "x509 subject name" - assert isinstance(new_x509_data.x509_subject_name[0], + assert isinstance(new_x509_data.x509_subject_name, ds.X509SubjectName) - assert new_x509_data.x509_certificate[0].text.strip() == \ + assert new_x509_data.x509_certificate.text.strip() == \ "x509 certificate" - assert isinstance(new_x509_data.x509_certificate[0], + assert isinstance(new_x509_data.x509_certificate, ds.X509Certificate) - assert new_x509_data.x509_crl[0].text.strip() == "x509 crl" - assert isinstance(new_x509_data.x509_crl[0],ds.X509CRL) + assert new_x509_data.x509_crl.text.strip() == "x509 crl" + assert isinstance(new_x509_data.x509_crl,ds.X509CRL) def testUsingTestData(self): """Test for x509_data_from_string() using test data""" new_x509_data = ds.x509_data_from_string(ds_data.TEST_X509_DATA) - assert isinstance(new_x509_data.x509_issuer_serial[0], + assert isinstance(new_x509_data.x509_issuer_serial, ds.X509IssuerSerial) - assert new_x509_data.x509_ski[0].text.strip() == "x509 ski" - assert isinstance(new_x509_data.x509_ski[0], ds.X509SKI) - assert new_x509_data.x509_subject_name[0].text.strip() == \ + assert new_x509_data.x509_ski.text.strip() == "x509 ski" + assert isinstance(new_x509_data.x509_ski, ds.X509SKI) + assert new_x509_data.x509_subject_name.text.strip() == \ "x509 subject name" - assert isinstance(new_x509_data.x509_subject_name[0], + assert isinstance(new_x509_data.x509_subject_name, ds.X509SubjectName) - assert new_x509_data.x509_certificate[0].text.strip() == \ + assert new_x509_data.x509_certificate.text.strip() == \ "x509 certificate" - assert isinstance(new_x509_data.x509_certificate[0], + assert isinstance(new_x509_data.x509_certificate, ds.X509Certificate) - assert new_x509_data.x509_crl[0].text.strip() == "x509 crl" - assert isinstance(new_x509_data.x509_crl[0],ds.X509CRL) + assert new_x509_data.x509_crl.text.strip() == "x509 crl" + assert isinstance(new_x509_data.x509_crl,ds.X509CRL) class TestTransform: diff --git a/tests/test_05_md.py b/tests/test_05_md.py index f36ebcb..6260821 100644 --- a/tests/test_05_md.py +++ b/tests/test_05_md.py @@ -1063,7 +1063,7 @@ class TestEntityDescriptor: md.IDPSSODescriptor) assert isinstance(new_entity_descriptor.spsso_descriptor[0], md.SPSSODescriptor) - assert isinstance(new_entity_descriptor.organization[0], + assert isinstance(new_entity_descriptor.organization, md.Organization) assert isinstance(new_entity_descriptor.contact_person[0], md.ContactPerson) @@ -1087,7 +1087,7 @@ class TestEntityDescriptor: md.IDPSSODescriptor) assert isinstance(new_entity_descriptor.spsso_descriptor[0], md.SPSSODescriptor) - assert isinstance(new_entity_descriptor.organization[0], + assert isinstance(new_entity_descriptor.organization, md.Organization) assert isinstance(new_entity_descriptor.contact_person[0], md.ContactPerson) diff --git a/tests/test_20_assertion.py b/tests/test_20_assertion.py index 50e7c2d..693a546 100644 --- a/tests/test_20_assertion.py +++ b/tests/test_20_assertion.py @@ -27,19 +27,6 @@ mail = md.RequestedAttribute( # --------------------------------------------------------------------------- -def test_combine_0(): - r = Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI, - friendly_name="serialNumber") - o = Attribute(name="urn:oid:2.5.4.4", name_format=NAME_FORMAT_URI, - friendly_name="surName") - - comb = assertion._combine([r],[o]) - print comb - assert _eq(comb.keys(), [('urn:oid:2.5.4.5', 'serialNumber'), - ('urn:oid:2.5.4.4', 'surName')]) - assert comb[('urn:oid:2.5.4.5', 'serialNumber')] == ([], []) - assert comb[('urn:oid:2.5.4.4', 'surName')] == ([], []) - def test_filter_on_attributes_0(): a = Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI, friendly_name="serialNumber") diff --git a/tests/test_30_metadata.py b/tests/test_30_metadata.py index 3aec570..6c07cb8 100644 --- a/tests/test_30_metadata.py +++ b/tests/test_30_metadata.py @@ -264,11 +264,11 @@ def test_construct_entity_descr_1(): assert ed.entity_id == "urn:mace:catalogix.se:sp1" org = ed.organization - assert len(org) == 1 - assert _eq(org[0].keyswv(), ["organization_name","organization_url"]) - assert len(org[0].organization_name) == 1 - assert org[0].organization_name[0].text == "Catalogix" - assert org[0].organization_url[0].text == "http://www.catalogix.se/" + assert org + assert _eq(org.keyswv(), ["organization_name","organization_url"]) + assert len(org.organization_name) == 1 + assert org.organization_name[0].text == "Catalogix" + assert org.organization_url[0].text == "http://www.catalogix.se/" def test_construct_entity_descr_2(): ed = make_instance(md.EntityDescriptor, @@ -286,11 +286,11 @@ def test_construct_entity_descr_2(): assert _eq(ed.keyswv(), ["entity_id", "contact_person", "organization"]) assert ed.entity_id == "urn:mace:catalogix.se:sp1" org = ed.organization - assert len(org) == 1 - assert _eq(org[0].keyswv(), ["organization_name", "organization_url"]) - assert len(org[0].organization_name) == 1 - assert org[0].organization_name[0].text == "Catalogix" - assert org[0].organization_url[0].text == "http://www.catalogix.se/" + assert org + assert _eq(org.keyswv(), ["organization_name", "organization_url"]) + assert len(org.organization_name) == 1 + assert org.organization_name[0].text == "Catalogix" + assert org.organization_url[0].text == "http://www.catalogix.se/" assert len(ed.contact_person) == 1 c = ed.contact_person[0] assert c.given_name.text == "Roland" @@ -316,8 +316,8 @@ def test_construct_key_descriptor(): assert len(ki.x509_data) == 1 data = ki.x509_data[0] assert _eq(data.keyswv(), ["x509_certificate"]) - assert len(data.x509_certificate) == 1 - assert len(data.x509_certificate[0].text.strip()) == len(cert) + assert data.x509_certificate + assert len(data.x509_certificate.text.strip()) == len(cert) def test_construct_key_descriptor_with_key_name(): cert = "".join(_read_lines("test.pem")[1:-1]).strip() @@ -340,8 +340,8 @@ def test_construct_key_descriptor_with_key_name(): assert len(ki.x509_data) == 1 data = ki.x509_data[0] assert _eq(data.keyswv(), ["x509_certificate"]) - assert len(data.x509_certificate) == 1 - assert len(data.x509_certificate[0].text.strip()) == len(cert) + assert data.x509_certificate + assert len(data.x509_certificate.text.strip()) == len(cert) def test_construct_AttributeAuthorityDescriptor(): aad = make_instance(