From 0570a1d03bb4eb62ca7586becb3261afcfd72dcd Mon Sep 17 00:00:00 2001
From: tmenier <tmenier@gmail.com>
Date: Fri, 21 Feb 2014 00:03:12 -0600
Subject: [PATCH] fixed some tests

---
 Flurl.Test/Flurl.Test.csproj  |  8 ++++----
 Flurl.Test/UrlBuilderTests.cs | 12 +++++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Flurl.Test/Flurl.Test.csproj b/Flurl.Test/Flurl.Test.csproj
index e9a0ad0..0770a93 100644
--- a/Flurl.Test/Flurl.Test.csproj
+++ b/Flurl.Test/Flurl.Test.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">
-      <HintPath>..\Flurl\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -47,15 +47,15 @@
     <Compile Include="UrlBuilderTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Flurl\Flurl.csproj">
       <Project>{70a34167-759e-4902-82e0-e6a84c2ce46f}</Project>
       <Name>Flurl</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Flurl.Test/UrlBuilderTests.cs b/Flurl.Test/UrlBuilderTests.cs
index fb18be1..89ab18d 100644
--- a/Flurl.Test/UrlBuilderTests.cs
+++ b/Flurl.Test/UrlBuilderTests.cs
@@ -100,9 +100,9 @@ namespace Flurl.Test
 				.AddQueryParams(new { a = 1, b = 2, c = 999 })
 				.AppendPathSegment("category")
 				.RemoveQueryParam("c")
-				.AddQueryParam("z", 55)
+				.SetQueryParam("z", 55)
 				.RemoveQueryParams("a", "z")
-				.AddQueryParams(new { n = "hi", m = "bye" })
+				.SetQueryParams(new { n = "hi", m = "bye" })
 				.AppendPathSegment("endpoint");
 
 			Assert.AreEqual("http://www.mysite.com/category/endpoint?b=2&n=hi&m=bye", url.ToString());
@@ -123,7 +123,13 @@ namespace Flurl.Test
 		[Test]
 		public void encodes_query_params() {
 			var url = "http://www.mysite.com".AddQueryParams(new { x = "$50", y = "2+2=4" });
-			Assert.AreEqual("http://www.mysite.com?x=%2450&y=2%2b2%3d4", url.ToString());			
+			Assert.AreEqual("http://www.mysite.com?x=%2450&y=2%2b2%3d4", url.ToString());
+		}
+
+		[Test]
+		public void combine_works() {
+			var url = Url.Combine("http://www.foo.com/", "/too/", "/many/", "/slashes/", "too", "few");
+			Assert.AreEqual("http://www.foo.com/too/many/slashes/too/few", url);
 		}
 	}
 }