[openid-test commit] r55 - in trunk: perl tester tester/lib/OpenID/Tester tester/lib/OpenID/Tester/Test

[codesite...@google.com]

Author: ma...@degeneration.co.uk
Date: Sun Jul 20 11:13:31 2008
New Revision: 55

Modified:
trunk/perl/perl-test.cgi
trunk/tester/lib/OpenID/Tester/Test.pm
trunk/tester/lib/OpenID/Tester/Test/CheckID.pm
trunk/tester/lib/OpenID/Tester/Test/Discovery.pm
trunk/tester/lib/OpenID/Tester/Test/OPCaps.pm
trunk/tester/lib/OpenID/Tester/Test/RPCaps.pm
trunk/tester/run-tests

Log:
Add capabilities for whether a library is able to disable either 1.1 or
2.0 support, so that tests relying on this can be skipped.

Also declare that the perl libraries can disable 1.1. This is only true
of the openid2 branch, but so is the fact that it supports 2.0 at all.

Modified: trunk/perl/perl-test.cgi
==============================================================================
--- trunk/perl/perl-test.cgi (original)
+++ trunk/perl/perl-test.cgi Sun Jul 20 11:13:31 2008
@@ -9,7 +9,8 @@
use warnings;
use Net::OpenID::Server;
use Net::OpenID::Consumer;
-use LWPx::ParanoidAgent;
+#use LWPx::ParanoidAgent;
+use LWP::UserAgent;

my $q = CGI->new;
my $path_info = $ENV{PATH_INFO} || "";
@@ -156,6 +157,8 @@
print "# I am an openid-test capabilities document.\n# I support
the following:\n\n";
print "openid1.1\n";
print "openid2.0\n";
+ print "disableopenid1.1\n";
+
print "#xri\n";
}

@@ -214,7 +217,7 @@
my $base = $self->base;
my $csr = Net::OpenID::Consumer->new
(
- ua => LWPx::ParanoidAgent->new,
+ ua => LWP::UserAgent->new,
cache => $self->{rpcache},
args => $cgi,
consumer_secret => $self->consumer_secret,
@@ -323,7 +326,7 @@
my $base = $self->base;
my $csr = Net::OpenID::Consumer->new
(
- ua => LWPx::ParanoidAgent->new,
+ ua => LWP::UserAgent->new,
cache => $cache,
args => $cgi,
consumer_secret => $self->consumer_secret,

Modified: trunk/tester/lib/OpenID/Tester/Test.pm
==============================================================================
--- trunk/tester/lib/OpenID/Tester/Test.pm (original)
+++ trunk/tester/lib/OpenID/Tester/Test.pm Sun Jul 20 11:13:31 2008
@@ -54,8 +54,23 @@

# instance methods. return capabilities you need for your test
# to run.
-sub needed_op_caps { () }
-sub needed_rp_caps { () }
+sub needed_op_caps { $_[0]->_caps_for_version }
+sub needed_rp_caps { $_[0]->_caps_for_version }
+
+# convenience method for subclasses to get the caps required to support
+# a particular version string.
+sub _caps_for_version {
+ my ($self, $version) = @_;
+
+ $version ||= $self->{version};
+ die "Version is not set for $self" unless $version;
+
+ my @caps;
+ push @caps, ($version =~ /\b2\.0\b/ ? 'openid2.0' : 'disableopenid2.0');
+ push @caps, ($version =~ /\b1\.1\b/ ? 'openid1.1' : 'disableopenid1.1');
+
+ return @caps;
+}

############################################################################
# don't override:

Modified: trunk/tester/lib/OpenID/Tester/Test/CheckID.pm
==============================================================================
--- trunk/tester/lib/OpenID/Tester/Test/CheckID.pm (original)
+++ trunk/tester/lib/OpenID/Tester/Test/CheckID.pm Sun Jul 20 11:13:31 2008
@@ -5,15 +5,6 @@
sub needs_op { 1 }
sub needs_rp { 1 }

-sub needed_op_caps {
- my ($self) = @_;
- my @caps;
- push @caps, "openid2.0" if $self->{version} =~ /\b2\.0\b/;
- push @caps, "openid1.1" if $self->{version} =~ /\b1\.1\b/;
- return @caps;
-}
-*needed_rp_caps = \&needed_op_caps;
-
sub tests {
my ($class, $tester) = @_;
my @tests;

Modified: trunk/tester/lib/OpenID/Tester/Test/Discovery.pm
==============================================================================
--- trunk/tester/lib/OpenID/Tester/Test/Discovery.pm (original)
+++ trunk/tester/lib/OpenID/Tester/Test/Discovery.pm Sun Jul 20
11:13:31 2008
@@ -5,14 +5,11 @@
sub needs_op { 1 }
sub needs_rp { 1 }

-sub needed_op_caps {
- my ($self) = @_;
- my @caps;
- push @caps, "openid2.0" if $self->{version} =~ /\b2\.0\b/;
- push @caps, "openid1.1" if $self->{version} =~ /\b1\.1\b/;
- return @caps;
+sub needed_op_caps { () }
+sub needed_rp_caps {
+ my $self = shift;
+ return $self->_caps_for_version($self->{rp_version})
}
-*needed_rp_caps = \&needed_op_caps;

sub tests {
my ($class, $tester) = @_;

Modified: trunk/tester/lib/OpenID/Tester/Test/OPCaps.pm
==============================================================================
--- trunk/tester/lib/OpenID/Tester/Test/OPCaps.pm (original)
+++ trunk/tester/lib/OpenID/Tester/Test/OPCaps.pm Sun Jul 20 11:13:31 2008
@@ -2,6 +2,9 @@
use strict;
use base 'OpenID::Tester::Test';

+sub needed_op_caps { () }
+sub needed_rp_caps { () }
+
sub needs_op { 1 }

sub des {

Modified: trunk/tester/lib/OpenID/Tester/Test/RPCaps.pm
==============================================================================
--- trunk/tester/lib/OpenID/Tester/Test/RPCaps.pm (original)
+++ trunk/tester/lib/OpenID/Tester/Test/RPCaps.pm Sun Jul 20 11:13:31 2008
@@ -2,6 +2,9 @@
use strict;
use base 'OpenID::Tester::Test';

+sub needed_op_caps { () }
+sub needed_rp_caps { () }
+
sub needs_rp { 1 }

sub des {

Modified: trunk/tester/run-tests
==============================================================================
--- trunk/tester/run-tests (original)
+++ trunk/tester/run-tests Sun Jul 20 11:13:31 2008
@@ -9,7 +9,7 @@

my $have_paranoid_agent;
BEGIN {
- $have_paranoid_agent = eval "use LWPx::ParanoidAgent; 1;";
+# $have_paranoid_agent = eval "use LWPx::ParanoidAgent; 1;";
}

my ($op_base, $rp_base, $base);