Permalink
Browse files

r4487@asus: jeremy | 2006-04-29 12:21:39 -0700

 Check whether @flash is defined? for warnings-safety.
 r4488@asus:  jeremy | 2006-04-29 12:23:15 -0700
 Check whether @flash is defined? for warnings-safety. Obviates nil? check.
 r4489@asus:  jeremy | 2006-04-29 12:45:18 -0700
 Check whether @session is defined? for warnings-safety.
 r4490@asus:  jeremy | 2006-04-29 12:50:41 -0700
 Check whether @rendering_runtime is defined? for warnings-safety.
 r4491@asus:  jeremy | 2006-04-29 12:55:01 -0700
 Check whether @_cycles is defined? for warnings-safety.
 r4492@asus:  jeremy | 2006-04-29 12:59:19 -0700
 Check whether instance variables are defined? for warnings-safety.
 r4493@asus:  jeremy | 2006-04-29 13:14:09 -0700
 Add nil @template to PrototypeHelperTest to suppress unitialized instance variable warning.
 r4494@asus:  jeremy | 2006-04-29 13:31:34 -0700
 Check whether @auto_index defined? for warnings-safety.
 r4495@asus:  jeremy | 2006-04-29 13:32:24 -0700
 Wrap content_columns redefinitions with silence_warnings.
 r4496@asus:  jeremy | 2006-04-29 13:35:28 -0700
 Wrap more redefinitions with silence_warnings.
 r4829@asus:  jeremy | 2006-07-08 10:59:20 -0700
 abstract unit, fix warnings
 r4830@asus:  jeremy | 2006-07-08 11:06:12 -0700
 Use parens to silence warning.
 r4831@asus:  jeremy | 2006-07-08 11:06:48 -0700
 Use parens to silence warning.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4595 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent a3f459e commit 71234daef1517cf190adfc5978e56882d2a57ea6 @jeremy jeremy committed Jul 8, 2006
Showing with 237 additions and 275 deletions.
  1. +1 −1 actionpack/lib/action_controller/benchmarking.rb
  2. +1 −1 actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb
  3. +2 −2 actionpack/lib/action_controller/cgi_process.rb
  4. +3 −3 actionpack/lib/action_controller/components.rb
  5. +2 −2 actionpack/lib/action_controller/flash.rb
  6. +5 −3 actionpack/lib/action_controller/test_process.rb
  7. +2 −2 actionpack/lib/action_view/helpers/form_helper.rb
  8. +3 −4 actionpack/lib/action_view/helpers/text_helper.rb
  9. +2 −2 actionpack/test/controller/helper_test.rb
  10. +20 −9 actionpack/test/template/active_record_helper_test.rb
  11. +1 −0 actionpack/test/template/prototype_helper_test.rb
  12. +4 −0 activesupport/test/abstract_unit.rb
  13. +11 −14 activesupport/test/caching_tools_test.rb
  14. +1 −2 activesupport/test/class_inheritable_attributes_test.rb
  15. +1 −3 activesupport/test/clean_logger_test.rb
  16. +14 −15 activesupport/test/core_ext/array_ext_test.rb
  17. +1 −3 activesupport/test/core_ext/blank_test.rb
  18. +1 −2 activesupport/test/core_ext/cgi_ext_test.rb
  19. +1 −2 activesupport/test/core_ext/class_test.rb
  20. +4 −5 activesupport/test/core_ext/date_ext_test.rb
  21. +2 −4 activesupport/test/core_ext/enumerable_test.rb
  22. +9 −10 activesupport/test/core_ext/exception_test.rb
  23. +1 −2 activesupport/test/core_ext/hash_ext_test.rb
  24. +3 −4 activesupport/test/core_ext/integer_ext_test.rb
  25. +1 −2 activesupport/test/core_ext/kernel_test.rb
  26. +2 −3 activesupport/test/core_ext/load_error_tests.rb
  27. +10 −12 activesupport/test/core_ext/module_test.rb
  28. +1 −2 activesupport/test/core_ext/numeric_ext_test.rb
  29. +16 −18 activesupport/test/core_ext/object_and_class_ext_test.rb
  30. +1 −4 activesupport/test/core_ext/pathname_test.rb
  31. +2 −3 activesupport/test/core_ext/proc_test.rb
  32. +1 −4 activesupport/test/core_ext/range_ext_test.rb
  33. +15 −17 activesupport/test/core_ext/string_ext_test.rb
  34. +1 −2 activesupport/test/core_ext/symbol_test.rb
  35. +22 −24 activesupport/test/core_ext/time_ext_test.rb
  36. +10 −13 activesupport/test/dependencies_test.rb
  37. +18 −19 activesupport/test/inflector_test.rb
  38. +7 −9 activesupport/test/json.rb
  39. +7 −12 activesupport/test/option_merger_test.rb
  40. +12 −14 activesupport/test/ordered_options_test.rb
  41. +10 −13 activesupport/test/reloadable_test.rb
  42. +1 −2 activesupport/test/time_zone_test.rb
  43. +5 −7 activesupport/test/whiny_nil_test.rb
@@ -65,7 +65,7 @@ def perform_action_with_benchmark
else
runtime = [Benchmark::measure{ perform_action_without_benchmark }.real, 0.0001].max
log_message = "Completed in #{sprintf("%.5f", runtime)} (#{(1 / runtime).floor} reqs/sec)"
- log_message << rendering_runtime(runtime) if @rendering_runtime
+ log_message << rendering_runtime(runtime) if defined?(@rendering_runtime)
log_message << active_record_runtime(runtime) if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
log_message << " | #{headers["Status"]}"
log_message << " [#{complete_request_uri rescue "unknown"}]"
@@ -75,7 +75,7 @@ def read_body(content_length)
content = stdinput.read(content_length) || ''
# Fix for Safari Ajax postings that always append \000
content.chop! if content[-1] == 0
- content.gsub! /&_=$/, ''
+ content.gsub!(/&_=$/, '')
env_table['RAW_POST_DATA'] = content.freeze
end
@@ -101,7 +101,7 @@ def port
end
def session
- unless @session
+ unless defined?(@session)
if @session_options == false
@session = Hash.new
else
@@ -119,7 +119,7 @@ def session
end
def reset_session
- @session.delete if CGI::Session === @session
+ @session.delete if defined?(@session) && @session.is_a?(CGI::Session)
@session = new_session
end
@@ -111,9 +111,9 @@ def render_component_as_string(options) #:doc:
end
def flash_with_components(refresh = false) #:nodoc:
- if @flash.nil? || refresh
- @flash =
- if @parent_controller
+ if !defined?(@flash) || refresh
+ @flash =
+ if defined?(@parent_controller)
@parent_controller.flash
else
flash_without_components
@@ -155,8 +155,8 @@ def reset_session_with_flash
# <tt>flash["notice"] = "hello"</tt> to put a new one.
# Note that if sessions are disabled only flash.now will work.
def flash(refresh = false) #:doc:
- if @flash.nil? || refresh
- @flash =
+ if !defined?(@flash) || refresh
+ @flash =
if @session.is_a?(Hash)
# @session is a Hash, if sessions are disabled
# we don't put the flash in the session in this case
@@ -337,7 +337,7 @@ def self.included(base)
%w( get post put delete head ).each do |method|
base.class_eval <<-EOV, __FILE__, __LINE__
def #{method}(action, parameters = nil, session = nil, flash = nil)
- @request.env['REQUEST_METHOD'] = "#{method.upcase}" if @request
+ @request.env['REQUEST_METHOD'] = "#{method.upcase}" if defined?(@request)
process(action, parameters, session, flash)
end
EOV
@@ -348,8 +348,10 @@ def #{method}(action, parameters = nil, session = nil, flash = nil)
def process(action, parameters = nil, session = nil, flash = nil)
# Sanity check for required instance variables so we can give an
# understandable error message.
- %w(controller request response).each do |iv_name|
- raise "@#{iv_name} is nil: make sure you set it in your test's setup method." if instance_variable_get("@#{iv_name}").nil?
+ %w(@controller @request @response).each do |iv_name|
+ if !instance_variables.include?(iv_name) || instance_variable_get(iv_name).nil?
+ raise "#{iv_name} is nil: make sure you set it in your test's setup method."
+ end
end
@request.recycle!
@@ -267,7 +267,7 @@ def to_radio_button_tag(tag_value, options = {})
end
options["checked"] = "checked" if checked
pretty_tag_value = tag_value.to_s.gsub(/\s/, "_").gsub(/\W/, "").downcase
- options["id"] = @auto_index ?
+ options["id"] = defined?(@auto_index) ?
"#{@object_name}_#{@auto_index}_#{@method_name}_#{pretty_tag_value}" :
"#{@object_name}_#{@method_name}_#{pretty_tag_value}"
add_default_name_and_id(options)
@@ -377,7 +377,7 @@ def add_default_name_and_id(options)
options["name"] ||= tag_name_with_index(options["index"])
options["id"] ||= tag_id_with_index(options["index"])
options.delete("index")
- elsif @auto_index
+ elsif defined?(@auto_index)
options["name"] ||= tag_name_with_index(@auto_index)
options["id"] ||= tag_id_with_index(@auto_index)
else
@@ -277,8 +277,7 @@ def cycle(first_value, *values)
# the next time it is used.
def reset_cycle(name = "default")
cycle = get_cycle(name)
- return if cycle.nil?
- cycle.reset
+ cycle.reset unless cycle.nil?
end
class Cycle #:nodoc:
@@ -305,12 +304,12 @@ def to_s
# guaranteed to be reset every time a page is rendered, so it
# uses an instance variable of ActionView::Base.
def get_cycle(name)
- @_cycles = Hash.new if @_cycles.nil?
+ @_cycles = Hash.new unless defined?(@_cycles)
return @_cycles[name]
end
def set_cycle(name, cycle_object)
- @_cycles = Hash.new if @_cycles.nil?
+ @_cycles = Hash.new unless defined?(@_cycles)
@_cycles[name] = cycle_object
end
@@ -77,8 +77,8 @@ def test_declare_missing_helper
def test_declare_missing_file_from_helper
require 'broken_helper'
- rescue LoadError => e
- assert_nil /\bbroken_helper\b/.match(e.to_s)[1]
+ rescue LoadError => e
+ assert_nil(/\bbroken_helper\b/.match(e.to_s)[1])
end
def test_helper_block
@@ -49,7 +49,9 @@ def @post.column_for_attribute(attr_name)
Post.content_columns.select { |column| column.name == attr_name }.first
end
- def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end
+ silence_warnings do
+ def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end
+ end
@post.title = "Hello World"
@post.author_name = ""
@@ -76,7 +78,9 @@ def @user.column_for_attribute(attr_name)
User.content_columns.select { |column| column.name == attr_name }.first
end
- def User.content_columns() [ Column.new(:string, "email", "Email") ] end
+ silence_warnings do
+ def User.content_columns() [ Column.new(:string, "email", "Email") ] end
+ end
@user.email = ""
end
@@ -119,28 +123,35 @@ def test_form_with_string
form("post")
)
- class << @post
- def new_record?() false end
- def to_param() id end
- def id() 1 end
+ silence_warnings do
+ class << @post
+ def new_record?() false end
+ def to_param() id end
+ def id() 1 end
+ end
end
+
assert_dom_equal(
%(<form action="update/1" method="post"><input id="post_id" name="post[id]" type="hidden" value="1" /><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Update" /></form>),
form("post")
)
end
def test_form_with_date
- def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
+ silence_warnings do
+ def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
+ end
assert_dom_equal(
%(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
form("post")
)
end
-
+
def test_form_with_datetime
- def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end
+ silence_warnings do
+ def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end
+ end
@post.written_on = Time.gm(2004, 6, 15, 16, 30)
assert_dom_equal(
@@ -13,6 +13,7 @@ module BaseTest
include ActionView::Helpers::CaptureHelper
def setup
+ @template = nil
@controller = Class.new do
def url_for(options, *parameters_for_method_reference)
if options.is_a?(String)
@@ -0,0 +1,4 @@
+require 'test/unit'
+
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'active_support'
@@ -1,26 +1,24 @@
-require 'test/unit'
-require File.dirname(__FILE__)+'/../lib/active_support/caching_tools'
+require File.dirname(__FILE__) + '/abstract_unit'
class HashCachingTests < Test::Unit::TestCase
-
def cached(&proc)
- return @cached if @cached
-
+ return @cached if defined?(@cached)
+
@cached_class = Class.new(&proc)
@cached_class.class_eval do
extend ActiveSupport::CachingTools::HashCaching
hash_cache :slow_method
end
@cached = @cached_class.new
end
-
+
def test_cache_access_should_call_method
cached do
def slow_method(a) raise "I should be here: #{a}"; end
end
assert_raises(RuntimeError) { cached.slow_method_cache[1] }
end
-
+
def test_cache_access_should_actually_cache
cached do
def slow_method(a)
@@ -37,7 +35,7 @@ def slow_method(a)
assert_equal 11, cached.slow_method_cache[10]
assert_equal 12, cached.slow_method_cache[11]
end
-
+
def test_cache_should_be_clearable
cached do
def slow_method(a)
@@ -48,18 +46,18 @@ def slow_method(a)
assert_equal 1, cached.slow_method_cache[:a]
assert_equal 2, cached.slow_method_cache[:b]
assert_equal 3, cached.slow_method_cache[:c]
-
+
assert_equal 1, cached.slow_method_cache[:a]
assert_equal 2, cached.slow_method_cache[:b]
assert_equal 3, cached.slow_method_cache[:c]
-
+
cached.slow_method_cache.clear
-
+
assert_equal 4, cached.slow_method_cache[:a]
assert_equal 5, cached.slow_method_cache[:b]
assert_equal 6, cached.slow_method_cache[:c]
end
-
+
def test_deep_caches_should_work_too
cached do
def slow_method(a, b, c)
@@ -70,12 +68,11 @@ def slow_method(a, b, c)
assert_equal 7, cached.slow_method_cache[1][2][4]
assert_equal 7, cached.slow_method_cache[1][2][4]
assert_equal 7, cached.slow_method_cache[4][2][1]
-
+
assert_equal({
1 => {1 => {1 => 3}, 2 => {4 => 7}},
4 => {2 => {1 => 7}}},
cached.slow_method_cache
)
end
-
end
@@ -1,5 +1,4 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/active_support/core_ext/class/inheritable_attributes'
+require File.dirname(__FILE__) + '/abstract_unit'
class ClassInheritableAttributesTest < Test::Unit::TestCase
def setup
@@ -1,7 +1,5 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/abstract_unit'
require 'stringio'
-require File.dirname(__FILE__) + '/../lib/active_support/clean_logger'
-require File.dirname(__FILE__) + '/../lib/active_support/core_ext/kernel.rb' unless defined? silence_warnings
class CleanLoggerTest < Test::Unit::TestCase
def setup
Oops, something went wrong.

0 comments on commit 71234da

Please sign in to comment.