Changeset 4172 for lang/perl/HTTP-MobileAgent

Timestamp:

01/07/08 16:42:01 (5 years ago)

Author:

tokuhirom

Message:

HTTP-MobileAgent?: fixed HTTP::MobileAgent::DoCoMo?->xhtml_compliant bug.

before this revision, this method returns invalid value with few very old(2002) models.

tangible models: N2001 N2002 P2002 D2101V P2101V SH2101V T2101V

Location:

lang/perl/HTTP-MobileAgent/trunk

Files:

• lib/HTTP/MobileAgent/DoCoMo.pm (modified) (1 diff)
• t/02_docomo.t (modified) (4 diffs)

lang/perl/HTTP-MobileAgent/trunk/lib/HTTP/MobileAgent/DoCoMo.pm

@@ -55 +55 @@
         $self->_parse_main($main);
     }
-    $self->{xhtml_compliant} = $self->version eq '2.0' ? 1 : 0;
+
+    $self->{xhtml_compliant} =
+      ( $self->is_foma && !( $self->html_version && $self->html_version == 3.0 ) )
+      ? 1
+      : 0;
 }
 

lang/perl/HTTP-MobileAgent/trunk/t/02_docomo.t

@@ -1 +1 @@
 use strict;
-use Test::More tests => 909;
+use Test::More tests => 910;
 
 BEGIN { use_ok 'HTTP::MobileAgent' }
@@ -14 +14 @@
     [ "DoCoMo/1.0/SH251i/c10", '1.0', '3.0', 'SH251i', 10, undef, 'SH', '251i', {}, 0 ],
     [ "DoCoMo/1.0/R692i/c10", '1.0', '3.0', 'R692i', 10, undef, 'R', '692i', {}, 0 ],
-    [ "DoCoMo/2.0 P2101V(c100)", '2.0', '3.0', 'P2101V', 100, 1, 'P', 'FOMA', {}, 1 ],
-    [ "DoCoMo/2.0 N2001(c10)", '2.0', '3.0', 'N2001', 10, 1, 'N', 'FOMA', {}, 1 ],
-    [ "DoCoMo/2.0 N2002(c100)", '2.0', '3.0', 'N2002', 100, 1, 'N', 'FOMA', {}, 1 ],
-    [ "DoCoMo/2.0 D2101V(c100)", '2.0', '3.0', 'D2101V', 100, 1, 'D', 'FOMA', {}, 1 ],
-    [ "DoCoMo/2.0 P2002(c100)", '2.0', '3.0', 'P2002', 100, 1, 'P', 'FOMA', {}, 1 ],
-    [ "DoCoMo/2.0 MST_v_SH2101V(c100)", '2.0', '3.0', 'SH2101V', 100, 1, 'SH', 'FOMA', {}, 1 ],
-    [ "DoCoMo/2.0 T2101V(c100)", '2.0', '3.0', 'T2101V', 100, 1, 'T', 'FOMA', {}, 1 ],
+    [ "DoCoMo/2.0 P2101V(c100)", '2.0', '3.0', 'P2101V', 100, 1, 'P', 'FOMA', {}, 0 ],
+    [ "DoCoMo/2.0 N2001(c10)", '2.0', '3.0', 'N2001', 10, 1, 'N', 'FOMA', {}, 0 ],
+    [ "DoCoMo/2.0 N2002(c100)", '2.0', '3.0', 'N2002', 100, 1, 'N', 'FOMA', {}, 0 ],
+    [ "DoCoMo/2.0 D2101V(c100)", '2.0', '3.0', 'D2101V', 100, 1, 'D', 'FOMA', {}, 0 ],
+    [ "DoCoMo/2.0 P2002(c100)", '2.0', '3.0', 'P2002', 100, 1, 'P', 'FOMA', {}, 0 ],
+    [ "DoCoMo/2.0 MST_v_SH2101V(c100)", '2.0', '3.0', 'SH2101V', 100, 1, 'SH', 'FOMA', {}, 0 ],
+    [ "DoCoMo/2.0 T2101V(c100)", '2.0', '3.0', 'T2101V', 100, 1, 'T', 'FOMA', {}, 0 ],
     [ "DoCoMo/1.0/D504i/c10", '1.0', '4.0', 'D504i', 10, undef, 'D', '504i', {}, 0 ],
     [ "DoCoMo/1.0/D504i/c30/TD", '1.0', '4.0', 'D504i', 30, undef, 'D', '504i', { status => 'TD' }, 0 ],
@@ -30 +30 @@
     [ "DoCoMo/1.0/P503i/c10/serNMABH200331", '1.0', '3.0', 'P503i', 10, undef, 'P', '503i', { serial_number => 'NMABH200331' }, 0 ],
     [ "DoCoMo/2.0 N2001(c10;ser0123456789abcde;icc01234567890123456789)",
-      '2.0', '3.0', 'N2001', 10, 1, 'N', 'FOMA', { serial_number => '0123456789abcde', card_id => '01234567890123456789' }, 1 ],
+      '2.0', '3.0', 'N2001', 10, 1, 'N', 'FOMA', { serial_number => '0123456789abcde', card_id => '01234567890123456789' }, 0 ],
     [ "DoCoMo/1.0/eggy/c300/s32/kPHS-K", '1.0', '3.2', 'eggy', 300, undef, undef, undef, { bandwidth => 32 }, 0 ],
     [ "DoCoMo/1.0/P751v/c100/s64/kPHS-K", '1.0', '3.2', 'P751v', 100, undef, 'P', undef, { bandwidth => 64 }, 0 ],
@@ -63 +63 @@
     is $agent->carrier_longname, 'DoCoMo' ,  "carrier longname is DoCoMo";
 
+}
+
+{
+    # SH905i is XHTML Compliant.
+    local $ENV{HTTP_USER_AGENT} = 'DoCoMo/2.0 SH905i(c100;TB;W24H12)';
+    my $agent = HTTP::MobileAgent->new;
+    is $agent->xhtml_compliant, 1;
 }