Merge pull request #1630 from lupino3/fix-test-path

ethomson · web-flow · commit 8e129e5ffbf3 · 2018-11-02T16:40:47.000Z
Fix resources path computation in test setup
diff --git a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
@@ -64,9 +64,8 @@ private static void SetUpTestEnvironment()
             if (resourcesPath == null)
             {
                 string initialAssemblyParentFolder = Directory.GetParent(new Uri(typeof(BaseFixture).GetTypeInfo().Assembly.CodeBase).LocalPath).FullName;
-                const string sourceRelativePath = @"../../../../LibGit2Sharp.Tests/Resources";
-
-                resourcesPath = Path.Combine(initialAssemblyParentFolder, sourceRelativePath);
+                int pos = initialAssemblyParentFolder.IndexOf("LibGit2Sharp.Tests");
+                resourcesPath = Path.Combine(initialAssemblyParentFolder.Substring(0, pos), "../LibGit2Sharp.Tests/Resources");
             }
 
             ResourcesDirectory = new DirectoryInfo(resourcesPath);

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,8 @@ private static void SetUpTestEnvironment()`
`64`	`64`	`if (resourcesPath == null)`
`65`	`65`	`{`
`66`	`66`	`string initialAssemblyParentFolder = Directory.GetParent(new Uri(typeof(BaseFixture).GetTypeInfo().Assembly.CodeBase).LocalPath).FullName;`
`67`		`- const string sourceRelativePath = @"../../../../LibGit2Sharp.Tests/Resources";`
`68`		`-`
`69`		`- resourcesPath = Path.Combine(initialAssemblyParentFolder, sourceRelativePath);`
	`67`	`+ int pos = initialAssemblyParentFolder.IndexOf("LibGit2Sharp.Tests");`
	`68`	`+ resourcesPath = Path.Combine(initialAssemblyParentFolder.Substring(0, pos), "../LibGit2Sharp.Tests/Resources");`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`ResourcesDirectory = new DirectoryInfo(resourcesPath);`