jpmobile 0.0.2 → 0.0.3

data/test/helper.rb

@@ -1,7 +1,9 @@
 require 'test/unit'
 require 'rubygems'
 require 'action_controller'
+require 'rack'
 
+RAILS_ENV = "test"
 require File.dirname(__FILE__)+'/../lib/jpmobile'
 
 # ActionPackのTestのためのrequire
@@ -18,7 +20,12 @@ end
 
 def request_with_ua(user_agent, env={})
   fake_cgi = FakeCgi.new(user_agent, env)
-  ActionController::CgiRequest.new(fake_cgi)
+  [ 
+    ActionController::CgiRequest.new(fake_cgi), 
+    Rack::Request.new(
+      Rack::MockRequest.env_for('http://www.example.jp', fake_cgi.env_table)
+    ).extend(Jpmobile::RequestWithMobile) 
+  ]
 end
 
 ## add helper methods to rails testing framework

data/test/helpers_test.rb

@@ -16,7 +16,7 @@ class HelpersTest < Test::Unit::TestCase
   def setup
     @view = FakeView.new
   end
-  
+
   # get_position_link_to_がエラー無く終わるか。
   def test_get_position_link_to_show_all
     assert_nothing_raised {
@@ -26,7 +26,7 @@ class HelpersTest < Test::Unit::TestCase
 
   # get_position_link_to(自動判別), DoCoMo
   def test_get_position_link_to_docomo
-    @view.request = request_with_ua("DoCoMo/2.0 SH903i(c100;TB;W24H16)")
+    @view.request = request_with_ua("DoCoMo/2.0 SH903i(c100;TB;W24H16)").first
     links = get_href_and_texts(@view.get_position_link_to("STRING"))
     assert_equal(1, links.size)
     text,attrs,path,params = links.first
@@ -37,14 +37,14 @@ class HelpersTest < Test::Unit::TestCase
 
   # get_position_link_to(自動判別), TUKA
   def test_get_position_link_to_tuka
-    @view.request = request_with_ua("UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
+    @view.request = request_with_ua("UP.Browser/3.04-KCTA UP.Link/3.4.5.9").first
     links = get_href_and_texts(@view.get_position_link_to("STRING"))
     assert(links.empty?)
   end
 
   # get_position_link_to(自動判別), au, location only
   def test_get_position_link_to_au_location_only
-    @view.request = request_with_ua("KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0")
+    @view.request = request_with_ua("KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0").first
     links = get_href_and_texts(@view.get_position_link_to("STRING"))
     assert_equal(1, links.size)
     text,attrs,path,params = links.first
@@ -52,10 +52,10 @@ class HelpersTest < Test::Unit::TestCase
     assert_equal("device:location", path)
     assert_equal("http://example.jp", params["url"])
   end
-  
+
   # get_position_link_to(自動判別), au, gps
   def test_get_position_link_to_au_gps
-    @view.request = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
+    @view.request = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0").first
     links = get_href_and_texts(@view.get_position_link_to("STRING"))
     assert_equal(1, links.size)
     text,attrs,path,params = links.first
@@ -68,10 +68,10 @@ class HelpersTest < Test::Unit::TestCase
     assert_equal("0", params["unit"])
     assert_equal("0", params["datum"])
   end
-  
+
   # get_position_link_to(自動判別), J-PHONE
   def test_get_position_link_to_jphone
-    @view.request = request_with_ua("J-PHONE/4.3/V603SH/SNXXXX0000000 SH/0007aa Profile/MIDP-1.0 Configuration/CLDC-1.0 Ext-Profile/JSCL-1.3.2")
+    @view.request = request_with_ua("J-PHONE/4.3/V603SH/SNXXXX0000000 SH/0007aa Profile/MIDP-1.0 Configuration/CLDC-1.0 Ext-Profile/JSCL-1.3.2").first
     links = get_href_and_texts(@view.get_position_link_to("STRING"))
     assert_equal(1, links.size)
     text,attrs,path,params = links.first
@@ -82,7 +82,7 @@ class HelpersTest < Test::Unit::TestCase
 
   # get_position_link_to(自動判別), Vodafone
   def test_get_position_link_to_vodafone
-    @view.request = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
+    @view.request = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0").first
     links = get_href_and_texts(@view.get_position_link_to("STRING"))
     assert_equal(1, links.size)
     text,attrs,path,params = links.first
@@ -92,7 +92,7 @@ class HelpersTest < Test::Unit::TestCase
 
   # get_position_link_to(自動判別), Softbank
   def test_get_position_link_to_softbank
-    @view.request = request_with_ua("SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+    @view.request = request_with_ua("SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1").first
     links = get_href_and_texts(@view.get_position_link_to("STRING"))
     assert_equal(1, links.size)
     text,attrs,path,params = links.first
@@ -102,7 +102,7 @@ class HelpersTest < Test::Unit::TestCase
 
   # get_position_link_to(自動判別), Willcom
   def test_get_position_link_to_willcom
-    @view.request = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0")
+    @view.request = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0").first
     links = get_href_and_texts(@view.get_position_link_to("STRING"))
     assert_equal(1, links.size)
     text,attrs,path,params = links.first
@@ -131,6 +131,7 @@ class HelpersTest < Test::Unit::TestCase
     assert_equal("http://w1m.docomo.ne.jp/cp/iarea", path)
     assert_equal("OPENAREACODE", params["ecode"])
     assert_equal("OPENAREAKEY", params["msn"])
+    assert_equal("1", params["posinfo"])
     assert_equal("http://example.jp", params["nl"])
   end
 
@@ -187,7 +188,7 @@ class HelpersTest < Test::Unit::TestCase
     assert_equal("STRING", text)
     assert_equal("location:auto", path)
   end
-  
+
   # Willcom 位置情報取得用のリンクが正しく出力されるか。
   def test_willcom_location_link_to
     links = get_href_and_texts(@view.willcom_location_link_to("STRING"))
@@ -207,7 +208,7 @@ class HelpersTest < Test::Unit::TestCase
     results = []
     (Hpricot(str)/:a).each do |link|
       path, query = link["href"].split(/\?/, 2)
-      params = query.nil? ? nil : CGIMethods.parse_query_parameters(query)
+      params = query.nil? ? nil : ActionController::AbstractRequest.parse_query_parameters(query)
       results << [link.inner_html, link.attributes, path, params]
     end
     return results

data/test/softbank_test.rb

@@ -3,151 +3,179 @@ require File.dirname(__FILE__)+'/helper'
 class SoftbankTest < Test::Unit::TestCase
   # SoftBank, 端末種別の識別
   def test_softbank_910t
-    req = request_with_ua("SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Softbank, req.mobile)
-    assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
-    assert_equal(nil, req.mobile.position)
-    assert_equal("000000000000000", req.mobile.serial_number)
-    assert_equal("000000000000000", req.mobile.ident)
-    assert_equal("000000000000000", req.mobile.ident_device)
-    assert_equal(nil, req.mobile.ident_subscriber)
-    assert(req.mobile.supports_cookie?)
+    reqs = request_with_ua("SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Softbank, req.mobile)
+      assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
+      assert_equal(nil, req.mobile.position)
+      assert_equal("000000000000000", req.mobile.serial_number)
+      assert_equal("000000000000000", req.mobile.ident)
+      assert_equal("000000000000000", req.mobile.ident_device)
+      assert_equal(nil, req.mobile.ident_subscriber)
+      assert(req.mobile.supports_cookie?)
+    end
   end
 
   # SoftBank, X_JPHONE_UID付き
   def test_softbank_910t_x_jphone_uid
-    req = request_with_ua("SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1", "HTTP_X_JPHONE_UID"=>"aaaaaaaaaaaaaaaa")
-    assert_equal("000000000000000", req.mobile.serial_number)
-    assert_equal("aaaaaaaaaaaaaaaa", req.mobile.x_jphone_uid)
-    assert_equal("aaaaaaaaaaaaaaaa", req.mobile.ident)
-    assert_equal("000000000000000", req.mobile.ident_device)
-    assert_equal("aaaaaaaaaaaaaaaa", req.mobile.ident_subscriber)
-    assert(req.mobile.supports_cookie?)
+    reqs = request_with_ua("SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1", "HTTP_X_JPHONE_UID"=>"aaaaaaaaaaaaaaaa")
+    reqs.each do |req|
+      assert_equal("000000000000000", req.mobile.serial_number)
+      assert_equal("aaaaaaaaaaaaaaaa", req.mobile.x_jphone_uid)
+      assert_equal("aaaaaaaaaaaaaaaa", req.mobile.ident)
+      assert_equal("000000000000000", req.mobile.ident_device)
+      assert_equal("aaaaaaaaaaaaaaaa", req.mobile.ident_subscriber)
+      assert(req.mobile.supports_cookie?)
+    end
   end
 
   # Vodafone, 端末種別の識別
   def test_vodafone_v903t
-    req = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Vodafone, req.mobile)
-    assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
-    assert_equal(nil, req.mobile.position)
-    assert_equal(nil, req.mobile.ident)
-    assert(req.mobile.supports_cookie?)
+    reqs = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Vodafone, req.mobile)
+      assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
+      assert_equal(nil, req.mobile.position)
+      assert_equal(nil, req.mobile.ident)
+      assert(req.mobile.supports_cookie?)
+    end
   end
 
   # Vodafone, 端末種別の識別
   def test_vodafone_v903sh
-    req = request_with_ua("Vodafone/1.0/V903SH/SHJ001/SN000000000000000 Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Vodafone, req.mobile)
-    assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
-    assert_equal("000000000000000", req.mobile.serial_number)
-    assert_equal("000000000000000", req.mobile.ident)
-    assert_equal("000000000000000", req.mobile.ident_device)
-    assert_equal(nil, req.mobile.ident_subscriber)
-    assert_equal(nil, req.mobile.position)
-    assert(req.mobile.supports_cookie?)
+    reqs = request_with_ua("Vodafone/1.0/V903SH/SHJ001/SN000000000000000 Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Vodafone, req.mobile)
+      assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
+      assert_equal("000000000000000", req.mobile.serial_number)
+      assert_equal("000000000000000", req.mobile.ident)
+      assert_equal("000000000000000", req.mobile.ident_device)
+      assert_equal(nil, req.mobile.ident_subscriber)
+      assert_equal(nil, req.mobile.position)
+      assert(req.mobile.supports_cookie?)
+    end
   end
 
   # J-PHONE, 端末種別の識別
   def test_jphone_v603sh
-    req = request_with_ua("J-PHONE/4.3/V603SH/SNXXXX0000000 SH/0007aa Profile/MIDP-1.0 Configuration/CLDC-1.0 Ext-Profile/JSCL-1.3.2")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Jphone, req.mobile)
-    assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
-    assert_equal("XXXX0000000", req.mobile.serial_number)
-    assert_equal("XXXX0000000", req.mobile.ident)
-    assert_equal("XXXX0000000", req.mobile.ident_device)
-    assert_equal(nil, req.mobile.ident_subscriber)
-    assert_equal(nil, req.mobile.position)
-    assert(!req.mobile.supports_cookie?)
+    reqs = request_with_ua("J-PHONE/4.3/V603SH/SNXXXX0000000 SH/0007aa Profile/MIDP-1.0 Configuration/CLDC-1.0 Ext-Profile/JSCL-1.3.2")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Jphone, req.mobile)
+      assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
+      assert_equal("XXXX0000000", req.mobile.serial_number)
+      assert_equal("XXXX0000000", req.mobile.ident)
+      assert_equal("XXXX0000000", req.mobile.ident_device)
+      assert_equal(nil, req.mobile.ident_subscriber)
+      assert_equal(nil, req.mobile.position)
+      assert(!req.mobile.supports_cookie?)
+    end
   end
 
   # J-PHONE, 端末種別の識別
   def test_jphone_v301d
-    req = request_with_ua("J-PHONE/3.0/V301D")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Jphone, req.mobile)
-    assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
-    assert_equal(nil, req.mobile.serial_number)
-    assert_equal(nil, req.mobile.position)
-    assert(!req.mobile.supports_cookie?)
+    reqs = request_with_ua("J-PHONE/3.0/V301D")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Jphone, req.mobile)
+      assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
+      assert_equal(nil, req.mobile.serial_number)
+      assert_equal(nil, req.mobile.position)
+      assert(!req.mobile.supports_cookie?)
+    end
   end
 
   # J-PHONE
   # http://kokogiko.net/wiki.cgi?page=vodafone%A4%C7%A4%CE%B0%CC%C3%D6%BC%E8%C6%C0%CA%FD%CB%A1
   def test_jphone_antenna
-    req = request_with_ua("J-PHONE/3.0/V301D",
+    reqs = request_with_ua("J-PHONE/3.0/V301D",
                           "HTTP_X_JPHONE_GEOCODE"=>"353840%1A1394440%1A%93%8C%8B%9E%93s%8D%60%8B%E6%8E%C5%82T%92%9A%96%DA")
-    assert_in_delta(35.64768482, req.mobile.position.lat, 1e-4)
-    assert_in_delta(139.7412141, req.mobile.position.lon, 1e-4)
-    assert_equal("東京都港区芝５丁目", req.mobile.position.options["address"])
+    reqs.each do |req|
+      assert_in_delta(35.64768482, req.mobile.position.lat, 1e-4)
+      assert_in_delta(139.7412141, req.mobile.position.lon, 1e-4)
+      assert_equal("東京都港区芝５丁目", req.mobile.position.options["address"])
+    end
   end
 
   # J-PHONE 位置情報なし
   def test_jphone_antenna_empty
-    req = request_with_ua("J-PHONE/3.0/V301D",
+    reqs = request_with_ua("J-PHONE/3.0/V301D",
                           "HTTP_X_JPHONE_GEOCODE"=>"0000000%1A0000000%1A%88%CA%92%75%8F%EE%95%F1%82%C8%82%B5")
-    assert_equal(nil, req.mobile.position)
+    reqs.each do |req|
+      assert_equal(nil, req.mobile.position)
+    end
   end
 
   # Vodafone 3G, wgs84, gps
   def test_vodafone_gps
-    req = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
+    reqs = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
                           {"QUERY_STRING"=>"pos=N43.3.18.42E141.21.1.88&geo=wgs84&x-acr=1"})
-    assert_in_delta(43.05511667, req.mobile.position.lat, 1e-7)
-    assert_in_delta(141.3505222, req.mobile.position.lon, 1e-7)
-    assert_equal("N43.3.18.42E141.21.1.88", req.mobile.position.options["pos"])
-    assert_equal("wgs84", req.mobile.position.options["geo"])
-    assert_equal("1", req.mobile.position.options["x-acr"])
+    reqs.each do |req|
+      assert_in_delta(43.05511667, req.mobile.position.lat, 1e-7)
+      assert_in_delta(141.3505222, req.mobile.position.lon, 1e-7)
+      assert_equal("N43.3.18.42E141.21.1.88", req.mobile.position.options["pos"])
+      assert_equal("wgs84", req.mobile.position.options["geo"])
+      assert_equal("1", req.mobile.position.options["x-acr"])
+    end
   end
 
   # 正しいIPアドレス空間からのアクセスを判断できるか。
   def test_softbank_valid_ip_address
-    req = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
+    reqs = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
                           {"REMOTE_ADDR"=>"202.179.204.1"})
-    assert_equal(req.mobile.valid_ip?, true)
+    reqs.each do |req|
+      assert_equal(true, req.mobile.valid_ip?)
+    end
   end
 
   # 正しいIPアドレス空間からのアクセスを判断できるか。
   def test_jphone_valid_ip_address
-    req = request_with_ua("J-PHONE/3.0/V301D",
+    reqs = request_with_ua("J-PHONE/3.0/V301D",
                           {"REMOTE_ADDR"=>"202.179.204.1"})
-    assert_equal(req.mobile.valid_ip?, true)
+    reqs.each do |req|
+      assert_equal(true, req.mobile.valid_ip?)
+    end
   end
 
   # 正しくないIPアドレス空間からのアクセスを判断できるか。
   def test_softbank_ip_address
-    req = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
+    reqs = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
                           {"REMOTE_ADDR"=>"127.0.0.1"})
-    assert_equal(req.mobile.valid_ip?, false)
+    reqs.each do |req|
+      assert_equal(false, req.mobile.valid_ip?)
+    end
   end
 
   # 端末の画面サイズを正しく取得できるか。
   def test_softbank_v903t_display
-    req = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
+    reqs = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
                           "HTTP_X_JPHONE_DISPLAY"=>"240*320",
                           "HTTP_X_JPHONE_COLOR"=>"C262144" )
-    assert_equal(240, req.mobile.display.width)
-    assert_equal(320, req.mobile.display.height)
-    assert_equal(240, req.mobile.display.physical_width)
-    assert_equal(320, req.mobile.display.physical_height)
-    assert_equal(true, req.mobile.display.color?)
-    assert_equal(262144, req.mobile.display.colors)
+    reqs.each do |req|
+      assert_equal(240, req.mobile.display.width)
+      assert_equal(320, req.mobile.display.height)
+      assert_equal(240, req.mobile.display.physical_width)
+      assert_equal(320, req.mobile.display.physical_height)
+      assert_equal(true, req.mobile.display.color?)
+      assert_equal(262144, req.mobile.display.colors)
+    end
   end
 
   # 端末の画面情報が渡ってない場合に正しく動作するか。
   def test_softbank_v903t_display_information_omitted
-    req = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
-    assert_equal(nil, req.mobile.display.width)
-    assert_equal(nil, req.mobile.display.height)
-    assert_equal(nil, req.mobile.display.browser_width)
-    assert_equal(nil, req.mobile.display.browser_height)
-    assert_equal(nil, req.mobile.display.physical_width)
-    assert_equal(nil, req.mobile.display.physical_height)
-    assert_equal(nil, req.mobile.display.color?)
-    assert_equal(nil, req.mobile.display.colors)
+    reqs = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
+    reqs.each do |req|
+      assert_equal(nil, req.mobile.display.width)
+      assert_equal(nil, req.mobile.display.height)
+      assert_equal(nil, req.mobile.display.browser_width)
+      assert_equal(nil, req.mobile.display.browser_height)
+      assert_equal(nil, req.mobile.display.physical_width)
+      assert_equal(nil, req.mobile.display.physical_height)
+      assert_equal(nil, req.mobile.display.color?)
+      assert_equal(nil, req.mobile.display.colors)
+    end
   end
 end

data/test/willcom_test.rb

@@ -3,44 +3,54 @@ require File.dirname(__FILE__)+'/helper'
 class WillcomTest < Test::Unit::TestCase
   # willcom, 端末種別の識別
   def test_wilcom_wx310k
-    req = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Willcom, req.mobile)
-    assert_equal(nil, req.mobile.position)
-    assert_equal(nil, req.mobile.ident)
-    assert(req.mobile.supports_cookie?)
+    reqs = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Willcom, req.mobile)
+      assert_equal(nil, req.mobile.position)
+      assert_equal(nil, req.mobile.ident)
+      assert(req.mobile.supports_cookie?)
+    end
   end
 
   # DDI-POCKET, 端末種別の識別
   def test_ddipocket_ah_k3001v
-    req = request_with_ua("Mozilla/3.0(DDIPOCKET;KYOCERA/AH-K3001V/1.8.2.71.000000/0.1/C100) Opera 7.0")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Ddipocket, req.mobile)
-    assert_kind_of(Jpmobile::Mobile::Willcom, req.mobile)
-    assert_equal(nil, req.mobile.position)
-    assert_equal(nil, req.mobile.ident)
-    assert(req.mobile.supports_cookie?)
+    reqs = request_with_ua("Mozilla/3.0(DDIPOCKET;KYOCERA/AH-K3001V/1.8.2.71.000000/0.1/C100) Opera 7.0")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Ddipocket, req.mobile)
+      assert_kind_of(Jpmobile::Mobile::Willcom, req.mobile)
+      assert_equal(nil, req.mobile.position)
+      assert_equal(nil, req.mobile.ident)
+      assert(req.mobile.supports_cookie?)
+    end
   end
 
   # willcom, antenna
   def test_wilcom_antenna
-    req = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0",
+    reqs = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0",
                           {"QUERY_STRING"=>"pos=N43.04.34.049E141.21.03.279"})
-    assert_in_delta(43.078568, req.mobile.position.lat, 1e-4)
-    assert_in_delta(141.347223, req.mobile.position.lon, 1e-4)
+    reqs.each do |req|
+      assert_in_delta(43.078568, req.mobile.position.lat, 1e-4)
+      assert_in_delta(141.347223, req.mobile.position.lon, 1e-4)
+    end
   end
 
   # 正しいIPアドレス空間からのアクセスを判断できるか。
   def test_willcom_valid_ip_address
-    req = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0",
+    reqs = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0",
                           {"REMOTE_ADDR"=>"61.198.142.1"})
-    assert_equal(req.mobile.valid_ip?, true)
+    reqs.each do |req|
+      assert_equal(req.mobile.valid_ip?, true)
+    end
   end
 
   # 正しくないIPアドレス空間からのアクセスを判断できるか。
   def test_willcom_invalid_ip_address
-    req = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0",
+    reqs = request_with_ua("Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0",
                           {"REMOTE_ADDR"=>"127.0.0.1"})
-    assert_equal(req.mobile.valid_ip?, false)
+    reqs.each do |req|
+      assert_equal(req.mobile.valid_ip?, false)
+    end
   end
 end