Merge pull request #42 from smartystreets/xan/fix-url-prefix-bug

Fix tests; Fix urlPrefix bug
smartystreets · Mar 21, 2024 · 532e275 · 532e275
2 parents 126c008 + 10cc056
commit 532e275
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/src/sdk/InternationalAutcompleteApi/Client.cs b/src/sdk/InternationalAutcompleteApi/Client.cs
@@ -50,7 +50,7 @@ private static Request BuildRequest(Lookup lookup)
 			var request = new Request();
 
 			if (lookup.AddressID != null) {
-				request.SetUrlPrefix("/" + lookup.AddressID);
+				request.SetUrlComponents("/" + lookup.AddressID);
 			}
 
 			request.SetParameter("search", lookup.Search);

diff --git a/src/sdk/Request.cs b/src/sdk/Request.cs
@@ -6,6 +6,7 @@
 	public class Request
 	{
 		private string urlPrefix;
+		private string urlComponents;
 		private readonly Dictionary<string, string> parameters;
 		private byte[] payload;
 
@@ -29,6 +30,7 @@ public Request()
 			this.Headers = new Dictionary<string, string>();
 			this.parameters = new Dictionary<string, string>();
 			this.urlPrefix = "";
+			this.urlComponents = "";
 		}
 
 		public void SetHeader(string header, string value)
@@ -44,14 +46,13 @@ public void SetParameter(string name, string value)
 			this.parameters[name] = value;
 		}
 
-		public void SetUrlPrefix(string value)
-		{
-			this.urlPrefix = value;
+		public void SetUrlComponents(string value) {
+			this.urlComponents = value;
 		}
 
-		public String GetUrlPrefix()
+		public void SetUrlPrefix(string value)
 		{
-			return this.urlPrefix;
+			this.urlPrefix = value + this.urlComponents;
 		}
 
 		public string GetUrl()

diff --git a/src/sdk/URLPrefixSender.cs b/src/sdk/URLPrefixSender.cs
@@ -13,11 +13,7 @@ public URLPrefixSender(string urlPrefix, ISender inner)
 
 		public Response Send(Request request)
 		{
-			if (request.GetUrlPrefix() != null) {
-				request.SetUrlPrefix(this.urlPrefix + request.GetUrlPrefix());
-			} else {
-				request.SetUrlPrefix(this.urlPrefix);
-			}
+			request.SetUrlPrefix(this.urlPrefix);
 			return this.inner.Send(request);
 		}
 	}

diff --git a/src/sdk/USEnrichmentApi/Client.cs b/src/sdk/USEnrichmentApi/Client.cs
@@ -44,7 +44,7 @@ private void Send(Lookup lookup)
 		private SmartyStreets.Request BuildRequest(Lookup lookup)
 		{
 			SmartyStreets.Request request = new SmartyStreets.Request();
-			request.SetUrlPrefix("/" + lookup.GetSmartyKey() + "/" + lookup.GetDatasetName() + "/" + lookup.GetDataSubsetName());
+			request.SetUrlComponents("/" + lookup.GetSmartyKey() + "/" + lookup.GetDatasetName() + "/" + lookup.GetDataSubsetName());
 			return request;
 		}
     }

diff --git a/src/tests/URLPrefixSenderTests.cs b/src/tests/URLPrefixSenderTests.cs
@@ -13,7 +13,7 @@ public void TestRequestURLPresent()
             var urlPrefixSender = new URLPrefixSender("http://localhost/", mockSender);
 
             var request = new Request();
-            request.SetUrlPrefix("jimbo");
+            request.SetUrlComponents("jimbo");
 
             urlPrefixSender.Send(request);
 
@@ -32,5 +32,20 @@ public void TestRequestURLAbsent()
 
             Assert.AreEqual("http://localhost/?", request.GetUrl());
         }
+
+        [Test]
+        public void TestMultipleSends()
+        {
+            var mockSender = new MockSender(null);
+            var urlPrefixSender = new URLPrefixSender("http://localhost/", mockSender);
+
+            var request = new Request();
+            request.SetUrlComponents("jimbo");
+
+            urlPrefixSender.Send(request);
+            urlPrefixSender.Send(request);
+
+            Assert.AreEqual("http://localhost/jimbo?", request.GetUrl());
+        }
     }
 }
diff --git a/src/tests/USEnrichmentApi/ClientTests.cs b/src/tests/USEnrichmentApi/ClientTests.cs
@@ -14,32 +14,30 @@ public class ClientTests
 		public void Setup()
 		{
 			this.capturingSender = new RequestCapturingSender();
-			this.urlSender = new URLPrefixSender("http://localhost/", this.capturingSender);
+			this.urlSender = new URLPrefixSender("http://localhost", this.capturingSender);
 		}
 
 
 		[Test]
-		public void TestSendingFullyPopulatedPrincipalLookup(string matchStrategy)
+		public void TestSendingFullyPopulatedPrincipalLookup()
 		{
 			var serializer = new FakeSerializer(null);
 			var client = new Client(this.urlSender, serializer);
-			const string expectedUrlTemplate = "http://localhost/1/property/principal";
-			var expectedUrl = string.Format(expectedUrlTemplate, matchStrategy);
+			const string expectedUrl= "http://localhost/1/property/principal?";
 
 			client.SendPropertyPrincipalLookup("1");
 
 			Assert.AreEqual(expectedUrl, this.capturingSender.Request.GetUrl());
 		}
 
         [Test]
-		public void TestSendingFullyPopulatedFinancialLookup(string matchStrategy)
+		public void TestSendingFullyPopulatedFinancialLookup()
 		{
 			var serializer = new FakeSerializer(null);
 			var client = new Client(this.urlSender, serializer);
-			const string expectedUrlTemplate = "http://localhost/1/property/financial";
-			var expectedUrl = string.Format(expectedUrlTemplate, matchStrategy);
+			const string expectedUrl= "http://localhost/1/property/financial?";
 
-			client.SendPropertyPrincipalLookup("1");
+			client.SendPropertyFinancialLookup("1");
 
 			Assert.AreEqual(expectedUrl, this.capturingSender.Request.GetUrl());
 		}
@@ -50,7 +48,7 @@ public void TestRejectNullLookup()
 			var serializer = new FakeSerializer(null);
 			var client = new Client(this.urlSender, serializer);
 
-			Assert.Throws<ArgumentNullException>(() => client.SendPropertyFinancialLookup(null));
+			Assert.Throws<SmartyStreets.SmartyException>(() => client.SendPropertyFinancialLookup(null));
 		}
 	}
 }