Removed 'TESTING' compiler directive

src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs

@@ -197,7 +197,7 @@ namespace MusicStore.Areas.Admin.Controllers
             return string.Format("album_{0}", id);
         }
 
-#if TESTING
+        // NOTE: this is used for end to end testing only
         //
         // GET: /StoreManager/GetAlbumIdFromName
         // Note: Added for automated testing purpose. Application does not use this.
@@ -215,6 +215,5 @@ namespace MusicStore.Areas.Admin.Controllers
 
             return Content(album.AlbumId.ToString());
         }
-#endif
     }
 }

src/MusicStore/Controllers/AccountController.cs

@@ -420,14 +420,13 @@ namespace MusicStore.Controllers
                 var user = new ApplicationUser { UserName = model.Email, Email = model.Email };
                 var result = await UserManager.CreateAsync(user);
 
-#if TESTING
+                // NOTE: Used for end to end testing only
                 //Just for automated testing adding a claim named 'ManageStore' - Not required for production
                 var manageClaim = info.Principal.Claims.Where(c => c.Type == "ManageStore").FirstOrDefault();
                 if (manageClaim != null)
                 {
                     await UserManager.AddClaimAsync(user, manageClaim);
                 }
-#endif
 
                 if (result.Succeeded)
                 {

src/MusicStore/ForTesting/Mocks/Common/CustomStateDataFormat.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http.Authentication;
 using Newtonsoft.Json;
@@ -41,4 +40,3 @@ namespace MusicStore.Mocks.Common
         }
     }
 } 
-#endif

src/MusicStore/ForTesting/Mocks/Common/Helpers.cs

@@ -1,5 +1,4 @@
-#if TESTING
+using System;
-using System;
 
 namespace MusicStore.Mocks.Common
 {
@@ -14,4 +13,3 @@ namespace MusicStore.Mocks.Common
         }
     }
 } 
-#endif

src/MusicStore/ForTesting/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using System.Net;
 using System.Net.Http;
@@ -56,4 +55,3 @@ namespace MusicStore.Mocks.Facebook
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/Facebook/TestFacebookEvents.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using System.Linq;
 using System.Security.Claims;
@@ -55,4 +54,3 @@ namespace MusicStore.Mocks.Facebook
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/Google/GoogleMockBackChannelHttpHandler.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using System.Net;
 using System.Net.Http;
@@ -54,4 +53,3 @@ namespace MusicStore.Mocks.Google
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/Google/TestGoogleEvents.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using System.Linq;
 using System.Security.Claims;
@@ -55,4 +54,3 @@ namespace MusicStore.Mocks.Google
         }
     }
 } 
-#endif

src/MusicStore/ForTesting/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using System.Net;
 using System.Net.Http;
@@ -55,4 +54,3 @@ namespace MusicStore.Mocks.MicrosoftAccount
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using System.Linq;
 using System.Security.Claims;
@@ -56,4 +55,3 @@ namespace MusicStore.Mocks.MicrosoftAccount
         }
     }
 } 
-#endif

src/MusicStore/ForTesting/Mocks/OpenIdConnect/CustomStringDataFormat.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using Microsoft.AspNetCore.Authentication;
 
 namespace MusicStore.Mocks.OpenIdConnect
@@ -28,4 +27,3 @@ namespace MusicStore.Mocks.OpenIdConnect
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs

@@ -1,5 +1,4 @@
-#if TESTING
+using System.IO;
-using System.IO;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -13,7 +12,7 @@ namespace MusicStore.Mocks.OpenIdConnect
             var response = new HttpResponseMessage();
 
             var basePath = Path.GetFullPath(Path.Combine(
-                Directory.GetCurrentDirectory(), "ForTesting", "Mocks","OpenIdConnect"));
+                Directory.GetCurrentDirectory(), "ForTesting", "Mocks", "OpenIdConnect"));
 
             if (request.RequestUri.AbsoluteUri == "https://login.windows.net/[tenantName].onmicrosoft.com/.well-known/openid-configuration")
             {
@@ -32,4 +31,3 @@ namespace MusicStore.Mocks.OpenIdConnect
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
@@ -62,4 +61,3 @@ namespace MusicStore.Mocks.OpenIdConnect
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/StartupOpenIdConnectTesting.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Authorization;
@@ -156,4 +155,3 @@ namespace MusicStore
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/StartupSocialTesting.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using Microsoft.AspNetCore.Authentication.OAuth;
 using Microsoft.AspNetCore.Authentication.Twitter;
@@ -200,4 +199,3 @@ namespace MusicStore
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/Twitter/CustomTwitterStateDataFormat.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Twitter;
 using Newtonsoft.Json;
@@ -45,4 +44,3 @@ namespace MusicStore.Mocks.Twitter
         }
     }
 }
-#endif

src/MusicStore/ForTesting/Mocks/Twitter/TestTwitterEvents.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
@@ -49,4 +48,3 @@ namespace MusicStore.Mocks.Twitter
         }
     }
 } 
-#endif

src/MusicStore/ForTesting/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs

@@ -1,4 +1,3 @@
-#if TESTING
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -66,4 +65,3 @@ namespace MusicStore.Mocks.Twitter
         }
     }
 }
-#endif

src/MusicStore/Models/SampleData.cs

@@ -105,7 +105,7 @@ namespace MusicStore.Models
                 await userManager.AddClaimAsync(user, new Claim("ManageStore", "Allowed"));
             }
 
-#if TESTING
+            // NOTE: For end to end testing only
             var envPerfLab = configuration["PERF_LAB"];
             if (envPerfLab == "true")
             {
@@ -119,7 +119,6 @@ namespace MusicStore.Models
                     }
                 }
             }
-#endif
         }
 
         private static Album[] GetAlbums(string imgUrl, Dictionary<string, Genre> genres, Dictionary<string, Artist> artists)

src/MusicStore/Startup.cs

@@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Console;
 using MusicStore.Components;
 using MusicStore.Models;
 

src/MusicStore/project.json

@@ -16,8 +16,7 @@
       ]
     },
     "define": [
-      "DEMO",
+      "DEMO"
-      "TESTING"
     ],
     "emitEntryPoint": true,
     "preserveCompilationContext": true,

test/E2ETests/MusicStoreConfig.cs

@@ -1,9 +1,4 @@
-using System;
+namespace E2ETests
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace E2ETests
 {
     public class MusicStoreConfig
     {