fixing nits

aspnet · Oct 7, 2014 · 057dd09 · 057dd09
1 parent fcbcda7
commit 057dd09
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/Microsoft.Framework.Logging.NLog/NLogLoggerProvider.cs b/src/Microsoft.Framework.Logging.NLog/NLogLoggerProvider.cs
@@ -37,7 +37,7 @@ public void Write(
                 Func<object, Exception, string> formatter)
             {
                 var logLevel = GetLogLevel(eventType);
-                var message = "";
+                var message = string.Empty;
                 if (formatter != null)
                 {
                     message = formatter(state, exception);
@@ -53,7 +53,7 @@ public void Write(
                         message += Environment.NewLine + exception;
                     }
                 }
-                if (!String.IsNullOrEmpty(message))
+                if (!string.IsNullOrEmpty(message))
                 {
                     var eventInfo = LogEventInfo.Create(logLevel, _logger.Name, message, exception);
                     eventInfo.Properties["EventId"] = eventId;

diff --git a/src/Microsoft.Framework.Logging/DiagnosticsLogger.cs b/src/Microsoft.Framework.Logging/DiagnosticsLogger.cs
@@ -18,13 +18,11 @@ public DiagnosticsLogger(TraceSource traceSource)
 
         public void Write(TraceType traceType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
         {
-            var eventType = GetEventType(traceType);
-
-            if (!_traceSource.Switch.ShouldTrace(eventType))
+            if (!IsEnabled(traceType))
             {
                 return;
             }
-            var message = "";
+            var message = string.Empty;
             if (formatter != null)
             {
                 message = formatter(state, exception);
@@ -40,9 +38,9 @@ public void Write(TraceType traceType, int eventId, object state, Exception exce
                     message += Environment.NewLine + exception;
                 }
             }
-            if (!String.IsNullOrEmpty(message))
+            if (!string.IsNullOrEmpty(message))
             {
-                _traceSource.TraceEvent(eventType, eventId, message);
+                _traceSource.TraceEvent(GetEventType(traceType), eventId, message);
             }
         }
 

diff --git a/src/Microsoft.Framework.Logging/Logger.cs b/src/Microsoft.Framework.Logging/Logger.cs
@@ -27,9 +27,9 @@ public Logger(LoggerFactory loggerFactory, string name)
 
         public void Write(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
         {
-            for (var index = 0; index < _loggers.Length; index++)
+            foreach(var logger in _loggers)
             {
-                _loggers[index].Write(eventType, eventId, state, exception, formatter);
+                logger.Write(eventType, eventId, state, exception, formatter);
             }
         }
 
@@ -42,7 +42,7 @@ public IDisposable BeginScope(object state)
         {
             var count = _loggers.Length;
             var scope = new Scope(count);
-            for (var index = 0; index != count; index++)
+            for (var index = 0; index < count; index++)
             {
                 scope.SetDisposable(index, _loggers[index].BeginScope(state));
             }

diff --git a/test/Microsoft.Framework.Logging.Test/DiagnosticsLoggerTest.cs b/test/Microsoft.Framework.Logging.Test/DiagnosticsLoggerTest.cs
@@ -4,26 +4,25 @@
 using System;
 using System.Diagnostics;
 using Xunit;
-#if ASPNET50
-using Moq;
-#endif
 
 namespace Microsoft.Framework.Logging.Test
 {
     public class DiagnosticsLoggerTest
     {
-#if ASPNET50
         [Fact]
         public static void IsEnabledReturnsCorrectValue()
         {
+            // Arrange
             var testSwitch = new SourceSwitch("TestSwitch", "Level will be set to warning for this test");
             testSwitch.Level = SourceLevels.Warning;
 
             var factory = new LoggerFactory();
             var logger = factory.Create("Test");
 
+            // Act
             factory.AddProvider(new DiagnosticsLoggerProvider(testSwitch, new ConsoleTraceListener()));
 
+            // Assert
             Assert.True(logger.IsEnabled(TraceType.Critical));
             Assert.True(logger.IsEnabled(TraceType.Error));
             Assert.True(logger.IsEnabled(TraceType.Warning));
@@ -38,6 +37,7 @@ public static void IsEnabledReturnsCorrectValue()
         [InlineData(SourceLevels.Warning, SourceLevels.Warning, false)]
         public static void MultipleLoggers_IsEnabledReturnsCorrectValue(SourceLevels first, SourceLevels second, bool expected)
         {
+            // Arrange
             var firstSwitch = new SourceSwitch("FirstSwitch", "First Test Switch");
             firstSwitch.Level = first;
 
@@ -47,10 +47,12 @@ public static void MultipleLoggers_IsEnabledReturnsCorrectValue(SourceLevels fir
             var factory = new LoggerFactory();
             var logger = factory.Create("Test");
 
+            // Act
             factory.AddProvider(new DiagnosticsLoggerProvider(firstSwitch, new ConsoleTraceListener()));
             factory.AddProvider(new DiagnosticsLoggerProvider(secondSwitch, new ConsoleTraceListener()));
+
+            // Assert
             Assert.Equal(expected, logger.IsEnabled(TraceType.Information));
         }
     }
-#endif
 }