@@ -217,13 +217,13 @@ def getSignedNS(self, ns_uri):
217217
218218class PapeResponseTestCase (unittest .TestCase ):
219219 def setUp (self ):
220- self .req = pape .Response ()
220+ self .resp = pape .Response ()
221221
222222 def test_construct (self ):
223- self .failUnlessEqual ([], self .req .auth_policies )
224- self .failUnlessEqual (None , self .req .auth_time )
225- self .failUnlessEqual ('pape' , self .req .ns_alias )
226- self .failUnlessEqual (None , self .req .nist_auth_level )
223+ self .failUnlessEqual ([], self .resp .auth_policies )
224+ self .failUnlessEqual (None , self .resp .auth_time )
225+ self .failUnlessEqual ('pape' , self .resp .ns_alias )
226+ self .failUnlessEqual (None , self .resp .nist_auth_level )
227227
228228 req2 = pape .Response ([pape .AUTH_MULTI_FACTOR ],
229229 "2004-12-11T10:30:44Z" , {pape .LEVELS_NIST : 3 })
@@ -232,63 +232,63 @@ def test_construct(self):
232232 self .failUnlessEqual (3 , req2 .nist_auth_level )
233233
234234 def test_add_policy_uri (self ):
235- self .failUnlessEqual ([], self .req .auth_policies )
236- self .req .addPolicyURI (pape .AUTH_MULTI_FACTOR )
237- self .failUnlessEqual ([pape .AUTH_MULTI_FACTOR ], self .req .auth_policies )
238- self .req .addPolicyURI (pape .AUTH_MULTI_FACTOR )
239- self .failUnlessEqual ([pape .AUTH_MULTI_FACTOR ], self .req .auth_policies )
240- self .req .addPolicyURI (pape .AUTH_PHISHING_RESISTANT )
235+ self .failUnlessEqual ([], self .resp .auth_policies )
236+ self .resp .addPolicyURI (pape .AUTH_MULTI_FACTOR )
237+ self .failUnlessEqual ([pape .AUTH_MULTI_FACTOR ], self .resp .auth_policies )
238+ self .resp .addPolicyURI (pape .AUTH_MULTI_FACTOR )
239+ self .failUnlessEqual ([pape .AUTH_MULTI_FACTOR ], self .resp .auth_policies )
240+ self .resp .addPolicyURI (pape .AUTH_PHISHING_RESISTANT )
241241 self .failUnlessEqual ([pape .AUTH_MULTI_FACTOR ,
242242 pape .AUTH_PHISHING_RESISTANT ],
243- self .req .auth_policies )
244- self .req .addPolicyURI (pape .AUTH_MULTI_FACTOR )
243+ self .resp .auth_policies )
244+ self .resp .addPolicyURI (pape .AUTH_MULTI_FACTOR )
245245 self .failUnlessEqual ([pape .AUTH_MULTI_FACTOR ,
246246 pape .AUTH_PHISHING_RESISTANT ],
247- self .req .auth_policies )
247+ self .resp .auth_policies )
248248
249249 def test_getExtensionArgs (self ):
250250 self .failUnlessEqual ({'auth_policies' : 'none' },
251- self .req .getExtensionArgs ())
252- self .req .addPolicyURI ('http://uri' )
251+ self .resp .getExtensionArgs ())
252+ self .resp .addPolicyURI ('http://uri' )
253253 self .failUnlessEqual ({'auth_policies' : 'http://uri' },
254- self .req .getExtensionArgs ())
255- self .req .addPolicyURI ('http://zig' )
254+ self .resp .getExtensionArgs ())
255+ self .resp .addPolicyURI ('http://zig' )
256256 self .failUnlessEqual ({'auth_policies' : 'http://uri http://zig' },
257- self .req .getExtensionArgs ())
258- self .req .auth_time = "1776-07-04T14:43:12Z"
257+ self .resp .getExtensionArgs ())
258+ self .resp .auth_time = "1776-07-04T14:43:12Z"
259259 self .failUnlessEqual (
260260 {'auth_policies' : 'http://uri http://zig' ,
261261 'auth_time' : "1776-07-04T14:43:12Z" },
262- self .req .getExtensionArgs ())
263- self .req .setAuthLevel (pape .LEVELS_NIST , '3' )
262+ self .resp .getExtensionArgs ())
263+ self .resp .setAuthLevel (pape .LEVELS_NIST , '3' )
264264 self .failUnlessEqual (
265265 {'auth_policies' : 'http://uri http://zig' ,
266266 'auth_time' : "1776-07-04T14:43:12Z" ,
267267 'auth_level.nist' : '3' ,
268268 'auth_level.ns.nist' : pape .LEVELS_NIST },
269- self .req .getExtensionArgs ())
269+ self .resp .getExtensionArgs ())
270270
271271 def test_getExtensionArgs_error_auth_age (self ):
272- self .req .auth_time = "long ago"
273- self .failUnlessRaises (ValueError , self .req .getExtensionArgs )
272+ self .resp .auth_time = "long ago"
273+ self .failUnlessRaises (ValueError , self .resp .getExtensionArgs )
274274
275275 def test_parseExtensionArgs (self ):
276276 args = {'auth_policies' : 'http://foo http://bar' ,
277277 'auth_time' : '1970-01-01T00:00:00Z' }
278- self .req .parseExtensionArgs (args )
279- self .failUnlessEqual ('1970-01-01T00:00:00Z' , self .req .auth_time )
278+ self .resp .parseExtensionArgs (args )
279+ self .failUnlessEqual ('1970-01-01T00:00:00Z' , self .resp .auth_time )
280280 self .failUnlessEqual (['http://foo' ,'http://bar' ],
281- self .req .auth_policies )
281+ self .resp .auth_policies )
282282
283283 def test_parseExtensionArgs_empty (self ):
284- self .req .parseExtensionArgs ({})
285- self .failUnlessEqual (None , self .req .auth_time )
286- self .failUnlessEqual ([], self .req .auth_policies )
284+ self .resp .parseExtensionArgs ({})
285+ self .failUnlessEqual (None , self .resp .auth_time )
286+ self .failUnlessEqual ([], self .resp .auth_policies )
287287
288288 def test_parseExtensionArgs_strict_bogus1 (self ):
289289 args = {'auth_policies' : 'http://foo http://bar' ,
290290 'auth_time' : 'yesterday' }
291- self .failUnlessRaises (ValueError , self .req .parseExtensionArgs ,
291+ self .failUnlessRaises (ValueError , self .resp .parseExtensionArgs ,
292292 args , True )
293293
294294 def test_parseExtensionArgs_strict_no_namespace_decl_openid2 (self ):
@@ -298,29 +298,29 @@ def test_parseExtensionArgs_strict_no_namespace_decl_openid2(self):
298298 'auth_time' : '1970-01-01T00:00:00Z' ,
299299 'auth_level.nist' : 'some' ,
300300 }
301- self .failUnlessRaises (ValueError , self .req .parseExtensionArgs ,
301+ self .failUnlessRaises (ValueError , self .resp .parseExtensionArgs ,
302302 args , True )
303303
304304 def test_parseExtensionArgs_strict_good (self ):
305305 args = {'auth_policies' : 'http://foo http://bar' ,
306306 'auth_time' : '1970-01-01T00:00:00Z' ,
307307 'auth_level.nist' : '0' ,
308308 'auth_level.ns.nist' : pape .LEVELS_NIST }
309- self .req .parseExtensionArgs (args , True )
309+ self .resp .parseExtensionArgs (args , True )
310310 self .failUnlessEqual (['http://foo' ,'http://bar' ],
311- self .req .auth_policies )
312- self .failUnlessEqual ('1970-01-01T00:00:00Z' , self .req .auth_time )
313- self .failUnlessEqual (0 , self .req .nist_auth_level )
311+ self .resp .auth_policies )
312+ self .failUnlessEqual ('1970-01-01T00:00:00Z' , self .resp .auth_time )
313+ self .failUnlessEqual (0 , self .resp .nist_auth_level )
314314
315315 def test_parseExtensionArgs_nostrict_bogus (self ):
316316 args = {'auth_policies' : 'http://foo http://bar' ,
317317 'auth_time' : 'when the cows come home' ,
318318 'nist_auth_level' : 'some' }
319- self .req .parseExtensionArgs (args )
319+ self .resp .parseExtensionArgs (args )
320320 self .failUnlessEqual (['http://foo' ,'http://bar' ],
321- self .req .auth_policies )
322- self .failUnlessEqual (None , self .req .auth_time )
323- self .failUnlessEqual (None , self .req .nist_auth_level )
321+ self .resp .auth_policies )
322+ self .failUnlessEqual (None , self .resp .auth_time )
323+ self .failUnlessEqual (None , self .resp .nist_auth_level )
324324
325325 def test_fromSuccessResponse (self ):
326326 policy_uris = [pape .AUTH_MULTI_FACTOR , pape .AUTH_PHISHING_RESISTANT ]
0 commit comments