Fix failing unit tests (#174)

microsoft · Apr 14, 2018 · b081414 · b081414
1 parent 13b231e
commit b081414
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/test/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs b/test/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs
@@ -113,6 +113,7 @@ public void ValidateLoggingIsWorking()
         [TestCategory("Log4NetAppender")]
         public void TracesAreEnqueuedInChannel()
         {
+            TelemetryConfiguration.Active.InstrumentationKey = this.adapterHelper.InstrumentationKey;
             TelemetryConfiguration.Active.TelemetryChannel = this.adapterHelper.Channel;
 
             ApplicationInsightsAppenderTests.InitializeLog4NetAIAdapter(string.Empty);

diff --git a/test/Shared/AdapterHelper.cs b/test/Shared/AdapterHelper.cs
@@ -11,7 +11,6 @@ namespace Microsoft.ApplicationInsights.Tracing.Tests
     using System.Reflection;
     using System.Threading;
     using Microsoft.ApplicationInsights.Channel;
-    using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     public class AdapterHelper : IDisposable
@@ -21,13 +20,15 @@ public class AdapterHelper : IDisposable
 #if NET45 || NET46
         private static readonly string ApplicationInsightsConfigFilePath =
             Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ApplicationInsights.config");
+#else
+        private static readonly string ApplicationInsightsConfigFilePath =
+            Path.Combine(Path.GetDirectoryName(typeof(AdapterHelper).GetTypeInfo().Assembly.Location), "ApplicationInsights.config");
 #endif
 
         public AdapterHelper(string instrumentationKey = "F8474271-D231-45B6-8DD4-D344C309AE69")
         {
             this.InstrumentationKey = instrumentationKey;
 
-#if NET45 || NET46
             string configuration = string.Format(
                                     @"<?xml version=""1.0"" encoding=""utf-8"" ?>
                                      <ApplicationInsights xmlns=""http://schemas.microsoft.com/ApplicationInsights/2013/Settings"">
@@ -36,10 +37,6 @@ public AdapterHelper(string instrumentationKey = "F8474271-D231-45B6-8DD4-D344C3
                                      instrumentationKey);
 
             File.WriteAllText(ApplicationInsightsConfigFilePath, configuration);
-#else
-            TelemetryConfiguration.Active.InstrumentationKey = instrumentationKey;
-#endif
-
             this.Channel = new CustomTelemetryChannel();
         }
 
@@ -85,12 +82,10 @@ private void Dispose(bool dispossing)
             {
                 this.Channel.Dispose();
 
-#if NET45 || NET46
                 if (File.Exists(ApplicationInsightsConfigFilePath))
                 {
                     File.Delete(ApplicationInsightsConfigFilePath);
                 }
-#endif
             }
         }
     }

diff --git a/test/Shared/ApplicationInsightsTraceListenerTests.cs b/test/Shared/ApplicationInsightsTraceListenerTests.cs
@@ -43,6 +43,8 @@ public void TraceListenerInitializeTDoesNoThrowWhenInstrumentationKeyIsEmpty()
         [TestCategory("TraceListener")]
         public void TraceListenerWriteUsedApplicationInsightsConfigInstrumentationKeyWhenUnspecifiedInstrumentationKey()
         {
+            TelemetryConfiguration.Active.InstrumentationKey = this.adapterHelper.InstrumentationKey;
+
             // Changing the channel to Mock channel to verify 
             // the Telemetry event is assigned with the InstrumentationKey from configuration
             TelemetryConfiguration.Active.TelemetryChannel = this.adapterHelper.Channel;