Adjust tests to default namespace prefix

tests/test_88_nsprefix.py:
Adjust "ns0" to namespace prefix "samlp"

tests/test_02_saml.py:
Use different prefix than the default one.

tests/test_42_enc.py:
The order of the namespace arguments in the string representation has changed (sorted alphabetical)

Author: spaceone

tests/test_02_saml.py

@@ -225,12 +225,13 @@ def test_make_vals_multi_dict(self):
     def test_to_string_nspair(self):
         foo = saml2.make_vals("lions", AttributeValue, part=True)
         txt = foo.to_string().decode('utf-8')
-        nsstr = foo.to_string({"saml": saml.NAMESPACE}).decode('utf-8')
+        nsstr = foo.to_string({"saml2": saml.NAMESPACE}).decode('utf-8')
         assert nsstr != txt
         print(txt)
         print(nsstr)
-        assert "saml:AttributeValue" in nsstr
-        assert "saml:AttributeValue" not in txt
+        assert "saml2:AttributeValue" in nsstr
+        assert "saml2:AttributeValue" not in txt
+        assert "saml:AttributeValue" in txt
 
     def test_set_text_empty(self):
         av = AttributeValue()

tests/test_42_enc.py

@@ -12,7 +12,7 @@
 
 __author__ = 'roland'
 
-TMPL_NO_HEADER = """<xenc:EncryptedData xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="{ed_id}" Type="http://www.w3.org/2001/04/xmlenc#Element"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc" /><ds:KeyInfo><xenc:EncryptedKey Id="{ek_id}"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5" /><ds:KeyInfo><ds:KeyName>my-rsa-key</ds:KeyName></ds:KeyInfo><xenc:CipherData><xenc:CipherValue /></xenc:CipherData></xenc:EncryptedKey></ds:KeyInfo><xenc:CipherData><xenc:CipherValue /></xenc:CipherData></xenc:EncryptedData>"""
+TMPL_NO_HEADER = """<xenc:EncryptedData xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="{ed_id}" Type="http://www.w3.org/2001/04/xmlenc#Element"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc" /><ds:KeyInfo><xenc:EncryptedKey Id="{ek_id}"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5" /><ds:KeyInfo><ds:KeyName>my-rsa-key</ds:KeyName></ds:KeyInfo><xenc:CipherData><xenc:CipherValue /></xenc:CipherData></xenc:EncryptedKey></ds:KeyInfo><xenc:CipherData><xenc:CipherValue /></xenc:CipherData></xenc:EncryptedData>"""
 TMPL = "<?xml version='1.0' encoding='UTF-8'?>\n%s" % TMPL_NO_HEADER
 
 IDENTITY = {"eduPersonAffiliation": ["staff", "member"],
@@ -123,5 +123,6 @@ def test_enc2():
 
     assert enc_resp
 
+
 if __name__ == "__main__":
     test_enc1()

tests/test_88_nsprefix.py

@@ -13,7 +13,7 @@ def test_nsprefix():
 
     txt = "%s" % status_message
 
-    assert "ns0:StatusMessage" in txt
+    assert "samlp:StatusMessage" in txt
 
     status_message.register_prefix({"saml2": saml.NAMESPACE,
                                     "saml2p": samlp.NAMESPACE})
@@ -41,5 +41,6 @@ def test_nsprefix2():
     assert "saml2p:AuthnRequest" in txt
     assert "saml2:Issuer" in txt
 
+
 if __name__ == "__main__":
-    test_nsprefix2()
+    test_nsprefix2()