Author: brett
Date: Fri Dec 30 10:45:43 2011
New Revision: 1225794
URL: http://svn.apache.org/viewvc?rev=1225794&view=rev
Log:
basic Azure SDK doesn't install to GAC - use Program Files location instead
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.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
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.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=1225794&r1=1225793&r2=1225794&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
Fri Dec 30 10:45:43 2011
@@ -636,8 +636,7 @@ public abstract class AbstractNPandayInt
return context;
}
-
- protected void skipIfMissing( String gac, String message )
+ protected void skipIfMissingGAC( String gac, String message )
{
File f = new File( System.getenv( "SYSTEMROOT" ), "assembly/GAC_MSIL/"
+ gac );
if ( !f.exists() || !f.isDirectory() )
@@ -646,4 +645,14 @@ public abstract class AbstractNPandayInt
skip = true;
}
}
+
+ protected void skipIfMissingProgramFilesDirectory( String directory,
String message )
+ {
+ File f = new File( System.getenv( "PROGRAMFILES" ), directory );
+ if ( !f.exists() || !f.isDirectory() )
+ {
+ skipReason = message;
+ skip = true;
+ }
+ }
}
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java?rev=1225794&r1=1225793&r2=1225794&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java
Fri Dec 30 10:45:43 2011
@@ -31,14 +31,12 @@ public class AzureBootstrap
{
super( "[1.5.0-incubating,)", "[v4.0,)" );
- skipIfMissing( "Microsoft.WindowsAzure.ServiceRuntime", "Azure SDK is
not installed" );
+ skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is
not installed" );
}
public void testBootstrap()
throws Exception
{
- // TODO: only run if Azure SDK is installed
-
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/AzureBootstrap" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "package" );
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java?rev=1225794&r1=1225793&r2=1225794&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java
Fri Dec 30 10:45:43 2011
@@ -31,7 +31,7 @@ public class NPANDAY_196_MvcSupportTest
{
super( "[1.2,)", "[v3.5,)" );
- skipIfMissing( "System.Web.MVC", "MVC.NET is not installed" );
+ skipIfMissingGAC( "System.Web.MVC", "MVC.NET is not installed" );
}
public void testMVCProject()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java?rev=1225794&r1=1225793&r2=1225794&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java
Fri Dec 30 10:45:43 2011
@@ -31,7 +31,7 @@ public class NPANDAY_330_VS2010MvcProjec
{
super( "[1.4.0-incubating,)", "[v4.0.30319,)" );
- skipIfMissing( "System.Web.MVC", "MVC.NET is not installed" );
+ skipIfMissingGAC( "System.Web.MVC", "MVC.NET is not installed" );
}
public void testMVC2010Project()
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=1225794&r1=1225793&r2=1225794&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
Fri Dec 30 10:45:43 2011
@@ -28,7 +28,7 @@ public class NPANDAY_480_AzureSupportOne
{
super( "[1.5.0-incubating,)", "[v4.0,)" );
- skipIfMissing( "Microsoft.WindowsAzure.ServiceRuntime", "Azure SDK is
not installed" );
+ skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is
not installed" );
}
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=1225794&r1=1225793&r2=1225794&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
Fri Dec 30 10:45:43 2011
@@ -28,7 +28,7 @@ public class NPANDAY_480_CloudServiceWit
{
super( "[1.5.0-incubating,)", "[v4.0,)" );
- skipIfMissing( "Microsoft.WindowsAzure.ServiceRuntime", "Azure SDK is
not installed" );
+ skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is
not installed" );
}
public void test()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java?rev=1225794&r1=1225793&r2=1225794&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java
Fri Dec 30 10:45:43 2011
@@ -28,7 +28,7 @@ public class NPANDAY_480_CloudServiceWit
{
super( "[1.5.0-incubating,)", "[v4.0,)" );
- skipIfMissing( "Microsoft.WindowsAzure.ServiceRuntime", "Azure SDK is
not installed" );
+ skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is
not installed" );
}
public void test()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java?rev=1225794&r1=1225793&r2=1225794&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java
Fri Dec 30 10:45:43 2011
@@ -30,12 +30,7 @@ public class NPANDAY_488_MSDeployPackage
{
super( "[1.5.0-incubating,)" );
- File f = new File( System.getenv( "PROGRAMFILES" ), "IIS/Microsoft Web
Deploy V2" );
- if ( !f.exists() || !f.isDirectory() )
- {
- skipReason = "Web Deploy 2.0 not installed";
- skip = true;
- }
+ skipIfMissingProgramFilesDirectory( "IIS/Microsoft Web Deploy V2",
"Web Deploy 2.0 not installed" );
}
public void test()
