Author: brett
Date: Tue Dec 6 06:47:04 2011
New Revision: 1210796
URL: http://svn.apache.org/viewvc?rev=1210796&view=rev
Log:
make tests work again, but only run with System.Web.MVC installed
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.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/WebSiteWithCSharpProjectFile.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs?rev=1210796&r1=1210795&r2=1210796&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
Tue Dec 6 06:47:04 2011
@@ -137,6 +137,17 @@ namespace NPanday.ProjectImporter.Import
ProjectImporterAssertions.AssertHasNoOverlappingPomFiles(GeneratedPomFiles);
}
+ public override void CheckWebMVC()
+ {
+ // check MVC 2 installed
+ string name = "System.Web.MVC, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL";
+ Assembly a = Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(name).FullName);
+ if (a == null)
+ {
+ Assert.Ignore("Test only runs with MVC 2 installed");
+ }
+ }
+
[Test]
public void CheckPomFileElementValues()
{
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=1210796&r1=1210795&r2=1210796&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
Tue Dec 6 06:47:04 2011
@@ -29,6 +29,11 @@ namespace NPanday.ProjectImporter.Import
[TestFixture]
public class MultipleFolderLevelTest : AbstractProjectImportTest
{
+ public override void CheckFrameworkVersion()
+ {
+ CheckWebMVC();
+ }
+
public override string SolutionFileRelativePath
{
get { return
@"MultipleFolderLevelTest\MultipleFolderLevelExample.sln"; }
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=1210796&r1=1210795&r2=1210796&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
Tue Dec 6 06:47:04 2011
@@ -32,6 +32,10 @@ namespace NPanday.ProjectImporter.Import
[TestFixture]
public class WebSiteWithCSharpProjectFile : AbstractProjectImportTest
{
+ public override void CheckFrameworkVersion()
+ {
+ CheckWebMVC();
+ }
public override string SolutionFileRelativePath
{
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj?rev=1210796&r1=1210795&r2=1210796&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
Tue Dec 6 06:47:04 2011
@@ -130,9 +130,7 @@ under the License.
<WebReferences Include="Web References\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
-<!-- Comment out so MVC 2 need not be installed to test
- <Import
Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets"/>
--->
+ <Import
Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.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">
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj?rev=1210796&r1=1210795&r2=1210796&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
Tue Dec 6 06:47:04 2011
@@ -72,10 +72,7 @@ under the License.
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-<!-- Comment out so MVC 2 need not be installed to test
<Import
Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.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">
@@ -98,4 +95,4 @@ under the License.
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file
