Author: brett
Date: Sat Dec 31 06:12:09 2011
New Revision: 1226044
URL: http://svn.apache.org/viewvc?rev=1226044&view=rev
Log:
support other base directories so that tests can be run inside Visual Studio
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/EmbeddedResourcesTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FileUtil.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleProjectTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleWebApplicationVBTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleVBTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/InterModuleDependency.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/MultipleFolderLevelTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterAssertions.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleVBDependencyTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleWebProjectsTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SingleModuleCSharpTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WebSiteWithCSharpProjectFile.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs
Sat Dec 31 06:12:09 2011
@@ -40,7 +40,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\Shell32Example\"; }
+ get { return @"src\test\resource\Shell32Example\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/EmbeddedResourcesTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/EmbeddedResourcesTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FileUtil.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FileUtil.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FileUtil.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FileUtil.cs
Sat Dec 31 06:12:09 2011
@@ -189,7 +189,9 @@ namespace NPanday.ProjectImporter.Import
public static string GetBaseDirectory()
{
- return new FileInfo(Directory.GetCurrentDirectory().Substring(0,
Directory.GetCurrentDirectory().LastIndexOf("target"))).FullName;
+ string current = Path.GetFullPath(Directory.GetCurrentDirectory());
+ string basedir = current.Substring(0,
current.LastIndexOf("target"));
+ return basedir;
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleProjectTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleProjectTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleProjectTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleProjectTest.cs
Sat Dec 31 06:12:09 2011
@@ -48,7 +48,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\flat-multi-module\"; }
+ get { return @"src\test\resource\flat-multi-module\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleWebApplicationVBTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleWebApplicationVBTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleWebApplicationVBTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatMultiModuleWebApplicationVBTest.cs
Sat Dec 31 06:12:09 2011
@@ -46,7 +46,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return
@"\src\test\resource\flat-multi-module-web-application-vb\"; }
+ get { return
@"src\test\resource\flat-multi-module-web-application-vb\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleTest.cs
Sat Dec 31 06:12:09 2011
@@ -48,7 +48,7 @@ namespace NPanday.ProjectImporter.Import
{
get
{
- return @"\src\test\resource\flat-single-module-cs\";
+ return @"src\test\resource\flat-single-module-cs\";
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleVBTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleVBTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleVBTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/FlatSingleModuleVBTest.cs
Sat Dec 31 06:12:09 2011
@@ -46,7 +46,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\flat-single-module-vb\"; }
+ get { return @"src\test\resource\flat-single-module-vb\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/InterModuleDependency.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/InterModuleDependency.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/InterModuleDependency.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/InterModuleDependency.cs
Sat Dec 31 06:12:09 2011
@@ -46,7 +46,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\InterModuleDependency\"; }
+ get { return @"src\test\resource\InterModuleDependency\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/MultipleFolderLevelTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/MultipleFolderLevelTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/MultipleFolderLevelTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/MultipleFolderLevelTest.cs
Sat Dec 31 06:12:09 2011
@@ -47,7 +47,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\MultipleFolderLevelTest\"; }
+ get { return @"src\test\resource\MultipleFolderLevelTest\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
Sat Dec 31 06:12:09 2011
@@ -50,7 +50,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\NPANDAY-445-NET40GAC\"; }
+ get { return @"src\test\resource\NPANDAY-445-NET40GAC\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterAssertions.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterAssertions.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterAssertions.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterAssertions.cs
Sat Dec 31 06:12:09 2011
@@ -87,7 +87,7 @@ namespace NPanday.ProjectImporter.Import
public static void AssertPomElementValues(string
testPomLocation, string[] pomFiles)
{
- string[] testPomFiles =
FileUtil.GetTestPomFiles(Path.GetFullPath(Directory.GetCurrentDirectory() +
@"\..\..") + testPomLocation, pomFiles);
+ string[] testPomFiles =
FileUtil.GetTestPomFiles(Path.Combine(FileUtil.GetBaseDirectory(),
testPomLocation), pomFiles);
Assert.AreEqual(testPomFiles.Length, pomFiles.Length);
int pomCount = testPomFiles.Length;
for (int index = 0; index < pomCount; index++)
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs
Sat Dec 31 06:12:09 2011
@@ -46,8 +46,8 @@ namespace NPanday.ProjectImporter.Import
[SetUp]
public void PrepareProjects()
{
+ string baseProjectPath = FileUtil.GetBaseDirectory();
- string baseProjectPath =
Path.GetFullPath(Directory.GetCurrentDirectory() + @"\..\..");
ProjectImporterTestFixture.SampleProjectsPath =
Path.Combine(baseProjectPath, @"target\test_sample_projects");
// delete the sample projects from target folder
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleVBDependencyTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleVBDependencyTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleVBDependencyTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleVBDependencyTest.cs
Sat Dec 31 06:12:09 2011
@@ -41,7 +41,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\SampleVBDependency\"; }
+ get { return @"src\test\resource\SampleVBDependency\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleWebProjectsTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleWebProjectsTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleWebProjectsTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SampleWebProjectsTest.cs
Sat Dec 31 06:12:09 2011
@@ -46,7 +46,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\sample_web_project\"; }
+ get { return @"src\test\resource\sample_web_project\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SingleModuleCSharpTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SingleModuleCSharpTest.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SingleModuleCSharpTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/SingleModuleCSharpTest.cs
Sat Dec 31 06:12:09 2011
@@ -45,7 +45,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\SingleModuleCSharp\"; }
+ get { return @"src\test\resource\SingleModuleCSharp\"; }
}
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WebSiteWithCSharpProjectFile.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WebSiteWithCSharpProjectFile.cs?rev=1226044&r1=1226043&r2=1226044&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WebSiteWithCSharpProjectFile.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WebSiteWithCSharpProjectFile.cs
Sat Dec 31 06:12:09 2011
@@ -50,7 +50,7 @@ namespace NPanday.ProjectImporter.Import
public override string TestResourcePath
{
- get { return @"\src\test\resource\WebSiteWithCSProj\"; }
+ get { return @"src\test\resource\WebSiteWithCSProj\"; }
}
}
}
