Author: brett
Date: Sat Dec 31 06:17:07 2011
New Revision: 1226046
URL: http://svn.apache.org/viewvc?rev=1226046&view=rev
Log:
update method of running 4.0 tests
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml?rev=1226046&r1=1226045&r2=1226046&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml
Sat Dec 31 06:17:07 2011
@@ -138,9 +138,9 @@
<plugins>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-compile-plugin</artifactId>
+ <artifactId>maven-test-plugin</artifactId>
<configuration>
- <testFrameworkVersion>4.0</testFrameworkVersion>
+ <executionFrameworkVersion>4.0</executionFrameworkVersion>
</configuration>
</plugin>
</plugins>
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=1226046&r1=1226045&r2=1226046&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:17:07 2011
@@ -28,9 +28,9 @@ namespace NPanday.ProjectImporter.Import
{
public override void CheckFrameworkVersion()
{
- if (!GetType().Assembly.ImageRuntimeVersion.StartsWith("v4.0"))
+ if (Environment.Version.Major < 4)
{
- Assert.Ignore("Test only runs on .NET 4.0, but is: " +
this.GetType().Assembly.ImageRuntimeVersion);
+ Assert.Ignore("Test only runs on .NET 4.0, but is: " +
Environment.Version.ToString());
}
// Test uses System.Web.MVC
