From 6fd707314b93ae05fb93cb66defe1079b280a611 Mon Sep 17 00:00:00 2001
From: Shawn <shawn@codemastershawn.com>
Date: Sun, 16 Feb 2014 23:24:30 -0800
Subject: [PATCH 1/4] Removed vestigial IDE extension settings

At one time Bellevue College used an extension to automatically
increment version numbers on build. The extension is no longer in
use, but its settings have persisted in the project files.
---
 CtcApi.Ods/OdsApi.Tests/Test.CtcApi.Ods.csproj | 5 -----
 Test.CtcApi/Test.CtcApi.csproj                 | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/CtcApi.Ods/OdsApi.Tests/Test.CtcApi.Ods.csproj b/CtcApi.Ods/OdsApi.Tests/Test.CtcApi.Ods.csproj
index 9453fd3..a0d399c 100644
--- a/CtcApi.Ods/OdsApi.Tests/Test.CtcApi.Ods.csproj
+++ b/CtcApi.Ods/OdsApi.Tests/Test.CtcApi.Ods.csproj
@@ -169,9 +169,4 @@
     <PostBuildEvent>if exist $(ProjectDir)ConnectionStrings.config xcopy /y $(ProjectDir)ConnectionStrings.config $(OutDir)
 if exist $(ProjectDir)AppSettings.config xcopy /y $(ProjectDir)AppSettings.config $(OutDir)</PostBuildEvent>
   </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_ConfigurationName="Release" BuildVersion_BuildAction="ReBuild" />
-    </VisualStudio>
-  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Test.CtcApi/Test.CtcApi.csproj b/Test.CtcApi/Test.CtcApi.csproj
index f003b9b..a27cb67 100644
--- a/Test.CtcApi/Test.CtcApi.csproj
+++ b/Test.CtcApi/Test.CtcApi.csproj
@@ -119,11 +119,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties BuildVersion_BuildAction="ReBuild" BuildVersion_ConfigurationName="Release" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.None.Increment" />
-    </VisualStudio>
-  </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

From ff319d2747beb5bf39a9da3998c3b1cab9bb12ec Mon Sep 17 00:00:00 2001
From: Shawn <shawn@codemastershawn.com>
Date: Mon, 17 Feb 2014 23:43:51 -0800
Subject: [PATCH 2/4] Added LogElapsed diagnostic class

Issue #10
This class provides a wrapper around any code and will log the
elapsed time.
---
 CtcApi/CtcApi.csproj             |   1 +
 CtcApi/Diagnostics/LogElapsed.cs | 126 +++++++++++++++++++++++++++++++
 Test.CtcApi/LogElapsedTest.cs    | 106 ++++++++++++++++++++++++++
 Test.CtcApi/Test.CtcApi.csproj   |   1 +
 4 files changed, 234 insertions(+)
 create mode 100644 CtcApi/Diagnostics/LogElapsed.cs
 create mode 100644 Test.CtcApi/LogElapsedTest.cs

diff --git a/CtcApi/CtcApi.csproj b/CtcApi/CtcApi.csproj
index d9f85f4..9aeda4b 100644
--- a/CtcApi/CtcApi.csproj
+++ b/CtcApi/CtcApi.csproj
@@ -72,6 +72,7 @@
   <ItemGroup>
     <Compile Include="ApplicationContext.cs" />
     <Compile Include="Config\CtcConfigBase.cs" />
+    <Compile Include="Diagnostics\LogElapsed.cs" />
     <Compile Include="Extensions\ByteExtensions.cs" />
     <Compile Include="Extensions\ListExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
diff --git a/CtcApi/Diagnostics/LogElapsed.cs b/CtcApi/Diagnostics/LogElapsed.cs
new file mode 100644
index 0000000..ecd6ff4
--- /dev/null
+++ b/CtcApi/Diagnostics/LogElapsed.cs
@@ -0,0 +1,126 @@
+//Copyright (C) 2012 Bellevue College
+//
+//This program is free software: you can redistribute it and/or modify
+//it under the terms of the GNU Lesser General Public License as
+//published by the Free Software Foundation, either version 3 of the
+//License, or (at your option) any later version.
+//
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU Lesser General Public License for more details.
+//
+//You should have received a copy of the GNU Lesser General Public
+//License and GNU General Public License along with this program.
+//If not, see <http://www.gnu.org/licenses/>.
+using System;
+using Common.Logging;
+
+namespace CtcApi.Diagnostics
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class LogElapsed : IDisposable
+    {
+        readonly DateTime _start = DateTime.Now;
+        readonly String _label = "";
+
+        readonly ILog _log = LogManager.GetCurrentClassLogger();
+        private readonly LogLevel _startLevel = LogLevel.Trace;
+        private readonly LogLevel _finishLevel = LogLevel.Trace;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string TimeFormat
+        {
+            get
+            {
+                // TODO: Retrieve value from .config
+                return "hh:mm:ss.ffff tt";
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="label"></param>
+        /// <param name="startLevel"></param>
+        /// <param name="finishLevel"></param>
+        public LogElapsed(String label = "", LogLevel startLevel = LogLevel.Trace, LogLevel finishLevel = LogLevel.Trace)
+        {
+            string msgStart = "Starting TIMER:";
+            if (!string.IsNullOrWhiteSpace(label))
+            {
+                _label = label;
+                msgStart = String.Format("Starting TIMER for: {0}", _label);
+            }
+
+            _start = DateTime.Now;
+            string message = ConstructMessage(msgStart, _start);
+
+            _startLevel = startLevel;
+            _finishLevel = finishLevel;
+            WriteToLog(_startLevel, message);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Dispose()
+        {
+            TimeSpan elapsed = DateTime.Now - _start;
+
+            string msgStart = "Elapsed TIME:";
+            if (!string.IsNullOrWhiteSpace(_label))
+            {
+                msgStart = String.Format("Elapsed TIME for {0}:", _label);
+            }
+
+            string message = ConstructMessage(msgStart, elapsed);
+            WriteToLog(_finishLevel, message);
+        }
+
+        #region Private methods
+        private void WriteToLog(LogLevel level, string message)
+        {
+            // unfortunately, Common.Logging doesn't appear to provide a method that allows passing the level
+            switch (level)
+            {
+                case LogLevel.Debug:
+                    _log.Debug(message);
+                    break;
+                case LogLevel.Info:
+                    _log.Info(message);
+                    break;
+                case LogLevel.Trace:
+                    _log.Trace(message);
+                    break;
+                default:
+                    _log.Warn(
+                            "Unsupported LogLevel specified. Supported levels are Info, Debug and Trace. Falling back to Trace.");
+                    _log.Trace(message);
+                    break;
+            }
+        }
+
+        private static string ConstructMessage(string text, TimeSpan ts)
+        {
+            return ConstructMessage(text, ts.ToString());
+        }
+
+        private string ConstructMessage(string text, DateTime dt)
+        {
+            string time = dt.ToString(TimeFormat);
+            return ConstructMessage(text, time);
+        }
+
+        private static string ConstructMessage(string text, string time)
+        {
+            return String.Format("{0} ({1})", text, time);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/Test.CtcApi/LogElapsedTest.cs b/Test.CtcApi/LogElapsedTest.cs
new file mode 100644
index 0000000..bd898dd
--- /dev/null
+++ b/Test.CtcApi/LogElapsedTest.cs
@@ -0,0 +1,106 @@
+//Copyright (C) 2012 Bellevue College
+//
+//This program is free software: you can redistribute it and/or modify
+//it under the terms of the GNU Lesser General Public License as
+//published by the Free Software Foundation, either version 3 of the
+//License, or (at your option) any later version.
+//
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU Lesser General Public License for more details.
+//
+//You should have received a copy of the GNU Lesser General Public
+//License and GNU General Public License along with this program.
+//If not, see <http://www.gnu.org/licenses/>.
+using Common.Logging;
+using Common.Logging.Simple;
+using CtcApi.Diagnostics;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Test.CtcApi
+{
+  [TestClass]
+  public class LogElapsedTest
+  {
+    private const LogLevel DEFAULT_LOG_LEVEL = LogLevel.Trace;
+    private static CapturingLoggerFactoryAdapter _adapter;
+
+    #region Initialize/cleanup
+    [ClassInitialize()]
+    public static void MyClassInitialize(TestContext testContext)
+    {
+      // http://netcommon.sourceforge.net/docs/2.0.0/api/html/Common.Logging~Common.Logging.Simple.CapturingLoggerFactoryAdapter.html
+      _adapter = new CapturingLoggerFactoryAdapter();
+      LogManager.Adapter = _adapter;
+    }
+
+    [ClassCleanup()]
+    public static void MyClassCleanup()
+    {
+    }
+
+    [TestInitialize()]
+    public void MyTestInitialize()
+    {
+      _adapter.Clear();
+    }
+
+    [TestCleanup()]
+    public void MyTestCleanup()
+    {
+    }
+
+    #endregion
+
+    #region Tests
+    [TestMethod]
+    public void DefaultConstructor()
+    {
+      using (new LogElapsed())
+      {
+        AssertLogEventCount(1);
+        AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+      }
+
+      AssertLogEventCount(2);
+      AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+    }
+
+    [TestMethod]
+    public void With_Label()
+    {
+      using (new LogElapsed("Testing label"))
+      {
+        AssertLogEventCount(1);
+        AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+        AssertLastLogMessageStartsWith("Starting TIMER for: Testing label");
+      }
+
+      AssertLogEventCount(2);
+      AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+      AssertLastLogMessageStartsWith("Elapsed TIME for Testing label:");
+    }
+
+    #endregion
+
+    #region Private methods
+    private static void AssertLastLogMessageStartsWith(string msgStart)
+    {
+      string logMessage = _adapter.LastEvent.RenderedMessage;
+      Assert.IsTrue(logMessage.StartsWith(msgStart), "Expected message beginning '{0}', but received '{1}'", msgStart, logMessage);
+    }
+
+    private void AssertLastLogLeven(LogLevel level)
+    {
+      Assert.AreEqual(level, _adapter.LastEvent.Level);
+    }
+
+    private static void AssertLogEventCount(int count)
+    {
+      Assert.AreEqual(count, _adapter.LoggerEvents.Count);
+    }
+
+    #endregion
+  }
+}
diff --git a/Test.CtcApi/Test.CtcApi.csproj b/Test.CtcApi/Test.CtcApi.csproj
index a27cb67..26a668a 100644
--- a/Test.CtcApi/Test.CtcApi.csproj
+++ b/Test.CtcApi/Test.CtcApi.csproj
@@ -83,6 +83,7 @@
     <Compile Include="CasAuthorizeAttributeTest.cs" />
     <Compile Include="CtcConfigBaseTest.cs" />
     <Compile Include="HtmlExtensionsTest.cs" />
+    <Compile Include="LogElapsedTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StringExtensionsTest.cs" />
     <Compile Include="TestConfigHandler.cs" />

From a3487b63b6e958fa1c7bcdad67f32219b09fd57e Mon Sep 17 00:00:00 2001
From: Shawn <shawn@codemastershawn.com>
Date: Tue, 18 Feb 2014 00:06:26 -0800
Subject: [PATCH 3/4] Added MVC3 assemblies to core api projects

Rather than requiring MVC3 be installed on the workstation, this was
done with the following NuGet package:
http://www.nuget.org/packages/Mvc3Assemblies
https://github.com/remi/Mvc3Assemblies
---
 CtcApi/CtcApi.csproj           | 31 +++++++++++++++++++++++++------
 CtcApi/packages.config         |  1 +
 Test.CtcApi/Test.CtcApi.csproj | 26 +++++++++++++++++++++++++-
 Test.CtcApi/packages.config    |  4 ++++
 4 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 Test.CtcApi/packages.config

diff --git a/CtcApi/CtcApi.csproj b/CtcApi/CtcApi.csproj
index d9f85f4..a174fd9 100644
--- a/CtcApi/CtcApi.csproj
+++ b/CtcApi/CtcApi.csproj
@@ -62,12 +62,36 @@
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Helpers">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="WebMatrix.Data">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\WebMatrix.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="WebMatrix.WebData">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\WebMatrix.WebData.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApplicationContext.cs" />
@@ -134,9 +158,4 @@
     <!-- Package the project -->
     <Exec Command="NuGet.exe pack -Symbols -OutputDir &quot;$(PackageDir)&quot; -Properties Configuration=$(Configuration)" />
   </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_BuildAction="ReBuild" BuildVersion_ConfigurationName="Release" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
-    </VisualStudio>
-  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/CtcApi/packages.config b/CtcApi/packages.config
index 78ac149..284e56a 100644
--- a/CtcApi/packages.config
+++ b/CtcApi/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Common.Logging" version="2.1.2" targetFramework="net40" />
+  <package id="Mvc3Assemblies" version="0.1.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/Test.CtcApi/Test.CtcApi.csproj b/Test.CtcApi/Test.CtcApi.csproj
index a27cb67..15b9584 100644
--- a/Test.CtcApi/Test.CtcApi.csproj
+++ b/Test.CtcApi/Test.CtcApi.csproj
@@ -68,9 +68,32 @@
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Helpers">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="WebMatrix.Data">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\WebMatrix.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="WebMatrix.WebData">
+      <HintPath>..\packages\Mvc3Assemblies.0.1.0\lib\WebMatrix.WebData.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -95,6 +118,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
diff --git a/Test.CtcApi/packages.config b/Test.CtcApi/packages.config
new file mode 100644
index 0000000..f5cef38
--- /dev/null
+++ b/Test.CtcApi/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Mvc3Assemblies" version="0.1.0" targetFramework="net40" />
+</packages>
\ No newline at end of file

From 1c183c0701e1dd79605f8cde4e7336ce9ee42d58 Mon Sep 17 00:00:00 2001
From: Shawn <shawn@codemastershawn.com>
Date: Thu, 20 Feb 2014 23:47:52 -0800
Subject: [PATCH 4/4] Complete test suite for LogElapsed

---
 CtcApi/Diagnostics/LogElapsed.cs |   3 +-
 Test.CtcApi/LogElapsedTest.cs    | 125 +++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+), 2 deletions(-)

diff --git a/CtcApi/Diagnostics/LogElapsed.cs b/CtcApi/Diagnostics/LogElapsed.cs
index ecd6ff4..b216091 100644
--- a/CtcApi/Diagnostics/LogElapsed.cs
+++ b/CtcApi/Diagnostics/LogElapsed.cs
@@ -98,8 +98,7 @@ private void WriteToLog(LogLevel level, string message)
                     _log.Trace(message);
                     break;
                 default:
-                    _log.Warn(
-                            "Unsupported LogLevel specified. Supported levels are Info, Debug and Trace. Falling back to Trace.");
+                    _log.Warn("Unsupported LogLevel specified. Supported levels are Info, Debug and Trace. Falling back to Trace.");
                     _log.Trace(message);
                     break;
             }
diff --git a/Test.CtcApi/LogElapsedTest.cs b/Test.CtcApi/LogElapsedTest.cs
index bd898dd..be1128f 100644
--- a/Test.CtcApi/LogElapsedTest.cs
+++ b/Test.CtcApi/LogElapsedTest.cs
@@ -13,6 +13,8 @@
 //You should have received a copy of the GNU Lesser General Public
 //License and GNU General Public License along with this program.
 //If not, see <http://www.gnu.org/licenses/>.
+
+using System;
 using Common.Logging;
 using Common.Logging.Simple;
 using CtcApi.Diagnostics;
@@ -82,6 +84,129 @@ public void With_Label()
       AssertLastLogMessageStartsWith("Elapsed TIME for Testing label:");
     }
 
+    [TestMethod]
+    public void With_Label_StartLevel()
+    {
+      using (new LogElapsed("Testing label", LogLevel.Debug))
+      {
+        AssertLogEventCount(1);
+        AssertLastLogLeven(LogLevel.Debug);
+        AssertLastLogMessageStartsWith("Starting TIMER for: Testing label");
+      }
+
+      AssertLogEventCount(2);
+      AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+      AssertLastLogMessageStartsWith("Elapsed TIME for Testing label:");
+    }
+
+    [TestMethod]
+    public void With_Label_StartLevel_EndLevel()
+    {
+      using (new LogElapsed("Testing label", LogLevel.Debug, LogLevel.Info))
+      {
+        AssertLogEventCount(1);
+        AssertLastLogLeven(LogLevel.Debug);
+        AssertLastLogMessageStartsWith("Starting TIMER for: Testing label");
+      }
+
+      AssertLogEventCount(2);
+      AssertLastLogLeven(LogLevel.Info);
+      AssertLastLogMessageStartsWith("Elapsed TIME for Testing label:");
+    }
+
+    [TestMethod]
+    public void With_StartLevel_EndLevel()
+    {
+      using (new LogElapsed(startLevel: LogLevel.Info, finishLevel: LogLevel.Debug))
+      {
+        AssertLogEventCount(1);
+        AssertLastLogLeven(LogLevel.Info);
+        AssertLastLogMessageStartsWith("Starting TIMER:");
+      }
+
+      AssertLogEventCount(2);
+      AssertLastLogLeven(LogLevel.Debug);
+      AssertLastLogMessageStartsWith("Elapsed TIME:");
+    }
+
+    [TestMethod]
+    public void With_EndLevel()
+    {
+      using (new LogElapsed(finishLevel: LogLevel.Debug))
+      {
+        AssertLogEventCount(1);
+        AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+        AssertLastLogMessageStartsWith("Starting TIMER:");
+      }
+
+      AssertLogEventCount(2);
+      AssertLastLogLeven(LogLevel.Debug);
+      AssertLastLogMessageStartsWith("Elapsed TIME:");
+    }
+
+    [TestMethod]
+    public void With_Label_EndLevel()
+    {
+      using (new LogElapsed("Testing label", finishLevel: LogLevel.Debug))
+      {
+        AssertLogEventCount(1);
+        AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+        AssertLastLogMessageStartsWith("Starting TIMER for: Testing label");
+      }
+
+      AssertLogEventCount(2);
+      AssertLastLogLeven(LogLevel.Debug);
+      AssertLastLogMessageStartsWith("Elapsed TIME for Testing label:");
+    }
+
+    [TestMethod]
+    public void InvalidStartLevels()
+    {
+      foreach (LogLevel level in new[] {LogLevel.Fatal, LogLevel.Error, LogLevel.Warn})
+      {
+        _adapter.Clear();
+        Console.Out.Write("Testing LogLevel: {0}...\n", level.ToString("F"));
+
+        using (new LogElapsed(startLevel: level))
+        {
+          // should issue warning...
+          AssertLogEventCount(2);
+          Assert.AreEqual(LogLevel.Warn, _adapter.LoggerEvents[0].Level);
+          // ...then fall back to default
+          AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+          AssertLastLogMessageStartsWith("Starting TIMER:");
+        }
+
+        AssertLogEventCount(3);
+        AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+        AssertLastLogMessageStartsWith("Elapsed TIME:");
+      }
+    }
+
+    [TestMethod]
+    public void InvalidEndLevels()
+    {
+      foreach (LogLevel level in new[] {LogLevel.Fatal, LogLevel.Error, LogLevel.Warn})
+      {
+        _adapter.Clear();
+        Console.Out.Write("Testing LogLevel: {0}...\n", level.ToString("F"));
+
+        using (new LogElapsed(finishLevel: level))
+        {
+          AssertLogEventCount(1);
+          AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+          AssertLastLogMessageStartsWith("Starting TIMER:");
+        }
+
+        AssertLogEventCount(3);
+        // should issue warning...
+        Assert.AreEqual(LogLevel.Warn, _adapter.LoggerEvents[1].Level);
+        // ...then fall back to default
+        AssertLastLogLeven(DEFAULT_LOG_LEVEL);
+        AssertLastLogMessageStartsWith("Elapsed TIME:");
+      }
+    }
+
     #endregion
 
     #region Private methods