Refractor to allow for testing

Author: AshleyPoole

SSLLWrapper/Properties/AssemblyInfo.cs

@@ -34,3 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.1")]
 [assembly: AssemblyFileVersion("1.0.1")]
+[assembly: InternalsVisibleTo("SSLLWrapper.Tests")]

SSLLWrapper/SSLLService.cs

@@ -11,7 +11,7 @@ public class SSLLService
     {
 	    #region construction
 
-	    private readonly IApiProvider _api;
+	    private readonly IApiProvider _apiProvider;
 	    private readonly RequestModelFactory _requestModelFactory;
 	    private readonly ResponsePopulation _responsePopulation;
 		private readonly UrlValidation _urlValidation;
@@ -43,15 +43,18 @@ public enum All
 		    Done
 	    }
 
-	    public SSLLService(string apiUrl)
-		{
-			_api = new SSLLabsApi();
+		public SSLLService(string apiUrl) : this(apiUrl, new SSLLabsApi())
+	    {
+	    }
+
+		internal SSLLService(string apiUrl, IApiProvider apiProvider)
+	    {
+			_apiProvider = apiProvider;
 			_requestModelFactory = new RequestModelFactory();
 		    _urlValidation = new UrlValidation();
 			_responsePopulation = new ResponsePopulation();
-
 		    ApiUrl = apiUrl;
-		}
+	    }
 
 		#endregion
 
@@ -65,7 +68,7 @@ public Info Info()
 			try
 			{
 				// Making Api request and gathering response
-				var webResponse = _api.MakeGetRequest(requestModel);
+				var webResponse = _apiProvider.MakeGetRequest(requestModel);
 
 				// Binding result to model
 				infoModel = _responsePopulation.InfoModel(webResponse, infoModel);
@@ -112,7 +115,7 @@ public Analyze Analyze(string host, Publish publish, ClearCache clearCache, From
 			try
 			{
 				// Making Api request and gathering response
-				var webResponse = _api.MakeGetRequest(requestModel);
+				var webResponse = _apiProvider.MakeGetRequest(requestModel);
 
 				// Binding result to model
 				analyzeModel = _responsePopulation.AnalyzeModel(webResponse, analyzeModel);
@@ -153,7 +156,7 @@ public Endpoint GetEndpointData(string host, string s, FromCache fromCache)
 			try
 			{
 				// Making Api request and gathering response
-				var webResponse = _api.MakeGetRequest(requestModel);
+				var webResponse = _apiProvider.MakeGetRequest(requestModel);
 
 				// Binding result to model
 				endpointModel = _responsePopulation.EndpointModel(webResponse, endpointModel);
@@ -180,7 +183,7 @@ public StatusDetails GetStatusCodes()
 		    try
 		    {
 				// Making Api request and gathering response
-			    var webResponse = _api.MakeGetRequest(requestModel);
+			    var webResponse = _apiProvider.MakeGetRequest(requestModel);
 
 				// Binding result to model
 			    statusDetailsModel = _responsePopulation.StatusDetailsModel(webResponse, statusDetailsModel);