Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPRNET-984

Browse Source 
-modified CreateAbsolutePath method to respect FQ urls as 'relativePath' argument
This commit is contained in:
sbohlen
2010-08-03 16:17:25 +00:00
parent b351bc2f21
commit 2c65cd280e
2 changed files with 91 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Spring/Spring.Web/Util/WebUtils.cs
View File

@@ -158,6 +158,11 @@ namespace Spring.Util
{
if (StringUtils.HasLength(relativePath))
{
if (relativePath.ToLowerInvariant().StartsWith("http://") || relativePath.ToLowerInvariant().StartsWith("https://"))
{
return relativePath;
}
if (relativePath.StartsWith("/"))
{
return relativePath;

88
test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs
View File

@@ -104,29 +104,113 @@ namespace Spring.Util
}
[Test]
public void TestCreateAbsolutePath()
public void CreateAbsolutePath_EmptyApplicationPathAndNullRelativePath_ReturnsRootPath()
{
Assert.AreEqual("/", WebUtils.CreateAbsolutePath("", null));
}
[Test]
public void CreateAbsolutePath_RootApplicationPathAndNullRelativePath_ReturnsRootPath()
{
Assert.AreEqual("/", WebUtils.CreateAbsolutePath("/", null));
}
[Test]
public void CreateAbsolutePath_NullRelativePath_ReturnsApplicationPath()
{
Assert.AreEqual("/MyApp/", WebUtils.CreateAbsolutePath("/MyApp", null));
}
[Test]
public void CreateAbsolutePath_EmptyRelativePath_ReturnsApplicationPath()
{
Assert.AreEqual("/MyApp/", WebUtils.CreateAbsolutePath("/MyApp", string.Empty));
}
[Test]
public void CreateAbsolutePath_NullApplicationPath_ReturnsRelativePath()
{
Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath(null, "/MyPath"));
}
[Test]
public void CreateAbsolutePath_NullApplicationPathAndAppRootRelativePath_ReturnsRelativePath()
{
Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath(null, "~/MyPath"));
}
[Test]
public void CreateAbsolutePath_EmptyApplicationPath_ReturnsRelativePath()
{
Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath(string.Empty, "/MyPath"));
}
[Test]
public void CreateAbsolutePath_EmptyApplicationPathAndAppRootRelativePath_ReturnsRelativePath()
{
Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath(string.Empty, "~/MyPath"));
}
Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath("/", "MyPath"));
[Test]
public void CreateAbsolutePath_RootApplicationPath_ReturnsRelativePath()
{
Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath("/", "/MyPath"));
}
[Test]
public void CreateAbsolutePath_RootApplicationPathAndAppRootRelativePath_ReturnsRelativePath()
{
Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath("/", "~/MyPath"));
}
[Test]
public void CreateAbsolutePath_ApplicationPathAndRelativePath_ReturnsConcatenatedPath()
{
Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp", "MyPath"));
}
[Test]
public void CreateAbsolutePath_ApplicationPathAndAppRootRelativePath_ReturnsConcatenatedPath()
{
Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp", "~/MyPath"));
}
[Test]
public void CreateAbsolutePath_ApplicationPathWithTrailingSlashAndRelativePath_ReturnsConcatenatedPath()
{
Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp/", "MyPath"));
}
[Test]
public void CreateAbsolutePath_ApplicationPathWithTrailingSlashAndAppRootRelativePath_ReturnsConcatenatedPath()
{
Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp/", "~/MyPath"));
}
[Test]
public void CreateAbsolutePath_WhenRelativePathBeginsWithApplicationPath_ReturnsConcatenatedPath()
{
Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp", "/MyApp/MyPath"));
}
[Test]
public void CreateAbsolutePath_WhenRelativePathIsHttpQualifiedUrl_ReturnsRelativePath()
{
Assert.AreEqual("http://MyApp/MyPath", WebUtils.CreateAbsolutePath(null, "http://MyApp/MyPath"));
Assert.AreEqual("http://MyApp/MyPath", WebUtils.CreateAbsolutePath("/", "http://MyApp/MyPath"));
Assert.AreEqual("http://MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp", "http://MyApp/MyPath"));
Assert.AreEqual("http://MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp/", "http://MyApp/MyPath"));
}
[Test]
public void CreateAbsolutePath_WhenRelativePathIsHttpsQualifiedUrl_ReturnsRelativePath()
{
Assert.AreEqual("https://MyApp/MyPath", WebUtils.CreateAbsolutePath(null, "https://MyApp/MyPath"));
Assert.AreEqual("https://MyApp/MyPath", WebUtils.CreateAbsolutePath("/", "https://MyApp/MyPath"));
Assert.AreEqual("https://MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp", "https://MyApp/MyPath"));
Assert.AreEqual("https://MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp/", "https://MyApp/MyPath"));
}
[Test]
[ExpectedException(typeof(ArgumentNullException))]
public void CombineVirtualPathsDoesntAcceptNullRoot()