Adding null check for innerException. Adding tests

src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/Az.Auth.Net452.Test.csproj

@@ -1,4 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Test Project for Microsoft.Rest.ClientRuntime.Azure.Authentication</Description>
+    <Version>1.0.0</Version>
+    <AssemblyName>Az.Auth.Net452.Tests</AssemblyName>
+    <PackageId>Az.Auth.Net452.Tests</PackageId>
+    <PackageTags>Net452Tests AzAuthNet452 Test $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFrameworks>net452</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Az.Authentication\Microsoft.Rest.ClientRuntime.Azure.Authentication.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>
+
+
+
+<!--
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('packages\xunit.core.2.3.1\build\xunit.core.props')" />
@@ -104,4 +136,5 @@
     <Error Condition="!Exists('packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <Import Project="packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('packages\xunit.core.2.3.1\build\xunit.core.targets')" />
-</Project>
+</Project>
+-->

src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/CertAuthTests.cs

@@ -11,7 +11,7 @@
 
 namespace Az.Auth.Net452.Test
 {
-    public class CertAuthTests : TestBase
+    public class CertAuthTests : AuthFullDesktopTestBase
     {
         public CertAuthTests()
         {

src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/Net452ExceptionsTests.cs

@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+namespace Az.Auth.Net452.Test
+{
+    using Microsoft.IdentityModel.Clients.ActiveDirectory;
+    using Microsoft.Rest.Azure.Authentication;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+    using Xunit;
+
+    public class Net452ExceptionsTests
+    {
+        [Fact]
+        public void AuthExceptionWithInnerException()
+        {
+            AuthenticationException authExToBeThrown = null;
+            string authError = "Error Occured";
+            try
+            {
+                var token = ApplicationTokenProvider.LoginSilentAsync("SomeDomain", "clientId", "someText").GetAwaiter().GetResult();
+            }
+            catch(AdalException adalEx)
+            {
+                authExToBeThrown = new AuthenticationException(authError, adalEx);
+            }
+
+            Assert.NotNull(authExToBeThrown);
+            Assert.Equal(authError, authExToBeThrown.Message);
+        }
+
+#if FullNetFx
+        [Fact]
+        public void AuthExceptionWithNullInnerException()
+        {
+            AuthenticationException authExToBeThrown = null;
+            string authError = "Error Occured";
+            try
+            {
+                ClientCredential cc = new ClientCredential("SomeClientId", "SomethingSomething");
+                ActiveDirectoryServiceSettings adSvcSettings = new ActiveDirectoryServiceSettings()
+                {
+                    AuthenticationEndpoint = new Uri("https://randomEndPoint"),
+                    TokenAudience = new Uri("https://SomeUri"),
+                    ValidateAuthority = true
+                };
+
+                var token = ApplicationTokenProvider.LoginSilentAsync( "SomeDomain", cc, adSvcSettings).GetAwaiter().GetResult();
+            }
+            catch (AdalException adalEx)
+            {
+                authExToBeThrown = new AuthenticationException(authError);
+            }
+
+            Assert.NotNull(authExToBeThrown);
+            Assert.Equal(authError, authExToBeThrown.Message);
+        }
+#endif
+
+    }
+}

src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/TestBase.cs

@@ -1,19 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
 
 namespace Az.Auth.Net452.Test
 {
     using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
 
 
-
-    public class TestBase
+    public class AuthFullDesktopTestBase
     {
-        //private string LiteralCnnString = string.Empty;
-
         private bool IsLiteralDirty = false;
         private string _literalCnnString;
         private ConnectionString _cs;
@@ -86,11 +85,11 @@ public TestEndpoints CloudEndPoints
         }
 
 
-        public TestBase(string connectionString)
+        public AuthFullDesktopTestBase(string connectionString)
         {
             LiteralCnnString = connectionString;
         }
 
-        public TestBase() { LiteralCnnString = string.Empty; }
+        public AuthFullDesktopTestBase() { LiteralCnnString = string.Empty; }
     }
 }

src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/UserLogin.cs

@@ -1,4 +1,7 @@
-namespace Az.Auth.Net452.Test
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+namespace Az.Auth.Net452.Test
 {
     using Microsoft.IdentityModel.Clients.ActiveDirectory;
     using Microsoft.Rest;
@@ -9,7 +12,7 @@
     using System.Threading;
     using System.Threading.Tasks;
 
-    public class UserLogin: TestBase
+    public class UserLogin: AuthFullDesktopTestBase
     {  
         public UserLogin() : base()
         {

src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.NetCore.Test/Az.Auth.NetCore.Test.csproj

@@ -1,5 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <Description>Test Project for Microsoft.Rest.ClientRuntime.Azure.Authentication</Description>
+    <Version>1.0.0</Version>
+    <AssemblyName>Az.Auth.NetCore.Tests</AssemblyName>
+    <PackageId>Az.Auth.NetCore.Tests</PackageId>
+    <PackageTags>NetCoreTests AzAuthNetCore Test $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
+  </PropertyGroup>
+
   <PropertyGroup>    
     <TargetFramework>netcoreapp1.1</TargetFramework>
   </PropertyGroup>

src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/FullDesktop.Tests/Az.Auth.FullDesktop.Test.csproj

@@ -1,4 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Test Project for Microsoft.Rest.ClientRuntime.Azure.Authentication</Description>
+    <Version>1.0.0</Version>
+    <AssemblyName>Az.Auth.FullDesktop.Tests</AssemblyName>
+    <PackageId>Az.Auth.FullDesktop.Tests</PackageId>
+    <PackageTags>FullDesktopTests AzAuthFullDesktop Test $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Az.Authentication\Microsoft.Rest.ClientRuntime.Azure.Authentication.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>
+
+<!--
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
@@ -89,4 +119,5 @@
     <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
-</Project>
+</Project>
+-->

src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/FullDesktop.Tests/ExceptionsTests.cs

@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+namespace Az.Auth.FullDesktop.Test
+{
+    using Microsoft.IdentityModel.Clients.ActiveDirectory;
+    using Microsoft.Rest.Azure.Authentication;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+    using Xunit;
+
+    public class ExceptionsTests
+    {
+        [Fact]
+        public void AuthExceptionWithInnerException()
+        {
+            AuthenticationException authExToBeThrown = null;
+            string authError = "Error Occured";
+            try
+            {
+                var token = ApplicationTokenProvider.LoginSilentAsync("SomeDomain", "clientId", "someText").GetAwaiter().GetResult();
+            }
+            catch(AdalException adalEx)
+            {
+                authExToBeThrown = new AuthenticationException(authError, adalEx);
+            }
+
+            Assert.NotNull(authExToBeThrown);
+            Assert.Equal(authError, authExToBeThrown.Message);
+        }
+
+        [Fact]
+        public void AuthExceptionWithNullInnerException()
+        {
+            AuthenticationException authExToBeThrown = null;
+            string authError = "Error Occured";
+            try
+            {
+                ClientCredential cc = new ClientCredential("SomeClientId", "SomethingSomething");
+                ActiveDirectoryServiceSettings adSvcSettings = new ActiveDirectoryServiceSettings()
+                {
+                    AuthenticationEndpoint = new Uri("https://randomEndPoint"),
+                    TokenAudience = new Uri("https://SomeUri"),
+                    ValidateAuthority = true
+                };
+
+                var token = ApplicationTokenProvider.LoginSilentAsync( "SomeDomain", cc, adSvcSettings).GetAwaiter().GetResult();
+            }
+            catch (AdalException adalEx)
+            {
+                authExToBeThrown = new AuthenticationException(authError);
+            }
+
+            Assert.NotNull(authExToBeThrown);
+            Assert.Equal(authError, authExToBeThrown.Message);
+        }
+    }
+}

src/SdkCommon/Auth/Az.Auth/Az.Authentication/AuthenticationException.cs

@@ -55,7 +55,7 @@ public AuthenticationException(string message, Exception innerException)
         /// <param name="message">The exception message</param>
         /// <param name="innerException">The inner AdalException with additional details</param>
         internal AuthenticationException(string message, AdalException innerException) : 
-            base(string.Format(CultureInfo.CurrentCulture, message, innerException.Message), innerException)
+            base(string.Format(CultureInfo.CurrentCulture, message, (innerException == null)? string.Empty : innerException?.Message ), innerException)
         {
         }
 

src/SdkCommon/Auth/Az.Auth/Az.Authentication/Microsoft.Rest.ClientRuntime.Azure.Authentication.csproj

@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)'=='net461' ">
-    <DefineConstants>net461;FullNetFx</DefineConstants>
+    <DefineConstants>net461</DefineConstants>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>