From aa1f8b4f0e14949cb27556a4617329a5d32dbdcd Mon Sep 17 00:00:00 2001 From: Laimonas Simutis Date: Tue, 30 Dec 2014 17:08:08 -0500 Subject: [PATCH] fix path lookup --- src/Lucene.Net.TestFramework/Util/Paths.cs | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/Lucene.Net.TestFramework/Util/Paths.cs b/src/Lucene.Net.TestFramework/Util/Paths.cs index 2685305105..e0e30fc3d9 100644 --- a/src/Lucene.Net.TestFramework/Util/Paths.cs +++ b/src/Lucene.Net.TestFramework/Util/Paths.cs @@ -137,32 +137,27 @@ public static string ProjectRootDirectory { // we currently assume that the assembly's directory is root/bin/[Section]/[Build] // where [Section] is either core, demo, or contrib, and [Build] is either Debug or Release. - string assemblyLocation = AssemblyDirectory; - int index = -1; + var assemblyLocation = AssemblyDirectory; - var buildPathPart = Path.DirectorySeparatorChar + "build" + Path.DirectorySeparatorChar; - var binPathPart = Path.DirectorySeparatorChar + "bin" + Path.DirectorySeparatorChar; - - if (assemblyLocation.IndexOf("build", StringComparison.InvariantCultureIgnoreCase) > -1) - { - index = assemblyLocation.IndexOf(buildPathPart, StringComparison.InvariantCultureIgnoreCase); - } - else + var index = assemblyLocation.IndexOf(Path.DirectorySeparatorChar + "build" + Path.DirectorySeparatorChar, StringComparison.InvariantCultureIgnoreCase); + if (index == -1) { - index = assemblyLocation.IndexOf(binPathPart, StringComparison.InvariantCultureIgnoreCase); + index = assemblyLocation.IndexOf(Path.DirectorySeparatorChar + "bin" + Path.DirectorySeparatorChar, StringComparison.InvariantCultureIgnoreCase); } if (index < 0) { - throw new ArgumentOutOfRangeException("Could not locate project root directory in " + assemblyLocation + ", checked " + buildPathPart + " and " + binPathPart); + throw new ArgumentOutOfRangeException("Could not locate project root directory in " + assemblyLocation); } - int difference = assemblyLocation.Substring(index).Count(o => o == Path.DirectorySeparatorChar); + var difference = assemblyLocation.Substring(index).Count(o => o == Path.DirectorySeparatorChar); var list = new List(); for (int i = 0; i < difference; i++) + { list.Add(".."); + } var parameters = list.ToArray();