svn commit: r1232431 - in /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its: AbstractNPandayIntegrationTestCase.java NPANDAY_480_AzureSupportOneWebRole.java NPANDAY_480_CloudServiceWithMultipleRoles.java

[brett]

Author: brett
Date: Tue Jan 17 14:53:43 2012
New Revision: 1232431

URL: http://svn.apache.org/viewvc?rev=1232431&view=rev
Log:
XDT requirement for web role project also

Modified:
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.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=1232431&r1=1232430&r2=1232431&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
 Tue Jan 17 14:53:43 2012
@@ -666,4 +666,11 @@ public abstract class AbstractNPandayInt
             skip = true;
         }
     }
+
+    protected void assertXdtPresent()
+    {
+        // 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" );
+    }
 }

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=1232431&r1=1232430&r2=1232431&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
 Tue Jan 17 14:53:43 2012
@@ -29,6 +29,7 @@ public class NPANDAY_480_AzureSupportOne
         super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
 
         skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is 
not installed" );
+        assertXdtPresent();
     }
 
     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=1232431&r1=1232430&r2=1232431&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
 Tue Jan 17 14:53:43 2012
@@ -29,10 +29,7 @@ public class NPANDAY_480_CloudServiceWit
         super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
 
         skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is 
not installed" );
-
-        // 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" );
+        assertXdtPresent();
     }
 
     public void test()