Author: apadilla
Date: Thu Apr 14 08:15:21 2011
New Revision: 1092043
URL: http://svn.apache.org/viewvc?rev=1092043&view=rev
Log:
[NPANDAY-397] - maven-test-plugin configuration will be added based on the
checked projects in the Project Unit test window and not on the 'nunit'
dependency
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/NPandayImporter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyUnitTestsForm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/NPanday.ProjectImporterEngine-Test.csproj
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/NPandayImporter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/NPandayImporter.cs?rev=1092043&r1=1092042&r2=1092043&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/NPandayImporter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/NPandayImporter.cs
Thu Apr 14 08:15:21 2011
@@ -203,13 +203,13 @@ namespace NPanday.ProjectImporter
prjDigests = filteredPrjDigests.ToArray();
- result =ImportProjectType(structureType,
filteredPrjDigests.ToArray(), solutionFile, groupId, artifactId, version,
scmTag);
-
if (verifyProjectToImport != null && filteredPrjDigests.Count > 0)
{
verifyProjectToImport(ref prjDigests, structureType,
solutionFile, ref groupId, ref artifactId, ref version);
}
-
+
+ result =ImportProjectType(structureType,
filteredPrjDigests.ToArray(), solutionFile, groupId, artifactId, version,
scmTag);
+
return result;
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyUnitTestsForm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyUnitTestsForm.cs?rev=1092043&r1=1092042&r2=1092043&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyUnitTestsForm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyUnitTestsForm.cs
Thu Apr 14 08:15:21 2011
@@ -52,12 +52,33 @@ namespace NPanday.ProjectImporter.Verifi
}
// select all selected projects
- foreach (ProjectDigest checkedProjectDigest in
chkListTestUnits.CheckedItems)
+ foreach (ProjectDigest projectDigest in projectDigets)
{
- checkedProjectDigest.UnitTest = true;
- }
-
+ String[] projectNameTokens =
projectDigest.FullFileName.Split("\\".ToCharArray());
+ String projectName =
projectNameTokens[projectNameTokens.Length - 1];
+
+ if (projectName.Equals(string.Empty))
+ {
+ projectName = projectNameTokens[projectNameTokens.Length -
2];
+ }
+ if (projectName.Contains(".csproj") ||
projectName.Contains(".vbproj"))
+ {
+ if (projectName.Contains(".csproj"))
+ {
+ projectName = projectName.Substring(0,
projectName.LastIndexOf(".csproj"));
+ }
+ else
+ {
+ projectName = projectName.Substring(0,
projectName.LastIndexOf(".vbproj"));
+ }
+
+ if (chkListTestUnits.CheckedItems.Contains(projectName))
+ {
+ projectDigest.UnitTest = true;
+ }
+ }
+ }
this.Close();
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/NPanday.ProjectImporterEngine-Test.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/NPanday.ProjectImporterEngine-Test.csproj?rev=1092043&r1=1092042&r2=1092043&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/NPanday.ProjectImporterEngine-Test.csproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/NPanday.ProjectImporterEngine-Test.csproj
Thu Apr 14 08:15:21 2011
@@ -55,6 +55,7 @@ under the License.
<Compile Include="ImporterTests\FlatSingleModuleVBTest.cs" />
<Compile Include="ImporterTests\InterModuleDependency.cs" />
<Compile Include="ImporterTests\MultipleFolderLevelTest.cs" />
+ <Compile Include="ImporterTests\NPandayImporterTest.cs" />
<Compile Include="ImporterTests\ProjectImporterAssertions.cs" />
<Compile Include="ImporterTests\ProjectImporterTestFixture.cs" />
<Compile Include="ImporterTests\SampleVBDependencyTest.cs" />
