71234daef1
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
81 lines
2.1 KiB
Ruby
81 lines
2.1 KiB
Ruby
require File.dirname(__FILE__) + '/abstract_unit'
|
|
require 'stringio'
|
|
|
|
class CleanLoggerTest < Test::Unit::TestCase
|
|
def setup
|
|
@out = StringIO.new
|
|
@logger = Logger.new(@out)
|
|
end
|
|
|
|
def test_format_message
|
|
@logger.error 'error'
|
|
assert_equal "error\n", @out.string
|
|
end
|
|
|
|
def test_silence
|
|
# Without yielding self.
|
|
@logger.silence do
|
|
@logger.debug 'debug'
|
|
@logger.info 'info'
|
|
@logger.warn 'warn'
|
|
@logger.error 'error'
|
|
@logger.fatal 'fatal'
|
|
end
|
|
|
|
# Yielding self.
|
|
@logger.silence do |logger|
|
|
logger.debug 'debug'
|
|
logger.info 'info'
|
|
logger.warn 'warn'
|
|
logger.error 'error'
|
|
logger.fatal 'fatal'
|
|
end
|
|
|
|
# Silencer off.
|
|
Logger.silencer = false
|
|
@logger.silence do |logger|
|
|
logger.warn 'unsilenced'
|
|
end
|
|
Logger.silencer = true
|
|
|
|
assert_equal "error\nfatal\nerror\nfatal\nunsilenced\n", @out.string
|
|
end
|
|
end
|
|
|
|
class CleanLogger_182_to_183_Test < Test::Unit::TestCase
|
|
def setup
|
|
silence_warnings do
|
|
if Logger.method_defined?(:formatter=)
|
|
Logger.send(:alias_method, :hide_formatter=, :formatter=)
|
|
Logger.send(:undef_method, :formatter=)
|
|
else
|
|
Logger.send(:define_method, :formatter=) { }
|
|
end
|
|
load File.dirname(__FILE__) + '/../lib/active_support/clean_logger.rb'
|
|
end
|
|
|
|
@out = StringIO.new
|
|
@logger = Logger.new(@out)
|
|
@logger.progname = 'CLEAN LOGGER TEST'
|
|
end
|
|
|
|
def teardown
|
|
silence_warnings do
|
|
if Logger.method_defined?(:hide_formatter=)
|
|
Logger.send(:alias_method, :formatter=, :hide_formatter=)
|
|
else
|
|
Logger.send(:undef_method, :formatter=)
|
|
end
|
|
load File.dirname(__FILE__) + '/../lib/active_support/clean_logger.rb'
|
|
end
|
|
end
|
|
|
|
# Since we've fooled Logger into thinking we're on 1.8.2 if we're on 1.8.3
|
|
# and on 1.8.3 if we're on 1.8.2, it'll define format_message with the
|
|
# wrong order of arguments and therefore print progname instead of msg.
|
|
def test_format_message_with_faked_version
|
|
@logger.error 'error'
|
|
assert_equal "CLEAN LOGGER TEST\n", @out.string
|
|
end
|
|
end
|