Modified logger_test

.gitignore

@@ -1 +1,2 @@
 *.log
+stderr.txt

rocs/logger/logger.rb

@@ -16,18 +16,18 @@ class Logger
 	include Singleton
 
 	def initialize
-		@logFile = "changeme.log"
+		@logFile = "server.log"
 		@logFileFrozen = false
-		@writeToStderr = false
+		@writeToStderr = true
 	end
 
 	def setConfig(config)
 		if @logFileFrozen
-			@@instance.warn "Config already set or log file already used-- cannot be set a second time, ignoring."
+			Logger.instance.warn "Config already set or log file already used-- cannot be set a second time, ignoring."
 			return
 		end
 
-		@writeToStderr = config.config["write_to_stderr"].include?("true") if config.config["write_to_stderr"]
+		@writeToStderr = config.config["write_to_stderr"].include?("yes") if config.config["write_to_stderr"]
 		@logFile = config.config["log_file"]
 		@configAlreadySet = true
 	end

rocs/logger_test/loggerTest.rb

@@ -4,30 +4,31 @@
 
 class LoggerTest < Test::Unit::TestCase
 
+
+	def test_log_error
+		loggerError = Logger.instance
+		errorText = "Error test: #{Random.rand(100000)}"
+		loggerError.error errorText
+		logFile = File.read("server.log")
+		assert(logFile.include?(errorText))
+	end
+
 	def test_log_info
 		loggerInfo = Logger.instance
 		loggedText = "Info test: #{Random.rand(100000)}"
 		loggerInfo.info loggedText
-		logFile = File.read("changeme.log")
+		logFile = File.read("server.log")
 		assert(logFile.include?(loggedText))
 	end
 
 	def test_log_warn
 		loggerWarn = Logger.instance
 		warnText = "Warn test: #{Random.rand(100000)}"
 		loggerWarn.warn warnText
-		logFile = File.read("changeme.log")
+		logFile = File.read("server.log")
 		assert(logFile.include?(warnText))
 	end
 
-	def test_log_error
-		loggerError = Logger.instance
-		errorText = "Error test: #{Random.rand(100000)}"
-		loggerError.error errorText
-		logFile = File.read("changeme.log")
-		assert(logFile.include?(errorText))
-	end
-
 	def test_setConfig
 		configIO = ConfigIO.instance
 		configIO.read("../config.yml")
@@ -36,7 +37,19 @@ def test_setConfig
 		ioText = "configIO test: #{Random.rand(100000)}"
 		logger.info ioText
 		configFile = File.read("server.log")
-		assert(configFile.include?(ioText))
+		assert(configFile.include?(ioText), "Config not set.")
 	end	
 
+	def test_stderr
+		loggerStdErr = Logger.instance 
+		stdErrText = "Stderr Test: #{Random.rand(100000)}"
+		$stderr = File.open("stderr.txt", "w")
+		loggerStdErr.log("info", stdErrText)
+		$stderr.close
+		stderrFile = File.read("stderr.txt")
+		puts "This is the file: #{stderrFile}"
+		assert(stderrFile.include?(stdErrText), "Stderr not written to.")
+
+	end
+
 end