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 br...@apache.org on 2014/03/03 09:54:29 UTC
svn commit: r1573503 -
/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/
Author: brett
Date: Mon Mar 3 09:54:29 2014
New Revision: 1573503
URL: http://svn.apache.org/r1573503
Log:
Support VS 2012 and other versions for XDT
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java?rev=1573503&r1=1573502&r2=1573503&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java Mon Mar 3 09:54:29 2014
@@ -680,11 +680,23 @@ public abstract class AbstractNPandayInt
}
}
- protected void assertXdtPresent()
+ protected void skipIfXdtNotPresent()
{
- // TODO: when XDT doesn't require VS 2010, then this can be removed
- skipIfMissingMSBuildTask("Microsoft/VisualStudio/v10.0/Web/Microsoft.Web.Publishing.Tasks.dll",
- "Visual Studio 2010 with web platform is not installed");
+ File f = new File( System.getenv( "PROGRAMFILES" ), "MSBuild" );
+ f = new File( f, "Microsoft/VisualStudio" );
+ File[] versions = f.listFiles();
+ if ( versions != null ) {
+ for ( File v : versions )
+ {
+ if ( new File( v, "Web/Microsoft.Web.Publishing.Tasks.dll" ).exists() )
+ {
+ return;
+ }
+ }
+ }
+
+ skipReason = "Visual Studio 2010 (or above) with web platform is not installed";
+ skip = true;
}
protected void skipIfMissingWebDeployV2() {
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java?rev=1573503&r1=1573502&r2=1573503&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java Mon Mar 3 09:54:29 2014
@@ -33,7 +33,7 @@ public class NPANDAY_254_WebAppWithCultu
super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
skipIfMissingWebDeployV2();
- assertXdtPresent();
+ skipIfXdtNotPresent();
}
public void test()
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java?rev=1573503&r1=1573502&r2=1573503&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java Mon Mar 3 09:54:29 2014
@@ -30,7 +30,7 @@ public class NPANDAY_480_AzureSupportOne
skipIfMissingAzureSDK("1.6");
skipIfMissingWebDeployV2();
- assertXdtPresent();
+ skipIfXdtNotPresent();
}
public void test()
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java?rev=1573503&r1=1573502&r2=1573503&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java Mon Mar 3 09:54:29 2014
@@ -30,7 +30,7 @@ public class NPANDAY_480_CloudServiceWit
skipIfMissingAzureSDK("1.6");
skipIfMissingWebDeployV2();
- assertXdtPresent();
+ skipIfXdtNotPresent();
}
public void test()