ruby-changes:11180
From: nobu <ko1@a...>
Date: Fri, 6 Mar 2009 13:05:02 +0900 (JST)
Subject: [ruby-changes:11180] Ruby:r22786 (trunk): * test/test_syslog.rb: moved.
nobu 2009-03-06 13:04:56 +0900 (Fri, 06 Mar 2009) New Revision: 22786 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22786 Log: * test/test_syslog.rb: moved. Added files: trunk/test/test_syslog.rb Removed files: trunk/ext/syslog/test.rb Index: ext/syslog/test.rb =================================================================== --- ext/syslog/test.rb (revision 22785) +++ ext/syslog/test.rb (revision 22786) @@ -1,164 +0,0 @@ -#!/usr/bin/env ruby -# $RoughId: test.rb,v 1.9 2002/02/25 08:20:14 knu Exp $ -# $Id$ - -# Please only run this test on machines reasonable for testing. -# If in doubt, ask your admin. - -require 'test/unit' - -# Prepend current directory to load path for testing. -$:.unshift('.') - -require 'syslog' - -class TestSyslog < Test::Unit::TestCase - def test_new - assert_raises(NoMethodError) { - Syslog.new - } - end - - def test_instance - sl1 = Syslog.instance - sl2 = Syslog.open - sl3 = Syslog.instance - - assert_equal(Syslog, sl1) - assert_equal(Syslog, sl2) - assert_equal(Syslog, sl3) - ensure - Syslog.close if Syslog.opened? - end - - def test_open - # default parameters - Syslog.open - - assert_equal($0, Syslog.ident) - assert_equal(Syslog::LOG_PID | Syslog::LOG_CONS, Syslog.options) - assert_equal(Syslog::LOG_USER, Syslog.facility) - - # open without close - assert_raises(RuntimeError) { - Syslog.open - } - - Syslog.close - - # given parameters - Syslog.open("foo", Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog::LOG_DAEMON) - - assert_equal('foo', Syslog.ident) - assert_equal(Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog.options) - assert_equal(Syslog::LOG_DAEMON, Syslog.facility) - - Syslog.close - - # default parameters again (after close) - Syslog.open - Syslog.close - - assert_equal(nil, Syslog.ident) - assert_equal(nil, Syslog.options) - assert_equal(nil, Syslog.facility) - - # block - param = nil - Syslog.open { |param| } - assert_equal(Syslog, param) - ensure - Syslog.close if Syslog.opened? - end - - def test_opened? - assert_equal(false, Syslog.opened?) - - Syslog.open - assert_equal(true, Syslog.opened?) - - Syslog.close - assert_equal(false, Syslog.opened?) - - Syslog.open { - assert_equal(true, Syslog.opened?) - } - - assert_equal(false, Syslog.opened?) - end - - def test_close - assert_raises(RuntimeError) { - Syslog.close - } - end - - def test_mask - assert_equal(nil, Syslog.mask) - - Syslog.open - - orig = Syslog.mask - - Syslog.mask = Syslog.LOG_UPTO(Syslog::LOG_ERR) - assert_equal(Syslog.LOG_UPTO(Syslog::LOG_ERR), Syslog.mask) - - Syslog.mask = Syslog.LOG_MASK(Syslog::LOG_CRIT) - assert_equal(Syslog.LOG_MASK(Syslog::LOG_CRIT), Syslog.mask) - - Syslog.mask = orig - ensure - Syslog.close if Syslog.opened? - end - - def test_log - stderr = IO::pipe - - pid = fork { - stderr[0].close - STDERR.reopen(stderr[1]) - stderr[1].close - - options = Syslog::LOG_PERROR | Syslog::LOG_NDELAY - - Syslog.open("syslog_test", options) { |sl| - sl.log(Syslog::LOG_NOTICE, "test1 - hello, %s!", "world") - sl.notice("test1 - hello, %s!", "world") - } - - Syslog.open("syslog_test", options | Syslog::LOG_PID) { |sl| - sl.log(Syslog::LOG_CRIT, "test2 - pid") - sl.crit("test2 - pid") - } - exit! - } - - stderr[1].close - Process.waitpid(pid) - - # LOG_PERROR is not yet implemented on Cygwin. - return if RUBY_PLATFORM =~ /cygwin/ - - 2.times { - assert_equal("syslog_test: test1 - hello, world!\n", stderr[0].gets) - } - - 2.times { - assert_equal(format("syslog_test[%d]: test2 - pid\n", pid), stderr[0].gets) - } - end - - def test_inspect - Syslog.open { |sl| - assert_equal(format('<#%s: opened=true, ident="%s", options=%d, facility=%d, mask=%d>', - Syslog, - sl.ident, - sl.options, - sl.facility, - sl.mask), - sl.inspect) - } - - assert_equal(format('<#%s: opened=false>', Syslog), Syslog.inspect) - end -end Index: test/test_syslog.rb =================================================================== --- test/test_syslog.rb (revision 0) +++ test/test_syslog.rb (revision 22786) @@ -0,0 +1,164 @@ +#!/usr/bin/env ruby +# $RoughId: test.rb,v 1.9 2002/02/25 08:20:14 knu Exp $ +# $Id$ + +# Please only run this test on machines reasonable for testing. +# If in doubt, ask your admin. + +require 'test/unit' + +# Prepend current directory to load path for testing. +$:.unshift('.') + +require 'syslog' + +class TestSyslog < Test::Unit::TestCase + def test_new + assert_raises(NoMethodError) { + Syslog.new + } + end + + def test_instance + sl1 = Syslog.instance + sl2 = Syslog.open + sl3 = Syslog.instance + + assert_equal(Syslog, sl1) + assert_equal(Syslog, sl2) + assert_equal(Syslog, sl3) + ensure + Syslog.close if Syslog.opened? + end + + def test_open + # default parameters + Syslog.open + + assert_equal($0, Syslog.ident) + assert_equal(Syslog::LOG_PID | Syslog::LOG_CONS, Syslog.options) + assert_equal(Syslog::LOG_USER, Syslog.facility) + + # open without close + assert_raises(RuntimeError) { + Syslog.open + } + + Syslog.close + + # given parameters + Syslog.open("foo", Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog::LOG_DAEMON) + + assert_equal('foo', Syslog.ident) + assert_equal(Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog.options) + assert_equal(Syslog::LOG_DAEMON, Syslog.facility) + + Syslog.close + + # default parameters again (after close) + Syslog.open + Syslog.close + + assert_equal(nil, Syslog.ident) + assert_equal(nil, Syslog.options) + assert_equal(nil, Syslog.facility) + + # block + param = nil + Syslog.open { |param| } + assert_equal(Syslog, param) + ensure + Syslog.close if Syslog.opened? + end + + def test_opened? + assert_equal(false, Syslog.opened?) + + Syslog.open + assert_equal(true, Syslog.opened?) + + Syslog.close + assert_equal(false, Syslog.opened?) + + Syslog.open { + assert_equal(true, Syslog.opened?) + } + + assert_equal(false, Syslog.opened?) + end + + def test_close + assert_raises(RuntimeError) { + Syslog.close + } + end + + def test_mask + assert_equal(nil, Syslog.mask) + + Syslog.open + + orig = Syslog.mask + + Syslog.mask = Syslog.LOG_UPTO(Syslog::LOG_ERR) + assert_equal(Syslog.LOG_UPTO(Syslog::LOG_ERR), Syslog.mask) + + Syslog.mask = Syslog.LOG_MASK(Syslog::LOG_CRIT) + assert_equal(Syslog.LOG_MASK(Syslog::LOG_CRIT), Syslog.mask) + + Syslog.mask = orig + ensure + Syslog.close if Syslog.opened? + end + + def test_log + stderr = IO::pipe + + pid = fork { + stderr[0].close + STDERR.reopen(stderr[1]) + stderr[1].close + + options = Syslog::LOG_PERROR | Syslog::LOG_NDELAY + + Syslog.open("syslog_test", options) { |sl| + sl.log(Syslog::LOG_NOTICE, "test1 - hello, %s!", "world") + sl.notice("test1 - hello, %s!", "world") + } + + Syslog.open("syslog_test", options | Syslog::LOG_PID) { |sl| + sl.log(Syslog::LOG_CRIT, "test2 - pid") + sl.crit("test2 - pid") + } + exit! + } + + stderr[1].close + Process.waitpid(pid) + + # LOG_PERROR is not yet implemented on Cygwin. + return if RUBY_PLATFORM =~ /cygwin/ + + 2.times { + assert_equal("syslog_test: test1 - hello, world!\n", stderr[0].gets) + } + + 2.times { + assert_equal(format("syslog_test[%d]: test2 - pid\n", pid), stderr[0].gets) + } + end + + def test_inspect + Syslog.open { |sl| + assert_equal(format('<#%s: opened=true, ident="%s", options=%d, facility=%d, mask=%d>', + Syslog, + sl.ident, + sl.options, + sl.facility, + sl.mask), + sl.inspect) + } + + assert_equal(format('<#%s: opened=false>', Syslog), Syslog.inspect) + end +end Property changes on: test/test_syslog.rb ___________________________________________________________________ Name: svn:mergeinfo + Name: svn:eol-style + LF Name: svn:keywords + Author Date Id Revision -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/