You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by ap...@apache.org on 2011/04/19 03:08:54 UTC
svn commit: r1094846 - in
/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src:
main/csharp/NPanday/ProjectImporter/Verifiers/ test/csharp/ImporterTests/
test/resource/MavenTestProjectWithNUnit/ test/resource/MavenTestProjectWi...
Author: apadilla
Date: Tue Apr 19 03:08:54 2011
New Revision: 1094846
URL: http://svn.apache.org/viewvc?rev=1094846&view=rev
Log:
[NPANDAY-397] - updated fix and added unit tests
Added:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/NPandayImporterTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.sln
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/.references/
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/.references/NUnit/
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/.references/NUnit/NUnit.Framework-2.2.8.0/
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/.references/NUnit/NUnit.Framework-2.2.8.0/NUnit.Framework.dll (with props)
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/Class1.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.csproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.sln
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/Class1.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.csproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/pom.test
Modified:
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/ImporterTests/FileUtil.cs
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=1094846&r1=1094845&r2=1094846&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 Tue Apr 19 03:08:54 2011
@@ -54,14 +54,15 @@ namespace NPanday.ProjectImporter.Verifi
// select all selected projects
foreach (ProjectDigest projectDigest in projectDigets)
{
- String[] projectNameTokens = projectDigest.FullFileName.Split("\\".ToCharArray());
- String projectName = projectNameTokens[projectNameTokens.Length - 1];
-
- if (projectName.Equals(string.Empty))
+ //instances where in the project name has added \\ at the end of the full file name
+ if (projectDigest.FullFileName.EndsWith("\\"))
{
- projectName = projectNameTokens[projectNameTokens.Length - 2];
+ projectDigest.FullFileName = projectDigest.FullFileName.Substring(0, projectDigest.FullFileName.LastIndexOf("\\"));
}
+ String[] projectNameTokens = projectDigest.FullFileName.Split("\\".ToCharArray());
+ String projectName = projectNameTokens[projectNameTokens.Length - 1];
+
if (projectName.Contains(".csproj") || projectName.Contains(".vbproj"))
{
if (projectName.Contains(".csproj"))
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=1094846&r1=1094845&r2=1094846&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 Tue Apr 19 03:08:54 2011
@@ -198,5 +198,10 @@ namespace NPanday.ProjectImporter.Import
}
return null;
}
+
+ public static string GetBaseDirectory()
+ {
+ return new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target"))).FullName;
+ }
}
}
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/NPandayImporterTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/NPandayImporterTest.cs?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/NPandayImporterTest.cs (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/NPandayImporterTest.cs Tue Apr 19 03:08:54 2011
@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using NPanday.ProjectImporter;
+using NPanday.ProjectImporter.Digest;
+using NPanday.ProjectImporter.Digest.Model;
+using NPanday.ProjectImporter.Validator;
+using NUnit.Framework;
+
+namespace NPanday.ProjectImporter.ImporterTests
+{
+ [TestFixture]
+ public class NPandayImporterTest
+ {
+ private String slnFile;
+ private String warnMsg = String.Empty;
+ private DirectoryInfo withoutNUnitSource;
+ private DirectoryInfo withoutNUnitTarget;
+ private DirectoryInfo withNUnitSource;
+ private DirectoryInfo withNUnitTarget;
+
+ public NPandayImporterTest()
+ {
+ withoutNUnitSource = new DirectoryInfo(FileUtil.GetBaseDirectory() + "\\src\\test\\resource\\MavenTestProjectWithoutNUnit");
+ withoutNUnitTarget = new DirectoryInfo(FileUtil.GetBaseDirectory() + "\\src\\test\\resource\\MavenTestProjectWithoutNUnitCopy");
+
+ withNUnitSource = new DirectoryInfo(FileUtil.GetBaseDirectory() + "\\src\\test\\resource\\MavenTestProjectWithNUnit");
+ withNUnitTarget = new DirectoryInfo(FileUtil.GetBaseDirectory() + "\\src\\test\\resource\\MavenTestProjectWithNUnitCopy");
+ }
+
+ [TestFixtureSetUp]
+ public void TestSetUp()
+ {
+ //TODO Remove when TestTearDown is fixed
+ //Delete manually
+ if (withNUnitTarget.Exists)
+ {
+ withNUnitTarget.Delete(true);
+ }
+
+ FileUtil.CopyDirectory(withoutNUnitSource, withoutNUnitTarget);
+ FileUtil.CopyDirectory(withNUnitSource, withNUnitTarget);
+ }
+
+ [TestFixtureTearDown]
+ public void TestTearDown()
+ {
+ Directory.Delete(withoutNUnitTarget.FullName, true);
+
+ //TODO
+ //Doesn't work because some process is holding the .references folder
+ //Directory.Delete(withNUnitTarget.FullName, true);
+ }
+
+ [Test]
+ public void TestProjectImporterWithNunitAndUncheckedTestProject()
+ {
+ slnFile = withNUnitTarget.FullName + "\\MavenTestProjectWithNUnit.sln";
+ string[] generatedPoms = NPandayImporter.ImportProject(slnFile, "test", "test-plugin", "1.0", "", UncheckedProject, ref warnMsg);
+
+ Assert.IsNotNull(generatedPoms);
+ Assert.AreEqual(2, generatedPoms.Length);
+ Assert.IsFalse(ContainsMavenTestPlugin(generatedPoms[1]));
+ }
+
+ [Test]
+ public void TestProjectImporterWithNunitAndCheckedTestProject()
+ {
+ slnFile = withNUnitTarget.FullName + "\\MavenTestProjectWithNUnit.sln";
+ string[] generatedPoms = NPandayImporter.ImportProject(slnFile, "test", "test-plugin", "1.0", "", CheckedProject, ref warnMsg);
+
+ Assert.IsNotNull(generatedPoms);
+ Assert.AreEqual(2, generatedPoms.Length);
+ Assert.IsTrue(ContainsMavenTestPlugin(generatedPoms[1]));
+ }
+
+ [Test]
+ public void TestProjectImporterWithOutNunitAndCheckedTestProject()
+ {
+ slnFile = withoutNUnitTarget.FullName + "\\MavenTestProjectWithoutNUnit.sln";
+ string[] generatedPoms = NPandayImporter.ImportProject(slnFile, "test", "test-plugin", "1.0", "", CheckedProject, ref warnMsg);
+
+ Assert.IsNotNull(generatedPoms);
+ Assert.AreEqual(2, generatedPoms.Length);
+ Assert.IsTrue(ContainsMavenTestPlugin(generatedPoms[1]));
+ }
+
+ [Test]
+ public void TestProjectImporterWithOutNunitAndUncheckedTestProject()
+ {
+ slnFile = withoutNUnitTarget.FullName + "\\MavenTestProjectWithoutNUnit.sln";
+ string[] generatedPoms = NPandayImporter.ImportProject(slnFile, "test", "test-plugin", "1.0", "", UncheckedProject, ref warnMsg);
+
+ Assert.IsNotNull(generatedPoms);
+ Assert.AreEqual(2, generatedPoms.Length);
+ Assert.IsFalse(ContainsMavenTestPlugin(generatedPoms[1]));
+ }
+
+ public void UncheckedProject(ref ProjectDigest[] projectDigests, ProjectStructureType structureType, string solutionFile, ref string groupId, ref string artifactId, ref string version)
+ {
+ foreach (ProjectDigest pDigest in projectDigests)
+ {
+ pDigest.UnitTest = false;
+ }
+ }
+
+ public void CheckedProject(ref ProjectDigest[] projectDigests, ProjectStructureType structureType, string solutionFile, ref string groupId, ref string artifactId, ref string version)
+ {
+ foreach (ProjectDigest pDigest in projectDigests)
+ {
+ pDigest.UnitTest = true;
+ }
+ }
+
+ private bool ContainsMavenTestPlugin(String pom)
+ {
+ bool contains = false;
+ String line;
+ StreamReader strm = new StreamReader(pom);
+
+ while ((line = strm.ReadLine()) != null)
+ {
+ if (line.ToString().Contains("maven-test-plugin"))
+ {
+ contains = true;
+ break;
+ }
+ }
+
+ strm.Close();
+ return contains;
+ }
+ }
+}
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.sln
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.sln?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.sln (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.sln Tue Apr 19 03:08:54 2011
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MavenTestProjectWithNUnit", "MavenTestProjectWithNUnit\MavenTestProjectWithNUnit.csproj", "{D18E13BA-218C-4E9C-A597-013709903355}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {D18E13BA-218C-4E9C-A597-013709903355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D18E13BA-218C-4E9C-A597-013709903355}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D18E13BA-218C-4E9C-A597-013709903355}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D18E13BA-218C-4E9C-A597-013709903355}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/.references/NUnit/NUnit.Framework-2.2.8.0/NUnit.Framework.dll
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/.references/NUnit/NUnit.Framework-2.2.8.0/NUnit.Framework.dll?rev=1094846&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/.references/NUnit/NUnit.Framework-2.2.8.0/NUnit.Framework.dll
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/Class1.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/Class1.cs?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/Class1.cs (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/Class1.cs Tue Apr 19 03:08:54 2011
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MavenTestProjectWithNUnit
+{
+ public class Class1
+ {
+ }
+}
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.csproj
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.csproj?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.csproj (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit.csproj Tue Apr 19 03:08:54 2011
@@ -0,0 +1,54 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{D18E13BA-218C-4E9C-A597-013709903355}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MavenTestProjectWithNUnit</RootNamespace>
+ <AssemblyName>MavenTestProjectWithNUnit</AssemblyName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="NUnit.Framework, Version=2.2.8.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>.references\NUnit\NUnit.Framework-2.2.8.0\NUnit.Framework.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Class1.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <WebReferences Include="Web References\" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test Tue Apr 19 03:08:54 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://maven.apache.org/POM/4.0.0">
+ <parent>
+ <artifactId>MavenTestProjectWithNUnit-parent</artifactId>
+ <groupId>Microsoft.MavenTestProjectWithNUnit</groupId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>..\pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>MavenTestProjectWithNUnit</artifactId>
+ <packaging>library</packaging>
+ <name>Microsoft.MavenTestProjectWithNUnit : MavenTestProjectWithNUnit</name>
+ <build>
+ <sourceDirectory>./</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>npanday.plugin</groupId>
+ <artifactId>maven-compile-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <includeSources>
+ <includeSource>Class1.cs</includeSource>
+ <includeSource>Properties\AssemblyInfo.cs</includeSource>
+ </includeSources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>NUnit</groupId>
+ <artifactId>NUnit.Framework</artifactId>
+ <version>2.2.8.0</version>
+ <type>dotnet-library</type>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/pom.test?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/pom.test (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/pom.test Tue Apr 19 03:08:54 2011
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>Microsoft.MavenTestProjectWithNUnit</groupId>
+ <artifactId>MavenTestProjectWithNUnit-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Microsoft.MavenTestProjectWithNUnit : MavenTestProjectWithNUnit-parent</name>
+ <version>1.0-SNAPSHOT</version>
+ <modules>
+ <module>MavenTestProjectWithNUnit</module>
+ </modules>
+</project>
\ No newline at end of file
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.sln
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.sln?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.sln (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.sln Tue Apr 19 03:08:54 2011
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MavenTestProjectWithoutNUnit", "MavenTestProjectWithoutNUnit\MavenTestProjectWithoutNUnit.csproj", "{3C81B2C6-AFA4-4364-9228-962FBC18F14B}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {3C81B2C6-AFA4-4364-9228-962FBC18F14B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3C81B2C6-AFA4-4364-9228-962FBC18F14B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3C81B2C6-AFA4-4364-9228-962FBC18F14B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3C81B2C6-AFA4-4364-9228-962FBC18F14B}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/Class1.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/Class1.cs?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/Class1.cs (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/Class1.cs Tue Apr 19 03:08:54 2011
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MavenTestProjectWithoutNUnit
+{
+ public class Class1
+ {
+ }
+}
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.csproj
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.csproj?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.csproj (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit.csproj Tue Apr 19 03:08:54 2011
@@ -0,0 +1,50 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{3C81B2C6-AFA4-4364-9228-962FBC18F14B}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MavenTestProjectWithoutNUnit</RootNamespace>
+ <AssemblyName>MavenTestProjectWithoutNUnit</AssemblyName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Class1.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <WebReferences Include="Web References\" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test Tue Apr 19 03:08:54 2011
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://maven.apache.org/POM/4.0.0">
+ <parent>
+ <artifactId>MavenTestProjectWithoutNUnit-parent</artifactId>
+ <groupId>Microsoft.MavenTestProjectWithoutNUnit</groupId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>..\pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>MavenTestProjectWithoutNUnit</artifactId>
+ <packaging>library</packaging>
+ <name>Microsoft.MavenTestProjectWithoutNUnit : MavenTestProjectWithoutNUnit</name>
+ <build>
+ <sourceDirectory>./</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>npanday.plugin</groupId>
+ <artifactId>maven-compile-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <includeSources>
+ <includeSource>Class1.cs</includeSource>
+ <includeSource>Properties\AssemblyInfo.cs</includeSource>
+ </includeSources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/pom.test?rev=1094846&view=auto
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/pom.test (added)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/pom.test Tue Apr 19 03:08:54 2011
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>Microsoft.MavenTestProjectWithoutNUnit</groupId>
+ <artifactId>MavenTestProjectWithoutNUnit-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Microsoft.MavenTestProjectWithoutNUnit : MavenTestProjectWithoutNUnit-parent</name>
+ <version>1.0-SNAPSHOT</version>
+ <modules>
+ <module>MavenTestProjectWithoutNUnit</module>
+ </modules>
+</project>
\ No newline at end of file
Re: svn commit: r1094846 - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src: main/csharp/NPanday/ProjectImporter/Verifiers/ test/csharp/ImporterTests/ test/resource/MavenTestProjectWithNUnit/ test/resource/MavenTestProjectWi...
Posted by Brett Porter <br...@apache.org>.
On 19/04/2011, at 1:08 PM, apadilla@apache.org wrote:
> Author: apadilla
> Date: Tue Apr 19 03:08:54 2011
> New Revision: 1094846
>
> URL: http://svn.apache.org/viewvc?rev=1094846&view=rev
> Log:
> [NPANDAY-397] - updated fix and added unit tests
Can you update the svn:log to describe what the issue was and why you made the changes? Issues may fall out of date, and we don't want to have to rely on looking them up..
Thanks,
Brett
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter